From c542281e627803775c636b2ed52526f6083e161b Mon Sep 17 00:00:00 2001 From: NebelNidas Date: Thu, 11 Apr 2024 13:30:48 +0200 Subject: [PATCH] Declare properties and dependency versions in `gradle.properties`> Also update some dependencies (where non-breaking) --- build.gradle | 22 +++++++++++----------- enigma-server/build.gradle | 2 +- enigma-swing/build.gradle | 16 ++++++++-------- enigma/build.gradle | 18 +++++++++--------- gradle.properties | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 29 deletions(-) create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 40dc4be3..38359033 100644 --- a/build.gradle +++ b/build.gradle @@ -15,18 +15,18 @@ subprojects { } dependencies { - implementation 'com.google.guava:guava:32.1.2-jre' - implementation 'com.google.code.gson:gson:2.10.1' - implementation 'net.fabricmc:mapping-io:0.5.0' - - compileOnly 'org.jetbrains:annotations:24.0.1' - - testImplementation 'junit:junit:4.13.2' - testImplementation 'org.hamcrest:hamcrest:2.2' + implementation "com.google.guava:guava:${guava_version}-jre" + implementation "com.google.code.gson:gson:${gson_version}" + implementation "net.fabricmc:mapping-io:${mappingio_version}" + + compileOnly "org.jetbrains:annotations:${jetbrains_annotations_version}" + + testImplementation "junit:junit:${junit_version}" + testImplementation "org.hamcrest:hamcrest:${hamcrest_version}" } - group = 'cuchaz' - version = '2.5.0' + group = rootProject.group + version = rootProject.version version = version + (System.getenv("GITHUB_ACTIONS") ? "" : "+local") @@ -44,7 +44,7 @@ subprojects { checkstyle { configFile = rootProject.file('checkstyle.xml') - toolVersion = '10.12.4' + toolVersion = rootProject.checkstyle_version } publishing { diff --git a/enigma-server/build.gradle b/enigma-server/build.gradle index 0daa490e..fed2a586 100644 --- a/enigma-server/build.gradle +++ b/enigma-server/build.gradle @@ -4,7 +4,7 @@ plugins { dependencies { implementation project(':enigma') - implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' + implementation "net.sf.jopt-simple:jopt-simple:${jopt_simple_version}" } application { diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index 452df5e7..c3202002 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle @@ -14,15 +14,15 @@ dependencies { implementation project(':enigma') implementation project(':enigma-server') - implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' - implementation 'com.formdev:flatlaf:3.2.5' - implementation 'com.formdev:flatlaf-extras:3.2.5' // for SVG icons - implementation 'de.sciss:syntaxpane:1.2.1' - implementation 'com.github.lukeu:swing-dpi:0.10' - implementation 'org.drjekyll:fontchooser:2.5.2' + implementation "net.sf.jopt-simple:jopt-simple:${jopt_simple_version}" + implementation "com.formdev:flatlaf:${flatlaf_version}" + implementation "com.formdev:flatlaf-extras:${flatlaf_version}" // for SVG icons + implementation "de.sciss:syntaxpane:${syntaxpane_version}" + implementation "com.github.lukeu:swing-dpi:${swing_dpi_version}" + implementation "org.drjekyll:fontchooser:${fontchooser_version}" flatLafNatives.forEach { - implementation 'com.formdev:flatlaf:3.2.5:' + it + implementation "com.formdev:flatlaf:${flatlaf_version}:" + it } } @@ -38,4 +38,4 @@ publishing { publication.from components.java } } -} \ No newline at end of file +} diff --git a/enigma/build.gradle b/enigma/build.gradle index 44f26808..9621c008 100644 --- a/enigma/build.gradle +++ b/enigma/build.gradle @@ -3,18 +3,18 @@ configurations { } dependencies { - implementation 'org.ow2.asm:asm:9.6' - implementation 'org.ow2.asm:asm-commons:9.6' - implementation 'org.ow2.asm:asm-tree:9.6' - implementation 'org.ow2.asm:asm-util:9.6' + implementation "org.ow2.asm:asm:${asm_version}" + implementation "org.ow2.asm:asm-commons:${asm_version}" + implementation "org.ow2.asm:asm-tree:${asm_version}" + implementation "org.ow2.asm:asm-util:${asm_version}" - implementation 'org.bitbucket.mstrobel:procyon-compilertools:0.6.0' - implementation 'net.fabricmc:cfr:0.2.2' - implementation 'org.vineflower:vineflower:1.10.0' + implementation "org.bitbucket.mstrobel:procyon-compilertools:${procyon_version}" + implementation "net.fabricmc:cfr:${fabric_cfr_version}" + implementation "org.vineflower:vineflower:${vineflower_version}" - proGuard 'com.guardsquare:proguard-base:7.4.0-beta02' + proGuard "com.guardsquare:proguard-base:${proguard_version}" - testImplementation 'com.google.jimfs:jimfs:1.2' + testImplementation "com.google.jimfs:jimfs:${jimfs_version}" } // Generate "version.txt" file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..72647c29 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,33 @@ +# Gradle Properties +org.gradle.jvmargs = -Xmx2G + +# Gradle Plugins +checkstyle_version = 10.12.5 +shadow_version = 7.1.2 + +# Project properties +group = cuchaz +version = 2.5.0 + +# Project Dependencies +# Shared +guava_version = 33.1.0 +gson_version = 2.10.1 +mappingio_version = 0.5.1 +jetbrains_annotations_version = 24.1.0 +junit_version = 4.13.2 +hamcrest_version = 2.2 +# Core +asm_version = 9.6 +vineflower_version = 1.10.0 +fabric_cfr_version = 0.2.2 +procyon_version = 0.6.0 +proguard_version = 7.4.2 +jimfs_version = 1.3.0 +# Server +jopt_simple_version = 6.0-alpha-3 +# GUI +flatlaf_version = 3.4.1 +syntaxpane_version = 1.2.1 +swing_dpi_version = 0.10 +fontchooser_version = 2.5.2