Skip to content

Commit

Permalink
Merge pull request #3 from qupath/rename
Browse files Browse the repository at this point in the history
Renamed main sub project
  • Loading branch information
Rylern authored May 7, 2024
2 parents ad483cc + abb5328 commit 7d9d659
Show file tree
Hide file tree
Showing 23 changed files with 6 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ A simple JavaFX Javadoc viewer.

The repository contains two subprojects:

* One subproject (`javadocviewer-main`) containing the UI implementation of the Javadoc viewer.
* One subproject (`javadocviewer`) containing the UI implementation of the Javadoc viewer.
* One subproject (`javadocviewer-app`) to start the UI implementation as a standalone application. It is mainly used for development.

To use the javadoc viewer:
Expand All @@ -17,7 +17,7 @@ To use the javadoc viewer:
dependencies {
def javadocViewerVersion = "0.1.0-SNAPSHOT"
implementation "io.github.qupath:javadocviewer-ui-main:${javadocViewerVersion}"
implementation "io.github.qupath:javadocviewer:${javadocViewerVersion}"
}
```

Expand Down
4 changes: 1 addition & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ java = "17"
slf4j = "2.0.7"
javafx = "20"
javafxPlugin = "0.1.0"
jlink = "2.12.0"

[libraries]
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
Expand All @@ -12,5 +11,4 @@ slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
[bundles]

[plugins]
javafx = { id = "org.openjfx.javafxplugin", version.ref = "javafxPlugin" }
jlink = { id = "org.beryx.jlink", version.ref = "jlink" }
javafx = { id = "org.openjfx.javafxplugin", version.ref = "javafxPlugin" }
11 changes: 1 addition & 10 deletions javadocviewer-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@ plugins {
id 'javadocviewer.java-conventions'

alias(libs.plugins.javafx)

// Add jlink plugin to add support for assembling modules into a custom runtime image.
alias(libs.plugins.jlink)
}

repositories {
mavenCentral()
}

dependencies {
implementation project(':javadocviewer-main')
implementation project(':javadocviewer')
implementation libs.slf4j.jdk14
}

Expand All @@ -31,10 +28,4 @@ javafx {
application {
mainClass = 'qupath.ui.javadocviewer.app.JavadocViewerApp'
mainModule = 'qupath.ui.javadocviewer.app'
}

jlink {
launcher {
name = 'javadocviewer'
}
}
File renamed without changes.
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = 'qupath-javadoc-viewer'

include 'javadocviewer-app'
include 'javadocviewer-main'
include 'javadocviewer'
include 'javadocviewer-app'

0 comments on commit 7d9d659

Please sign in to comment.