summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-07-05 16:05:39 +0200
committerJose <jose@zeroc.com>2019-07-05 16:05:59 +0200
commit3ed309d49200e33b87a0fe2cb111e8c34e2e5ac6 (patch)
treeca96944d6b240a45ac99806d9d1ef98839f81573 /java
parentDo not use deprecated @babel/polyfill - Close #429 (diff)
downloadice-3ed309d49200e33b87a0fe2cb111e8c34e2e5ac6.tar.bz2
ice-3ed309d49200e33b87a0fe2cb111e8c34e2e5ac6.tar.xz
ice-3ed309d49200e33b87a0fe2cb111e8c34e2e5ac6.zip
Do not hardcode openjfx version used in IceGridGUI builds
Diffstat (limited to 'java')
-rw-r--r--java/gradle.properties5
-rw-r--r--java/src/IceGridGUI/build.gradle8
2 files changed, 9 insertions, 4 deletions
diff --git a/java/gradle.properties b/java/gradle.properties
index ea1ca4786c8..cfa5a5c4bc7 100644
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -34,6 +34,11 @@ jgoodiesLooksVersion = 2.7.0
jgoodiesFormsVersion = 1.9.0
//
+// The OpenJFX version to use with IceGridGUI builds
+//
+openjfxVersion = 11.0.2
+
+//
// Set to true if you want IceGridGUI build to create a standalone JAR
// using proguard.
//
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 3372d92b2d2..9b5c5dd5003 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -60,10 +60,10 @@ dependencies {
implementation "com.jgoodies:jgoodies-forms:${jgoodiesFormsVersion}"
if(hasJavaFx && GradleVersion.current() >= GradleVersion.version('4.1') && JavaVersion.current() > JavaVersion.VERSION_1_10) {
- implementation "org.openjfx:javafx-base:11.0.2:$platform"
- implementation "org.openjfx:javafx-swing:11.0.2:$platform"
- implementation "org.openjfx:javafx-controls:11.0.2:$platform"
- implementation "org.openjfx:javafx-graphics:11.0.2:$platform"
+ implementation "org.openjfx:javafx-base:${openjfxVersion}:${platform}"
+ implementation "org.openjfx:javafx-swing:${openjfxVersion}:${platform}"
+ implementation "org.openjfx:javafx-controls:${openjfxVersion}:${platform}"
+ implementation "org.openjfx:javafx-graphics:${openjfxVersion}:${platform}"
}
}