From 8820e7c032c01b67827f5383261c04fb8ac0a826 Mon Sep 17 00:00:00 2001 From: alyssaongyx Date: Fri, 13 Oct 2023 04:04:53 +0800 Subject: [PATCH] Update build gradle file --- build.gradle | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 6e277c43eb..fa860280bd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,15 +6,6 @@ plugins { id 'org.openjfx.javafxplugin' version '0.0.13' } -javafx { - version = "17" - modules = [ 'javafx.controls', 'javafx.fxml'] -} - -checkstyle { - toolVersion = '10.2' -} - repositories { mavenCentral() } @@ -22,27 +13,18 @@ repositories { dependencies { 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' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1' - String javaFxVersion = '17.0.7' + def platforms = ["win", "linux", "mac"] + def javafxDependency = ["javafx-graphics", "javafx-controls", "javafx-fxml"] - 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' + for (plt in platforms) { + for (dep in javafxDependency) { + runtimeOnly "org.openjfx:$dep:$javafx.version:$plt" + } + } } -java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 -} test { useJUnitPlatform() @@ -58,11 +40,10 @@ test { } application { - mainClass.set("ally.Launcher") + mainClass.set("ally.Main") } shadowJar { - archiveFileName = 'ally.jar' archiveBaseName = "ally" archiveClassifier = null dependsOn("distZip", "distTar") @@ -70,5 +51,25 @@ shadowJar { run { standardInput = System.in - enableAssertions = true +} + +checkstyle { + toolVersion = '10.2' +} + +javafx { + version = '17.0.7' + modules = ['javafx.base', 'javafx.controls', 'javafx.fxml', 'javafx.graphics'] +} + +sourceSets { + main { + resources { + srcDirs "src/main/resources" + } + } +} + +processResources { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE }