Skip to content

Commit

Permalink
Declare properties and dependency versions in gradle.properties>
Browse files Browse the repository at this point in the history
Also update some dependencies (where non-breaking)
  • Loading branch information
NebelNidas committed Apr 11, 2024
1 parent 6fd510c commit c542281
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 29 deletions.
22 changes: 11 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -44,7 +44,7 @@ subprojects {

checkstyle {
configFile = rootProject.file('checkstyle.xml')
toolVersion = '10.12.4'
toolVersion = rootProject.checkstyle_version
}

publishing {
Expand Down
2 changes: 1 addition & 1 deletion enigma-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions enigma-swing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand All @@ -38,4 +38,4 @@ publishing {
publication.from components.java
}
}
}
}
18 changes: 9 additions & 9 deletions enigma/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c542281

Please sign in to comment.