From 9aa7fb38afdb73bc3b5b1ff7464124fc93f5bb15 Mon Sep 17 00:00:00 2001 From: mounilsankar Date: Thu, 21 Sep 2023 20:23:00 +0800 Subject: [PATCH] Update build.gradle --- build.gradle | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index aa4dd55dd0..5480f57d81 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' id 'application' id 'com.github.johnrengelman.shadow' version '7.1.2' - id 'org.openjfx.javafxplugin' version '0.0.13' id 'checkstyle' } @@ -11,23 +10,26 @@ repositories { } dependencies { - String javaFxVersion = '17.0.7' - - implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win' - implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac' - implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux' - implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win' - implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac' - implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux' - implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win' - implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac' - implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux' - implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win' - implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac' - implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux' - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0' testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0' + + // JavaFX 17.0.7 dependencies for macOS on ARM64 + implementation 'org.openjfx:javafx-base:17.0.7:mac-aarch64' + implementation 'org.openjfx:javafx-controls:17.0.7:mac-aarch64' + implementation 'org.openjfx:javafx-fxml:17.0.7:mac-aarch64' + implementation 'org.openjfx:javafx-graphics:17.0.7:mac-aarch64' + + // JavaFX 17.0.7 dependencies for Linux + implementation 'org.openjfx:javafx-base:17.0.7:linux' + implementation 'org.openjfx:javafx-controls:17.0.7:linux' + implementation 'org.openjfx:javafx-fxml:17.0.7:linux' + implementation 'org.openjfx:javafx-graphics:17.0.7:linux' + + // JavaFX 17.0.7 dependencies for Windows + implementation 'org.openjfx:javafx-base:17.0.7:win' + implementation 'org.openjfx:javafx-controls:17.0.7:win' + implementation 'org.openjfx:javafx-fxml:17.0.7:win' + implementation 'org.openjfx:javafx-graphics:17.0.7:win' } test { @@ -62,8 +64,7 @@ checkstyle { toolVersion = '10.2' } -javafx { - version = "17.0.7" - modules = [ 'javafx.controls' , 'javafx.fxml'] - +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 }