From 156dc9713bca24dacb4472836f1190149cbdedd1 Mon Sep 17 00:00:00 2001 From: palexdev Date: Tue, 17 Oct 2023 10:23:23 +0200 Subject: [PATCH] :arrow_up: Upgrade Gradle to v8.4 and some dependencies Signed-off-by: palexdev --- build.gradle | 7 +------ demo/build.gradle | 5 +++-- gradle.properties | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 0cbb5bb1..73949b1c 100755 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,4 @@ subprojects { version = "$jfx" modules = ['javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web'] } -} - - - - - +} \ No newline at end of file diff --git a/demo/build.gradle b/demo/build.gradle index f2915548..4d056263 100755 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -92,8 +92,9 @@ tasks.register('doPackageAll') { doLast { if (Os.isFamily(Os.FAMILY_UNIX)) { exec { - executable "$projectDir/scripts/JLinkPackage.sh" - args = ["$buildDir"] + mkdir("$layout.buildDirectory/distributions") + executable "$rootDir/scripts/JLinkPackage.sh" + args = ["$layout.buildDirectory"] } } } diff --git a/gradle.properties b/gradle.properties index 9d1ed588..ac15c982 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,9 +13,9 @@ mavenPublish=0.19.0 shadowJarPlugin=7.1.2 # Dependencies -jfx=19.0.2 -vfx=11.9.1 -cssfx=11.4.0 +jfx=21 +vfx=11.9.6 +cssfx=11+ ikonli=12.3.1 # Test Dependencies diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f42e62f3..e411586a 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists