Skip to content

Commit dc322cb

Browse files
committed
Update gradle to 9.2.0
1 parent 9d5e1cb commit dc322cb

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

build-logic/src/main/kotlin/geyser.platform-conventions.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tasks {
1111
"id" to "geyser",
1212
"name" to "Geyser",
1313
"version" to project.version,
14-
"description" to project.description,
14+
"description" to project.description as String,
1515
"url" to "https://geysermc.org",
1616
"author" to "GeyserMC"
1717
)

build-logic/src/main/kotlin/geyser.publish-conventions.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,3 @@ indra {
77
publishSnapshotsTo("geysermc", "https://repo.opencollab.dev/maven-snapshots")
88
publishReleasesTo("geysermc", "https://repo.opencollab.dev/maven-releases")
99
}
10-
11-
publishing {
12-
// skip shadow jar from publishing. Workaround for https://github.com/johnrengelman/shadow/issues/651
13-
val javaComponent = project.components["java"] as AdhocComponentWithVariants
14-
javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) { skip() }
15-
}

build-logic/src/main/kotlin/geyser.shadow-conventions.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

33
plugins {
44
id("geyser.base-conventions")
5-
id("com.github.johnrengelman.shadow")
5+
id("com.gradleup.shadow")
6+
}
7+
8+
shadow {
9+
addShadowVariantIntoJavaComponent = false
610
}
711

812
tasks {
@@ -33,4 +37,4 @@ tasks {
3337
named("build") {
3438
dependsOn(shadowJar)
3539
}
36-
}
40+
}

core/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ dependencies {
5959
}
6060

6161
// Test
62+
testImplementation(platform("org.junit:junit-bom:6.0.0"))
6263
testImplementation(libs.junit)
6364
testImplementation(libs.mockito)
65+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
6466

6567
// Annotation Processors
6668
compileOnly(projects.ap)
@@ -108,7 +110,7 @@ fun isDevBuild(branch: String, repository: String): Boolean {
108110
return branch != "master" || repository.equals("https://github.com/GeyserMC/Geyser", ignoreCase = true).not()
109111
}
110112

111-
inner class GitInfo {
113+
class GitInfo {
112114
val branch: String
113115
val commit: String
114116
val commitAbbrev: String

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ minecraftauth = "4.1.1"
1717
mcprotocollib = "1.21.9-20251026.124736-17"
1818
adventure = "4.25.0"
1919
adventure-platform = "4.4.1"
20-
junit = "5.9.2"
20+
junit = "6.0.0"
2121
checkerframework = "3.19.0"
2222
log4j = "2.20.0"
2323
jline = "3.21.0"
@@ -47,7 +47,7 @@ runvelocityversion = "3.4.0-SNAPSHOT"
4747

4848
# plugin versions
4949
indra = "3.1.3"
50-
shadow = "8.1.1"
50+
shadow = "9.2.2"
5151
architectury-plugin = "3.4-SNAPSHOT"
5252
architectury-loom = "1.11-SNAPSHOT"
5353
minotaur = "2.8.7"
@@ -149,7 +149,7 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
149149
# plugins
150150
lombok = { group = "io.freefair.gradle", name = "lombok-plugin", version.ref = "lombok" }
151151
indra = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
152-
shadow = { group = "com.github.johnrengelman", name = "shadow", version.ref = "shadow" }
152+
shadow = { group = "com.gradleup.shadow", name = "com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }
153153
architectury-plugin = { group = "architectury-plugin", name = "architectury-plugin.gradle.plugin", version.ref = "architectury-plugin" }
154154
architectury-loom = { group = "dev.architectury.loom", name = "dev.architectury.loom.gradle.plugin", version.ref = "architectury-loom" }
155155
minotaur = { group = "com.modrinth.minotaur", name = "Minotaur", version.ref = "minotaur" }

gradle/wrapper/gradle-wrapper.jar

-42.6 KB
Binary file not shown.

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.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)