Skip to content

Commit c1e21ba

Browse files
committed
Bump ASM to 9.7, SRGUtils, and JoptSimple
1 parent 892d0c2 commit c1e21ba

2 files changed

Lines changed: 19 additions & 5 deletions

File tree

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,9 @@ configurations {
6666
}
6767

6868
dependencies {
69-
implementation 'org.ow2.asm:asm:9.5'
70-
implementation 'org.ow2.asm:asm-tree:9.5'
71-
implementation 'org.ow2.asm:asm-util:9.5'
72-
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
73-
implementation 'net.minecraftforge:srgutils:0.5.7'
69+
implementation(libs.bundles.asm)
70+
implementation(libs.jopt.simple)
71+
implementation(libs.srgutils)
7472

7573
markers 'net.minecraftforge:mergetool-cpw:1.0'
7674
markers 'net.minecraftforge:mergetool-fml:1.0'

settings.gradle

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,20 @@ plugins {
1212
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
1313
}
1414

15+
dependencyResolutionManagement {
16+
versionCatalogs {
17+
libs {
18+
library('jopt-simple', 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3')
19+
library('srgutils', 'net.minecraftforge:srgutils:0.5.10')
20+
21+
version('asm', '9.7')
22+
library('asm', 'org.ow2.asm', 'asm' ).versionRef('asm')
23+
library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm')
24+
library('asm-tree', 'org.ow2.asm', 'asm-tree' ).versionRef('asm')
25+
library('asm-util', 'org.ow2.asm', 'asm-util' ).versionRef('asm')
26+
bundle('asm', ['asm', 'asm-commons', 'asm-tree', 'asm-util'])
27+
}
28+
}
29+
}
30+
1531
rootProject.name = 'MergeTool'

0 commit comments

Comments
 (0)