Merge branch 'version/7.2.x'

build.gradle.kts

@@ -29,15 +29,6 @@ if (!project.hasProperty("gitCommitHash")) {
     }
 }
 
-// Work around https://github.com/gradle/gradle/issues/4823
-subprojects {
-    if (buildscript.sourceFile?.extension?.toLowerCase() == "kts"
-        && parent != rootProject) {
-        generateSequence(parent) { project -> project.parent.takeIf { it != rootProject } }
-            .forEach { evaluationDependsOn(it.path) }
-    }
-}
-
 logger.lifecycle("""
 *******************************************
  You are building WorldEdit!
@@ -62,11 +53,11 @@ val totalReport = tasks.register<JacocoReport>("jacocoTotalReport") {
             executionData(
                     fileTree(proj.buildDir.absolutePath).include("**/jacoco/*.exec")
             )
-            sourceSets(proj.the<JavaPluginConvention>().sourceSets["main"])
+            sourceSets(proj.the<JavaPluginExtension>().sourceSets["main"])
             reports {
-                xml.isEnabled = true
-                xml.destination = rootProject.buildDir.resolve("reports/jacoco/report.xml")
-                html.isEnabled = true
+                xml.required.set(true)
+                xml.outputLocation.set(rootProject.buildDir.resolve("reports/jacoco/report.xml"))
+                html.required.set(true)
             }
             dependsOn(proj.tasks.named("test"))
         }

buildSrc/build.gradle.kts

@@ -49,14 +49,14 @@ dependencies {
     implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1")
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
     implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.0")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1")
-    implementation("org.spongepowered:spongegradle-plugin-development:2.0.2")
-    implementation("org.spongepowered:vanillagradle:0.2.1-20220619.210040-41")
-    implementation("net.minecraftforge.gradle:ForgeGradle:5.1.68")
+    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0")
+    implementation("org.spongepowered:spongegradle-plugin-development:2.1.1")
+    implementation("org.spongepowered:vanillagradle:0.2.1-20230603.203956-54")
+    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.6")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
-    implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.5")
-    implementation("org.spongepowered:mixingradle:0.7.32")
+    implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5")
+    implementation("org.spongepowered:mixingradle:0.7.33")
 }

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -19,7 +19,7 @@ fun Project.applyPlatformAndCoreConfiguration(javaRelease: Int = 17) {
     applyCommonJavaConfiguration(
         sourcesJar = name in setOf("worldedit-core", "worldedit-bukkit", "worldedit-fabric"),
         javaRelease = javaRelease,
-        banSlf4j = name !in setOf("worldedit-fabric", "worldedit-forge"),
+        banSlf4j = name !in setOf("worldedit-fabric", "worldedit-forge", "worldedit-sponge"),
     )
 
     ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"

gradle.properties

@@ -4,5 +4,5 @@ version=7.3.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-loom.version=1.1-SNAPSHOT
-mixin.version=0.11.4+mixin.0.8.5
+loom.version=1.2.7
+mixin.version=0.12.5+mixin.0.8.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "worldedit"
 
 include("worldedit-libs")
 
-listOf("1.17.1", "1.18.2", "1.19", "1.19.3", "1.19.4").forEach {
+listOf("1.17.1", "1.18.2", "1.19", "1.19.3", "1.19.4", "1.20").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 

worldedit-bukkit/adapters/adapter-1.17.1/build.gradle.kts

@@ -1,5 +1,7 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 applyPaperweightAdapterConfiguration(javaRelease = 17)
 
 dependencies {
-    paperDevBundle("1.17.1-R0.1-20220414.034903-210")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.17.1-R0.1-20220414.034903-210")
 }

worldedit-bukkit/adapters/adapter-1.18.2/build.gradle.kts

@@ -1,6 +1,8 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.18.2-R0.1-20220304.102823-4")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.18.2-R0.1-20220304.102823-4")
 }

worldedit-bukkit/adapters/adapter-1.19.3/build.gradle.kts

@@ -1,6 +1,8 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.19.3-R0.1-20221226.180038-55")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.3-R0.1-20221226.180038-55")
 }

worldedit-bukkit/adapters/adapter-1.19.4/build.gradle.kts

@@ -1,6 +1,8 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.19.4-R0.1-20230315.180941-2")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230315.180941-2")
 }

worldedit-bukkit/adapters/adapter-1.19/build.gradle.kts

@@ -1,6 +1,8 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 applyPaperweightAdapterConfiguration()
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.19-R0.1-20220609.175204-1")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19-R0.1-20220609.175204-1")
 }

worldedit-bukkit/adapters/adapter-1.20/build.gradle.kts

@@ -0,0 +1,8 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
+applyPaperweightAdapterConfiguration()
+
+dependencies {
+    // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20-R0.1-20230608.125933-3")
+}