diff options
| author | Martin Robertz <dream-master@gmx.net> | 2023-09-23 15:18:54 +0200 |
|---|---|---|
| committer | Martin Robertz <dream-master@gmx.net> | 2023-09-23 15:18:54 +0200 |
| commit | b55e8996fadc05e0cc728974e6dac8ed0105ba30 (patch) | |
| tree | e7347e9a229401ffd99d5e4094b40db4e25fa19c | |
| parent | af3a8361c437e216742712b79a9ba11f135714ba (diff) | |
| download | GT5-Unofficial-b55e8996fadc05e0cc728974e6dac8ed0105ba30.tar.gz GT5-Unofficial-b55e8996fadc05e0cc728974e6dac8ed0105ba30.tar.bz2 GT5-Unofficial-b55e8996fadc05e0cc728974e6dac8ed0105ba30.zip | |
update bs+deps
Former-commit-id: e491884044e30eec70f96218bbaccc4cf68d7739
| -rw-r--r-- | build.gradle | 43 | ||||
| -rw-r--r-- | dependencies.gradle | 2 |
2 files changed, 32 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle index ac9652d0a3..6a54d13b0c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1695323114 +//version: 1695474595 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output') def projectJavaVersion = JavaLanguageVersion.of(8) boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false +boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false + +final String CHECKSTYLE_CONFIG = """ +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> +<module name="Checker"> + <module name="TreeWalker"> + <!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block --> + <module name="SuppressionCommentFilter"/> + <module name="AvoidStarImport"> + <!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE --> + <property name="allowStaticMemberImports" value="true"/> + </module> + </module> +</module> +""" checkPropertyExists("modName") checkPropertyExists("modId") @@ -140,6 +157,17 @@ if (!disableSpotless) { apply from: Blowdryer.file('spotless.gradle') } +if (!disableCheckstyle) { + apply plugin: 'checkstyle' + tasks.named("checkstylePatchedMc") { enabled = false } + tasks.named("checkstyleMcLauncher") { enabled = false } + tasks.named("checkstyleIdeVirtualMain") { enabled = false } + tasks.named("checkstyleInjectedTags") { enabled = false } + checkstyle { + config = resources.text.fromString(CHECKSTYLE_CONFIG) + } +} + String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" @@ -765,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.4.0' - def asmVersion = '9.4' + def lwjgl3ifyVersion = '1.5.0' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.5') } - java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false} - java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") - java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') - java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} } diff --git a/dependencies.gradle b/dependencies.gradle index 4038924ff4..ba2504f69c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.19:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.23:dev') api("com.github.GTNewHorizons:TecTech:5.3.3:dev") api("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { exclude group:"com.github.GTNewHorizons", module:"bartworks" |