Skip to content

Commit b00dab0

Browse files
committed
Bump ASM and other dependencies.
1 parent 7f597f0 commit b00dab0

File tree

2 files changed

+37
-17
lines changed

2 files changed

+37
-17
lines changed

build.gradle

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2-
import net.minecraftforge.gradleutils.PomUtils
32

43
plugins {
54
id 'java-library'
65
id 'eclipse'
76
id 'maven-publish'
8-
id 'org.cadixdev.licenser' version '0.6.1'
97
id 'com.github.johnrengelman.shadow' version '8.1.1'
10-
id 'net.minecraftforge.gradleutils' version '2.+'
8+
id 'net.minecraftforge.licenser' version '1.0.1'
9+
id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
1110
}
1211

1312
group = 'net.minecraftforge'
@@ -27,17 +26,15 @@ repositories {
2726
}
2827

2928
dependencies {
30-
implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
31-
api 'net.minecraftforge:srgutils:0.5.1'
32-
implementation 'org.ow2.asm:asm:9.5'
33-
implementation 'org.ow2.asm:asm-commons:9.5'
34-
implementation 'org.ow2.asm:asm-tree:9.5'
29+
implementation(libs.jopt.simple)
30+
api(libs.srgutils)
31+
implementation(libs.bundles.asm)
3532

36-
testImplementation platform('org.junit:junit-bom:5.8.1')
37-
testImplementation 'org.junit.jupiter:junit-jupiter'
38-
testImplementation 'org.powermock:powermock-core:2.0.9'
33+
testImplementation(libs.junit.api)
34+
testRuntimeOnly(libs.bundles.junit.runtime)
35+
testImplementation(libs.powermock)
3936

40-
compileOnly 'org.jetbrains:annotations:24.0.1'
37+
compileOnly(libs.nulls)
4138
}
4239

4340
tasks.named('test', Test).configure {
@@ -96,7 +93,7 @@ tasks.named('compileJava', JavaCompile).configure {
9693
}
9794

9895
changelog {
99-
fromTag '0.1'
96+
from '0.1'
10097
}
10198

10299
license {
@@ -114,17 +111,17 @@ publishing {
114111
description = 'A tool that renames java bytecode elements.'
115112
url = 'https://github.com/MinecraftForge/ForgeAutoRenamingTool'
116113

117-
PomUtils.setGitHubDetails(pom, 'ForgeAutoRenamingTool')
114+
gradleutils.pom.setGitHubDetails(pom, 'ForgeAutoRenamingTool')
118115

119-
license PomUtils.Licenses.LGPLv2_1
116+
license gradleutils.pom.Licenses.LGPLv2_1
120117

121118
developers {
122-
developer PomUtils.Developers.LexManos
119+
developer gradleutils.pom.Developers.LexManos
123120
}
124121
}
125122
}
126123

127124
repositories {
128-
maven gradleutils.getPublishingForgeMaven()
125+
maven gradleutils.publishingForgeMaven
129126
}
130127
}

settings.gradle

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,27 @@ 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+
library('nulls', 'org.jetbrains:annotations:24.0.1')
21+
library('powermock', 'org.powermock:powermock-core:2.0.9')
22+
23+
version('asm', '9.7')
24+
library('asm', 'org.ow2.asm', 'asm' ).versionRef('asm')
25+
library('asm-commons', 'org.ow2.asm', 'asm-commons').versionRef('asm')
26+
library('asm-tree', 'org.ow2.asm', 'asm-tree' ).versionRef('asm')
27+
bundle('asm', ['asm', 'asm-commons', 'asm-tree'])
28+
29+
version('junit', '5.10.1')
30+
library('junit-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
31+
library('junit-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
32+
library('junit-platform-launcher', 'org.junit.platform:junit-platform-launcher:1.10.1')
33+
bundle('junit-runtime', ['junit-engine', 'junit-platform-launcher'])
34+
}
35+
}
36+
}
37+
1538
rootProject.name = 'ForgeAutoRenamingTool'

0 commit comments

Comments
 (0)