Merge upstream v1.x

.github/workflows/build-and-test.yml

@@ -3,36 +3,42 @@ name: Build and test
 
 on:
   pull_request:
-    branches: [ master, master-fork, main ]
+    branches: [ master, main, v1.x ]
   push:
-    branches: [ master, master-fork, main ]
+    branches: [ master, main, v1.x ]
 
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
-    - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@v3
-
-    - name: Set up JDK 8 and 17
-      uses: actions/setup-java@v3
+    - name: Set up JDK versions
+      uses: actions/setup-java@v5
       with:
         java-version: |
+          21
           8
           17
         distribution: 'zulu'
         cache: gradle
 
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        build-scan-publish: true
+        build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+        build-scan-terms-of-use-agree: "yes"
+        validate-wrappers: true
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
     - name: Build the Gradle plugin
-      run: ./gradlew --info --stacktrace assemble
+      run: ./gradlew --build-cache --info --stacktrace assemble
 
     - name: Test the plugin
-      run: ./gradlew --info --stacktrace check
+      run: ./gradlew --build-cache --info --stacktrace check

.github/workflows/publish-javadoc.yml

@@ -17,24 +17,30 @@ jobs:
   javadoc:
     concurrency: javadoc-publish
     runs-on: ubuntu-latest
-    outputs:
-      result_hash: ${{ steps.deploy.outputs.hash }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repo
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - uses: actions/setup-java@v3
+      - name: Set up JDK versions
+        uses: actions/setup-java@v5
         with:
           java-version: |
+            21
             8
             17
           distribution: 'zulu'
           cache: gradle
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
+          validate-wrappers: true
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -62,8 +68,7 @@ jobs:
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
           git commit -m "Deploy javadoc from ref $TARGET_FOLDER"
           git push
-          echo "::set-output name=hash::$(git rev-parse HEAD)"
         env:
           TARGET_FOLDER: ${{ github.ref_name }}
-          COMMIT_AUTHOR: ${{ github.pusher.name }}
-          COMMIT_EMAIL: ${{ github.pusher.email }}
+          COMMIT_AUTHOR: ${{ github.event.push.pusher.name }}
+          COMMIT_EMAIL: ${{ github.event.push.pusher.email }}

.github/workflows/release-tags.yml

@@ -13,29 +13,35 @@ jobs:
   release-build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout mod repo
-        uses: actions/checkout@v3
+      - name: Checkout repo
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v3
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8 and 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK versions
+        uses: actions/setup-java@v5
         with:
           java-version: |
+            21
             8
             17
           distribution: 'zulu'
           cache: gradle
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+        with:
+          build-scan-publish: true
+          build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+          build-scan-terms-of-use-agree: "yes"
+          validate-wrappers: true
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
       - name: Build the Gradle plugin
         run: ./gradlew --info --stacktrace assemble
 

.gitignore

@@ -30,3 +30,4 @@ whitelist.json
 *.bat
 *.DS_Store
 !gradlew.bat
+/.vs/

build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
     `java-gradle-plugin`
-    id("com.palantir.git-version") version "3.0.0"
+    id("com.palantir.git-version") version "3.4.0"
     `maven-publish`
-    id("com.diffplug.spotless") version "6.25.0"
-    id("com.github.gmazzo.buildconfig") version "5.3.5"
+    id("com.diffplug.spotless") version "8.0.0"
+    id("com.github.gmazzo.buildconfig") version "5.6.8"
 }
 
 val gitVersion: groovy.lang.Closure<String> by extra
@@ -22,41 +22,44 @@ repositories {
     }
     mavenCentral()
     gradlePluginPortal()
+    mavenLocal()
 }
 
 fun pluginDep(name: String, version: String): String {
     return "${name}:${name}.gradle.plugin:${version}"
 }
 
 dependencies {
+    // JDOM2 for XML processing
+    implementation("org.jdom:jdom2:2.0.6.1")
+
     annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:1.0.1")
     testAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:1.0.1")
     compileOnly("com.github.bsideup.jabel:jabel-javac-plugin:1.0.1") { isTransitive = false }
     // workaround for https://github.com/bsideup/jabel/issues/174
-    annotationProcessor("net.java.dev.jna:jna-platform:5.13.0")
+    annotationProcessor("net.java.dev.jna:jna-platform:5.18.1")
 
     // All these plugins will be present in the classpath of the project using our plugin, but not activated until explicitly applied
-    api(pluginDep("com.gtnewhorizons.retrofuturagradle","1.4.2"))
+    api(pluginDep("com.gtnewhorizons.retrofuturagradle","1.4.9"))
 
     // Settings plugins
     api(pluginDep("com.diffplug.blowdryerSetup", "1.7.1"))
     api(pluginDep("org.gradle.toolchains.foojay-resolver-convention", "0.9.0"))
 
     // Project plugins
-    api(pluginDep("com.github.johnrengelman.shadow", "8.1.1"))
-    api(pluginDep("com.palantir.git-version", "3.0.0"))
-    api(pluginDep("org.jetbrains.gradle.plugin.idea-ext", "1.1.8"))
-    api(pluginDep("org.jetbrains.kotlin.jvm", "2.0.10"))
-    api(pluginDep("org.jetbrains.kotlin.kapt", "2.0.10"))
-    api(pluginDep("com.google.devtools.ksp", "2.0.10-1.0.24"))
+    api(pluginDep("com.gradleup.shadow", "8.3.9"))
+    api(pluginDep("com.palantir.git-version", "3.4.0"))
+    api(pluginDep("org.jetbrains.gradle.plugin.idea-ext", "1.1.10"))
+    api(pluginDep("org.jetbrains.kotlin.jvm", "2.1.10"))
+    api(pluginDep("org.jetbrains.kotlin.kapt", "2.1.10"))
+    api(pluginDep("com.google.devtools.ksp", "2.1.10-1.0.29")) // 1.0.29 is the last jvm8 supporting version
     api(pluginDep("org.ajoberstar.grgit", "4.1.1")) // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
-    api(pluginDep("io.github.goooler.shadow", "8.1.7"))
     api(pluginDep("de.undercouch.download", "5.6.0"))
-    api(pluginDep("com.github.gmazzo.buildconfig", "3.1.0")) // Unused, available for addon.gradle
-    api(pluginDep("com.modrinth.minotaur", "2.8.7"))
-    api(pluginDep("net.darkhax.curseforgegradle", "1.1.24"))
+    api(pluginDep("com.github.gmazzo.buildconfig", "5.5.4")) // 5.5.4 is the last jvm8 supporting version, unused, available for addon.gradle
+    api(pluginDep("com.modrinth.minotaur", "2.8.8"))
+    api(pluginDep("net.darkhax.curseforgegradle", "1.1.26"))
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.14.0")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
@@ -99,14 +102,15 @@ spotless {
         target(".gitignore")
 
         trimTrailingWhitespace()
-        indentWithSpaces(4)
+        leadingTabsToSpaces(4)
         endWithNewline()
     }
     java {
         target("src/*/java/**/*.java", "src/*/scala/**/*.java")
 
         toggleOffOn()
         removeUnusedImports()
+        forbidWildcardImports()
         trimTrailingWhitespace()
         eclipse("4.19").configFile("spotless.eclipseformat.xml")
     }
@@ -129,32 +133,37 @@ java {
 }
 tasks.javadoc {
     javadocTool.set(javaToolchains.javadocToolFor {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
         vendor.set(JvmVendorSpec.AZUL)
     })
     with(options as StandardJavadocDocletOptions) {
         links(
             "https://docs.gradle.org/${gradle.gradleVersion}/javadoc/",
-            "https://docs.oracle.com/en/java/javase/17/docs/api/"
+            "https://docs.oracle.com/en/java/javase/21/docs/api/"
         )
     }
 }
 tasks.withType<JavaCompile> {
-    sourceCompatibility = "17" // for the IDE support
+    sourceCompatibility = "21" // for the IDE support
     options.release.set(8)
     options.encoding = "UTF-8"
 
     javaCompiler.set(javaToolchains.compilerFor {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(21))
         vendor.set(JvmVendorSpec.AZUL)
     })
 }
 
 tasks.wrapper.configure {
-    gradleVersion = "8.5"
+    gradleVersion = "8.14.3"
     distributionType = Wrapper.DistributionType.ALL
 }
 
+tasks.updateDaemonJvm.configure {
+    languageVersion = JavaLanguageVersion.of(21)
+    vendor.set(JvmVendorSpec.AZUL)
+}
+
 configurations["functionalTestRuntimeOnly"].extendsFrom(configurations["testRuntimeOnly"])
 configurations["functionalTestImplementation"].extendsFrom(configurations["testImplementation"])
 configurations["functionalTestAnnotationProcessor"].extendsFrom(configurations["testAnnotationProcessor"])
@@ -224,10 +233,10 @@ publishing {
 */
         maven {
             name = "vogRepository"
-            url = uri("https://mvn.taskeren.cn/snapshots")
+            url = uri("https://maven.elytra.cn")
             credentials {
-                username = System.getenv("MAVEN_USER") ?: "NONE"
-                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+                username = project.findProperty("MAVEN_USERNAME") as? String ?: "NONE"
+                password = project.findProperty("MAVEN_PASSWORD") as? String ?: "NONE"
             }
         }
     }

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/b7af3dd6719c6b2ce0922ab7745cf065/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/ae0e7983130f400b4eeba0c21a169149/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/b7af3dd6719c6b2ce0922ab7745cf065/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ae0e7983130f400b4eeba0c21a169149/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/178ef5b6ab94e21a230e9192a08218b6/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e0839da937c009a667e9601d79d14c0e/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/b7af3dd6719c6b2ce0922ab7745cf065/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ae0e7983130f400b4eeba0c21a169149/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e7f07493b690e7efd5d5bcce5f684777/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b10efa41b5993aec43f4cd5f94d3583c/redirect
+toolchainVendor=AZUL
+toolchainVersion=21

gradle/wrapper/gradle-wrapper.properties

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