Update Gradle and some plugins (#2923)

octylFractal · web-flow · commit 0819a0e0587d · 2026-03-08T10:36:51.000Z
Fixes #2920
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 
 repositories {
     maven {
-        name = "SpongePowered Snapshots"
-        url = uri("https://repo.spongepowered.org/repository/maven-snapshots/")
+        name = "SpongePowered"
+        url = uri("https://repo.spongepowered.org/repository/maven-releases/")
     }
     maven {
         name = "NeoForged"
diff --git a/build-logic/src/main/kotlin/buildlogic.platform.gradle.kts b/build-logic/src/main/kotlin/buildlogic.platform.gradle.kts
@@ -10,6 +10,10 @@ val platform = extensions.create<buildlogic.PlatformExtension>("platform")
 platform.includeClasspath.convention(false)
 platform.extraAttributes.convention(mapOf())
 
+shadow {
+    addShadowVariantIntoJavaComponent = false
+}
+
 tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
     archiveClassifier.set("dist")
     relocate("com.sk89q.jchronic", "com.sk89q.worldedit.jchronic")
@@ -43,11 +47,6 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
         }
     }
 }
-val javaComponent = components["java"] as AdhocComponentWithVariants
-// I don't think we want this published (it's the shadow jar)
-javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
-    skip()
-}
 
 afterEvaluate {
     tasks.named<Jar>("jar") {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,8 +26,7 @@ sponge-api-major = "18"
 parchment-minecraft = "1.21.11"
 parchment-mappings = "2025.12.20"
 
-# https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/vanillagradle/
-sponge-vanillagradle = "0.2.2-20251112.100313-2"
+sponge-vanillagradle = "0.2.2"
 
 # Minimum versions we apply to make dependencies support newer Java
 minimumAsm = "9.7"
@@ -44,7 +43,7 @@ sponge-vanillagradle = { module = "org.spongepowered:vanillagradle", version.ref
 
 levelHeadered = "net.octyl.level-headered:plugin:0.1.1"
 japicmp = "me.champeau.gradle:japicmp-gradle-plugin:0.4.6"
-shadow = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.10"
+shadow = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.3.2"
 jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:6.0.4"
 
 errorprone-gradle-plugin = "net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:5.1.0"
diff --git a/gradle/shared-scripts/repo-reconfiguration.settings.gradle.kts b/gradle/shared-scripts/repo-reconfiguration.settings.gradle.kts
@@ -27,52 +27,33 @@ object Isolated {
         "file:",
     )
 
-    // Until https://github.com/gradle/gradle/issues/31888 is fixed in 9.4.0
-    // we need to explicitly exclude unique snapshots
-    private val UNIQUE_SNAPSHOT_MODULES = listOf(
-        ModuleDeclaration("org.spongepowered", "spongeapi"),
-        ModuleDeclaration("org.spongepowered", "vanillagradle"),
-        ModuleDeclaration("me.lucko", "spark-api"),
-    )
-
-    private fun MavenRepositoryContentDescriptor.enhancedReleasesOnly() {
-        releasesOnly()
-        UNIQUE_SNAPSHOT_MODULES.forEach {
-            if (it.version != null) {
-                excludeVersion(it.group, it.name, it.version)
-            } else {
-                excludeModule(it.group, it.name)
-            }
-        }
-    }
-
     private val REPO_RECONFIGURATIONS = listOf(
         "https://repo.maven.apache.org/maven2/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/maven-central-proxy/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                 },
         "https://plugins.gradle.org/m2" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/plugin-portal-proxy/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                 },
         "https://libraries.minecraft.net/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/minecraft/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                 },
         "https://maven.neoforged.net/releases/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/neoforged/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeGroupAndSubgroups("net.minecraftforge")
                     includeGroupAndSubgroups("net.neoforged")
                 },
         "https://maven.minecraftforge.net/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/forge/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeGroupAndSubgroups("net.minecraftforge")
                 },
         "https://maven.parchmentmc.org/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/parchment/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeGroup("org.parchmentmc.data")
                 },
         "https://repo.papermc.io/repository/maven-public/" to
@@ -85,29 +66,29 @@ object Isolated {
                 },
         "https://maven.fabricmc.net/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/fabricmc/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeGroupAndSubgroups("fabric-loom")
                     includeGroupAndSubgroups("net.fabricmc")
                     excludeModule("net.fabricmc", "yarn")
                 },
         "https://maven.fabricmc.net/#yarn-only" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/fabricmc-yarn/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeModule("net.fabricmc", "yarn")
                 },
         "https://repo.spongepowered.org/repository/maven-releases/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/spongepowered-releases/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeGroupAndSubgroups("org.spongepowered")
                 },
         "https://repo.spongepowered.org/repository/maven-snapshots/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/spongepowered-snapshots/") {
-                    // Cannot actually call snapshotsOnly() because it excludes unique snapshots right now
+                    snapshotsOnly()
                     includeGroupAndSubgroups("org.spongepowered")
                 },
         "https://repo.enginehub.org/libs-release/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/libs-release/") {
-                    enhancedReleasesOnly()
+                    releasesOnly()
                     includeGroupAndSubgroups("com.sk89q")
                     includeGroupAndSubgroups("org.enginehub")
                 },
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,8 +8,8 @@ pluginManagement {
             url = uri("https://maven.fabricmc.net/")
         }
         maven {
-            name = "SpongePowered Snapshots"
-            url = uri("https://repo.spongepowered.org/repository/maven-snapshots/")
+            name = "SpongePowered"
+            url = uri("https://repo.spongepowered.org/repository/maven-releases/")
         }
         maven {
             name = "NeoForged"
diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
@@ -87,15 +87,16 @@ tasks.named<Copy>("processResources") {
     }
 }
 
-tasks.register<ShadowJar>("shadeReobfAdapters") {
+val shadeReobfAdapters = tasks.register<ShadowJar>("shadeReobfAdapters") {
     archiveClassifier.set("reobf-adapters")
     configurations.add(adaptersReobf.get())
 
     relocate("com.sk89q.worldedit.bukkit.adapter.impl", "com.sk89q.worldedit.bukkit.adapter.impl.reobf")
 }
 
 tasks.named<ShadowJar>("shadowJar") {
-    from(tasks.named("shadeReobfAdapters"))
+    from(zipTree(shadeReobfAdapters.map { it.archiveFile }))
+    configurations.add(project.configurations.named("runtimeClasspath"))
     configurations.add(adapters.get())
     dependencies {
         // In tandem with not bundling log4j, we shouldn't relocate base package here.
@@ -105,7 +106,7 @@ tasks.named<ShadowJar>("shadowJar") {
         // If it turns out not to be true for Spigot/Paper, our only two official platforms, this can be uncommented.
         // include(dependency("org.apache.logging.log4j:log4j-api"))
         include(dependency("org.antlr:antlr4-runtime"))
-        include(dependency("org.bstats:"))
+        include(dependency("org.bstats:.*"))
         include(dependency("io.papermc:paperlib"))
         include(dependency("it.unimi.dsi:fastutil"))
         include(dependency("com.sk89q.lib:jlibnoise"))
diff --git a/worldedit-sponge/build.gradle.kts b/worldedit-sponge/build.gradle.kts
@@ -88,7 +88,7 @@ configure<BasePluginExtension> {
 
 tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
     dependencies {
-        include(dependency("org.bstats:"))
+        include(dependency("org.bstats:.*"))
         include(dependency("org.antlr:antlr4-runtime"))
         include(dependency("com.sk89q.lib:jlibnoise"))
 

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ pluginManagement {`
`8`	`8`	`url = uri("https://maven.fabricmc.net/")`
`9`	`9`	`}`
`10`	`10`	`maven {`
`11`		`- name = "SpongePowered Snapshots"`
`12`		`- url = uri("https://repo.spongepowered.org/repository/maven-snapshots/")`
	`11`	`+ name = "SpongePowered"`
	`12`	`+ url = uri("https://repo.spongepowered.org/repository/maven-releases/")`
`13`	`13`	`}`
`14`	`14`	`maven {`
`15`	`15`	`name = "NeoForged"`