fix javafx dependeny issue

openbase · Feb 3, 2024 · e470ae0 · e470ae0
1 parent 20f446a
commit e470ae0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 51 deletions.
diff --git a/module/storage/build.gradle.kts b/module/storage/build.gradle.kts
@@ -14,7 +14,3 @@ dependencies {
 }
 
 description = "JUL Storage"
-
-java {
-    withJavadocJar()
-}
diff --git a/module/visual/javafx/build.gradle.kts b/module/visual/javafx/build.gradle.kts
@@ -1,26 +1,23 @@
 plugins {
     id("org.openbase.jul")
+    id("org.openjfx.javafxplugin") version "0.1.0"
+}
+
+javafx {
+    version = "21.0.1"
+    modules = listOf(
+        "javafx.base",
+        "javafx.graphics",
+        "javafx.media",
+        "javafx.controls",
+        "javafx.fxml"
+    )
 }
 
 dependencies {
     api(project(":jul.interface"))
     api(project(":jul.extension.type.interface"))
     api(project(":jul.schedule"))
-    api("org.openjfx:javafx-base:21.0.1:win")
-    api("org.openjfx:javafx-fxml:21.0.1:win")
-    api("org.openjfx:javafx-graphics:21.0.1:win")
-    api("org.openjfx:javafx-media:21.0.1:win")
-    api("org.openjfx:javafx-controls:21.0.1:win")
-    api("org.openjfx:javafx-base:21.0.1:mac")
-    api("org.openjfx:javafx-fxml:21.0.1:mac")
-    api("org.openjfx:javafx-graphics:21.0.1:mac")
-    api("org.openjfx:javafx-media:21.0.1:mac")
-    api("org.openjfx:javafx-controls:21.0.1:mac")
-    api("org.openjfx:javafx-base:21.0.1:linux")
-    api("org.openjfx:javafx-fxml:21.0.1:linux")
-    api("org.openjfx:javafx-graphics:21.0.1:linux")
-    api("org.openjfx:javafx-media:21.0.1:linux")
-    api("org.openjfx:javafx-controls:21.0.1:linux")
     api("org.controlsfx:controlsfx:_")
     api("de.jensd:fontawesomefx:_")
     api("com.jfoenix:jfoenix:_")

diff --git a/module/visual/swing/build.gradle.kts b/module/visual/swing/build.gradle.kts
@@ -1,14 +1,19 @@
 plugins {
     id("org.openbase.jul")
+    id("org.openjfx.javafxplugin") version "0.1.0"
+}
+
+javafx {
+    version = "21.0.1"
+    modules = listOf(
+        "javafx.swing",
+    )
 }
 
 dependencies {
     api(project(":jul.schedule"))
-    api("org.netbeans.external:AbsoluteLayout:_")
     api(project(":jul.extension.type.interface"))
-    api("org.openjfx:javafx-swing:21.0.1:win")
-    api("org.openjfx:javafx-swing:21.0.1:mac")
-    api("org.openjfx:javafx-swing:21.0.1:linux")
+    api("org.netbeans.external:AbsoluteLayout:_")
 }
 
 description = "JUL Visual Swing"

diff --git a/versions.properties b/versions.properties
@@ -21,34 +21,6 @@ version.kotlinx.coroutines=1.7.3
 ## unused
 version.org.apache.commons..commons-collections4=4.4
 
-## unused
-version.org.openbase..jul.communication.mqtt=3.3-SNAPSHOT
-##                               # available=3.3.0
-##                               # available=3.3.1
-##                               # available=3.4.0
-
-## unused
-version.org.openbase..jul.communication.mqtt.test=3.3-SNAPSHOT
-##                                    # available=3.4.0
-
-## unused
-version.org.openbase..jul.extension.protobuf=3.3-SNAPSHOT
-##                               # available=3.3.0
-##                               # available=3.3.1
-##                               # available=3.4.0
-
-## unused
-version.org.openbase..jul.extension.type.processing=3.3-SNAPSHOT
-##                                      # available=3.3.0
-##                                      # available=3.3.1
-##                                      # available=3.4.0
-
-## unused
-version.org.openbase..jul.pattern.launch=3.3-SNAPSHOT
-##                           # available=3.3.0
-##                           # available=3.3.1
-##                           # available=3.4.0
-
 ## unused
 version.rxjava2.rxjava=2.2.21
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,3 @@ dependencies { @@
     }
     description = "JUL Storage"
-    java {
-        withJavadocJar()
-    }