Use different JavaFX versions when building the modules and when runn…

…ing the examples
JPro-one · Nov 18, 2024 · 9a0ee81 · 9a0ee81
1 parent ca2e3db
commit 9a0ee81
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ configure(subprojects.findAll { it.name != 'example' }) {
     apply plugin: 'org.owasp.dependencycheck'
 
     javafx {
-        version = "$JAVAFX_VERSION"
+        version = "$JAVAFX_BUILD_VERSION"
         configurations = ["compileOnly", "testImplementation"]
         modules = ['javafx.graphics', 'javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
     }

diff --git a/example/build.gradle b/example/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 mainClassName = 'one.jpro.platform.example.Main'
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,8 @@
 JPRO_PLATFORM_VERSION = 0.4.5-SNAPSHOT
 
 JPRO_VERSION = 2024.4.1
-JAVAFX_VERSION = 17.0.12
+JAVAFX_BUILD_VERSION = 17.0.12
+JAVAFX_EXAMPLES_VERSION = 23.0.1
 SIMPLEFX_VERSION = 3.2.37
 JMEMORYBUDDY_VERSION = 0.5.6
 JNODES_VERSION = 0.8.3

diff --git a/jpro-auth/example/build.gradle b/jpro-auth/example/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.web']
 }
 

diff --git a/jpro-file/example/build.gradle b/jpro-file/example/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.controls', 'javafx.swing', 'javafx.media']
 }
 

diff --git a/jpro-html-scrollpane/example/build.gradle b/jpro-html-scrollpane/example/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.controls']
 }
 

diff --git a/jpro-mail/example/build.gradle b/jpro-mail/example/build.gradle
@@ -13,7 +13,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.controls']
 }
 

diff --git a/jpro-mdfx/example/build.gradle b/jpro-mdfx/example/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.controls', 'javafx.fxml', 'javafx.web']
 }
 

diff --git a/jpro-media/example/build.gradle b/jpro-media/example/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.controls', 'javafx.swing', 'javafx.media']
 }
 

diff --git a/jpro-routing/build.gradle b/jpro-routing/build.gradle
@@ -107,7 +107,7 @@ configure(project(':jpro-routing:example')) {
     }
 
     javafx {
-        version = "$JAVAFX_VERSION"
+        version = "$JAVAFX_EXAMPLES_VERSION"
         modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
     }
 

diff --git a/jpro-session/example/build.gradle b/jpro-session/example/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls']
 }
 

diff --git a/jpro-sipjs/example/build.gradle b/jpro-sipjs/example/build.gradle
@@ -10,7 +10,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
 }
 

diff --git a/jpro-webrtc/example/build.gradle b/jpro-webrtc/example/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
 }
 

diff --git a/jpro-youtube/example/build.gradle b/jpro-youtube/example/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 }
 
 javafx {
-    version = "$JAVAFX_VERSION"
+    version = "$JAVAFX_EXAMPLES_VERSION"
     modules = ['javafx.graphics', 'javafx.controls', 'javafx.swing', 'javafx.fxml', 'javafx.media', 'javafx.web']
 }