diff --git a/build.gradle b/build.gradle index ddf9005d..08062faf 100644 --- 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 index bd998209..57fc01ce 100644 --- 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 index 8da74a5e..2fdc6139 100644 --- 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 index 34748e43..06072ca5 100644 --- 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 index b3c734f7..4925be8b 100644 --- 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 index 193d2670..d2fe6de3 100644 --- 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 index b2105629..f5d2ca77 100644 --- 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 index eabf51fd..6b53130b 100644 --- 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 index 674cd02a..c6eda7af 100644 --- 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 index 9d87508e..ec280091 100644 --- 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 index 767e5bc4..2580d2bb 100644 --- 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 index 679213dc..440b7f90 100644 --- 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 index 87b7565f..32bb2ae6 100644 --- 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 index ccdcbc49..290bd688 100644 --- 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'] }