Skip to content

Commit d83018a

Browse files
committed
Bump ASM and shade libraries
1 parent 79d66b3 commit d83018a

4 files changed

Lines changed: 19 additions & 5 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
.classpath
99
.project
1010
*.lzma
11+
/output/
12+
/versions/

build.gradle

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'java-library'
33
id 'maven-publish'
44
id 'eclipse'
5-
id 'com.github.johnrengelman.shadow' version '8.1.1'
5+
id 'com.gradleup.shadow' version '9.0.2'
66
id 'com.github.ben-manes.versions' version '0.51.0'
77
id 'net.minecraftforge.licenser' version '1.0.1'
88
id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
@@ -47,6 +47,18 @@ tasks.named('jar').configure {
4747
tasks.named('shadowJar').configure {
4848
archiveClassifier = 'fatjar'
4949
jarSigner.sign(it)
50+
51+
exclude '**/Log4j2Plugins.dat'
52+
53+
enableAutoRelocation = true
54+
relocationPrefix = 'net.minecraftforge.installertools.shadow'
55+
// Rewrite JOpt's message files, so that help text is displayed nicely.
56+
transform(com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer) {
57+
paths = [ 'Messages.properties$' ]
58+
keyTransformer = { key -> 'net.minecraftforge.installertools.shadow.' + key }
59+
}
60+
transform(com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer)
61+
transform(com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer)
5062
}
5163

5264
artifacts {
@@ -57,8 +69,8 @@ dependencies {
5769
implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
5870
implementation 'com.google.code.gson:gson:2.10.1'
5971
implementation 'de.siegmar:fastcsv:2.2.2'
60-
implementation 'net.minecraftforge:srgutils:0.5.10'
61-
implementation 'org.ow2.asm:asm-commons:9.7'
72+
implementation 'net.minecraftforge:srgutils:0.6.2'
73+
implementation 'org.ow2.asm:asm-commons:9.9.1'
6274
}
6375

6476
publishing {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/java/net/minecraftforge/installertools/DownloadMojmaps.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void process(String[] args) throws IOException {
9494
}
9595
} catch (OptionException e) {
9696
parser.printHelpOn(System.out);
97-
e.printStackTrace();
97+
throw e;
9898
}
9999
}
100100
}

0 commit comments

Comments
 (0)