Merge branch 'version/7.3.x'

.github/workflows/codeql-analysis.yml

@@ -25,39 +25,21 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
         cache: 'gradle'
         distribution: 'temurin'
 
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/gradle.yml

@@ -11,22 +11,30 @@ jobs:
         os: [ubuntu-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
+
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 17
-        cache: 'gradle'
         distribution: 'temurin'
-    - name: Build with Gradle
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+      with:
+        cache-read-only: ${{ !(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/version/')) }}
+
+    - name: Execute Gradle build
       run: ./gradlew build -s
-    - uses: actions/upload-artifact@v3
+
+    - uses: actions/upload-artifact@v4
       name: Archive Reports
       if: always()
       with:
         name: reports for ${{ matrix.os }}
         path: '**/build/reports/**'
-    - uses: actions/upload-artifact@v3
+
+    - uses: actions/upload-artifact@v4
       name: Archive Logs
       if: always()
       with:

buildSrc/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.1.14")
     implementation("org.spongepowered:spongegradle-plugin-development:2.2.0")
     implementation("org.spongepowered:vanillagradle:0.2.1-20231105.223944-69")
-    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.20")
+    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.21")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")

buildSrc/src/main/kotlin/CommonJavaConfig.kt

@@ -22,13 +22,14 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int =
         .matching { it.name == "compileJava" || it.name == "compileTestJava" }
         .configureEach {
             val disabledLint = listOf(
-                "processing", "path", "fallthrough", "serial"
+                "processing", "path", "fallthrough", "serial", "overloads",
             )
             options.release.set(javaRelease)
             options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })
             options.isDeprecation = true
             options.encoding = "UTF-8"
             options.compilerArgs.add("-parameters")
+            options.compilerArgs.add("-Werror")
         }
 
     configure<CheckstyleExtension> {
@@ -53,7 +54,9 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int =
     tasks.withType<Javadoc>().configureEach {
         options.encoding = "UTF-8"
         (options as StandardJavadocDocletOptions).apply {
-            addStringOption("Xdoclint:none", "-quiet")
+            addBooleanOption("Werror", true)
+            addBooleanOption("Xdoclint:all", true)
+            addBooleanOption("Xdoclint:-missing", true)
             tags(
                 "apiNote:a:API Note:",
                 "implSpec:a:Implementation Requirements:",

buildSrc/src/main/kotlin/LibsConfig.kt

@@ -52,6 +52,7 @@ fun Project.applyLibrariesConfiguration() {
             exclude(dependency("com.google.guava:guava"))
             exclude(dependency("com.google.code.gson:gson"))
             exclude(dependency("com.google.errorprone:error_prone_annotations"))
+            exclude(dependency("com.google.guava:failureaccess"))
             exclude(dependency("org.checkerframework:checker-qual"))
             exclude(dependency("org.jetbrains:annotations"))
             exclude(dependency("org.apache.logging.log4j:log4j-api"))

buildSrc/src/main/kotlin/Versions.kt

@@ -3,13 +3,13 @@ import org.gradle.api.Project
 object Versions {
     const val TEXT = "3.0.4"
     const val TEXT_EXTRAS = "3.0.6"
-    const val PISTON = "0.5.8"
-    const val AUTO_VALUE = "1.9"
-    const val JUNIT = "5.8.1"
-    const val MOCKITO = "4.3.1"
-    const val FAST_UTIL = "8.5.9"
-    const val GUAVA = "31.1-jre"
-    const val GSON = "2.10"
+    const val PISTON = "0.5.10"
+    const val AUTO_VALUE = "1.10.4"
+    const val JUNIT = "5.10.2"
+    const val MOCKITO = "5.11.0"
+    const val FAST_UTIL = "8.5.12"
+    const val GUAVA = "32.1.3-jre"
+    const val GSON = "2.10.1"
     const val LOG4J = "2.19.0"
     const val LIN_BUS = "0.1.0-SNAPSHOT"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

verification/build.gradle.kts

@@ -44,7 +44,8 @@ tasks.check {
 // Pull the version before our current version.
 val baseVersion = "(,${rootProject.version.toString().substringBefore("-SNAPSHOT")}["
 for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "forge", "sponge")) {
-    val capitalizedFragment = projectFragment.capitalize(Locale.ROOT)
+    val capitalizedFragment =
+        projectFragment.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
     val proj = project(":worldedit-$projectFragment")
     evaluationDependsOn(proj.path)
 

verification/src/changes/accepted-bukkit-public-api-changes.json

@@ -1,11 +1,25 @@
 {
-  "Removal of override method that exists in superclass": [
-    {
-      "type": "com.sk89q.worldedit.bukkit.BukkitWorld",
-      "member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.fullySupports3DBiomes()",
-      "changes": [
-        "METHOD_REMOVED"
-      ]
-    }
-  ]
-}
+    "Incorrect removal detection due to problems with classpath": [
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitWorld",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.fullySupports3DBiomes()",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitServerInterface",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitServerInterface.getId()",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitWorld",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitWorld.getId()",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        }
+    ]
+}

verification/src/changes/accepted-cli-public-api-changes.json

@@ -1,2 +1,11 @@
 {
-}
+    "Incorrect removal detection due to problems with classpath": [
+        {
+            "type": "com.sk89q.worldedit.cli.schematic.ClipboardWorld",
+            "member": "Method com.sk89q.worldedit.cli.schematic.ClipboardWorld.getId()",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        }
+    ]
+}