Merge pull request #199 from alkum/gradle-consolidate-openjfx

Consolidate OpenJFX JavaFX plugin version
bisq-network · Apr 2, 2022 · 3ebc29b · 3ebc29b
2 parents 9639027 + f85709d
commit 3ebc29b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/desktop/build.gradle b/desktop/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'org.openjfx.javafxplugin' version '0.0.10'
+    alias(libs.plugins.openjfx)
 }
 
 repositories {

diff --git a/desktopapp/build.gradle b/desktopapp/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
     id 'application'
    /* id 'distribution'*/ //todo as long we dont need a jar we leave that out, speeds up build
-    id 'org.openjfx.javafxplugin' version '0.0.10'
+    alias(libs.plugins.openjfx)
 }
 
 repositories {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@
 [versions]
 guava =         { strictly = '31.1-jre' }
 i2p =           { strictly = '1.7.0' }
+openjfx =       { strictly = '0.0.12' }
 protobuf =      { strictly = '0.8.18' }
 protobuf-java = { strictly = '3.19.4' }
 
@@ -30,4 +31,5 @@ i2p = ['i2p-core', 'i2p-router', 'i2p-streaming']
 # since plugins don't bring other plugins as transitive dependencies, as long as they are loaded using the
 # `alias(libs.plugins.protobuf)` mechanism, there is no risk of loading multiple versions.
 [plugins]
+openjfx = { id = 'org.openjfx.javafxplugin', version.ref = 'openjfx' }
 protobuf = { id = 'com.google.protobuf', version.ref = 'protobuf' }
diff --git a/satoshisquareapp/build.gradle b/satoshisquareapp/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
     id 'application'
    /* id 'distribution'*/  //todo as long we dont need a jar we leave that out, speeds up build
-    id 'org.openjfx.javafxplugin' version '0.0.10'
+    alias(libs.plugins.openjfx)
 }
 
 repositories {

diff --git a/tools/build.gradle b/tools/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-    id 'org.openjfx.javafxplugin' version '0.0.10'
+    alias(libs.plugins.openjfx)
 }
 
 repositories {