Migrate to Gradle 8.7

2024-04-26 22:50:43 -05:00 · 2024-04-26 22:50:43 -05:00 · 21369ec485
parent 120889b500
commit 21369ec485
17 changed files with 103 additions and 75 deletions
--- a/DynmapCore/build.gradle
+++ b/DynmapCore/build.gradle
@ -48,7 +48,7 @@ processResources {
 }

 jar {
-   classifier = 'unshaded'
+   archiveClassifier = 'unshaded'
 }

 shadowJar {
@ -79,8 +79,8 @@ shadowJar {
 	relocate('org.postgresql', 'org.dynmap.org.postgresql')
 	relocate('io.github.linktosriram.s3lite', 'org.dynmap.s3lite')    
 	
-    destinationDir = file '../target'
-    classifier = ''
+    destinationDirectory = file '../target'
+    archiveClassifier = ''
 }

 artifacts {
--- a/DynmapCoreAPI/build.gradle
+++ b/DynmapCoreAPI/build.gradle
@ -11,7 +11,7 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co
 description = "DynmapCoreAPI"

 jar {
-    destinationDir = file '../target'
+    destinationDirectory = file '../target'
 }

 artifacts {
--- a/build.gradle
+++ b/build.gradle
@ -5,8 +5,8 @@
 buildscript {
    configurations.all {
        resolutionStrategy {
-            force("org.ow2.asm:asm:9.3")
-            force("org.ow2.asm:asm-commons:9.3")
+            force("org.ow2.asm:asm:9.5")
+            force("org.ow2.asm:asm-commons:9.5")
        }
    }
 }
--- a/dynmap-api/build.gradle
+++ b/dynmap-api/build.gradle
@ -16,15 +16,15 @@ dependencies {
 }

 jar {
-   classifier = 'unshaded'
+   archiveClassifier  = 'unshaded'
 }

 shadowJar {
    dependencies {
        include(dependency(":DynmapCoreAPI"))
 	}
-    destinationDir = file '../target'
-    classifier = ''
+    destinationDirectory = file '../target'
+    archiveClassifier  = ''
 }

 artifacts {
--- a/forge-1.14.4/build.gradle
+++ b/forge-1.14.4/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -54,8 +54,9 @@ shadowJar {
    dependencies {
        include(dependency(':DynmapCore'))
    }
-    archiveName = "Dynmap-${parent.version}-forge-1.14.4.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.14.4"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -73,7 +74,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.15.2/build.gradle
+++ b/forge-1.15.2/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -54,8 +54,9 @@ shadowJar {
    dependencies {
        include(dependency(':DynmapCore'))
    }
-    archiveName = "Dynmap-${parent.version}-forge-1.15.2.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.15.2"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -73,7 +74,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.16.5/build.gradle
+++ b/forge-1.16.5/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -56,8 +56,9 @@ shadowJar {
        exclude("META-INF/maven/**")
        exclude("META-INF/services/**")
    }
-    archiveName = "Dynmap-${parent.version}-forge-1.16.5.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.16.5"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -75,7 +76,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.17.1/build.gradle
+++ b/forge-1.17.1/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -60,8 +60,9 @@ shadowJar {
        exclude("META-INF/maven/**")
        exclude("META-INF/services/**")
    }
-    archiveName = "Dynmap-${parent.version}-forge-1.17.1.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.17.1"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -79,7 +80,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.18.2/build.gradle
+++ b/forge-1.18.2/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -63,8 +63,9 @@ shadowJar {
    }
 	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_18_2.commons.codec')
    
-    archiveName = "Dynmap-${parent.version}-forge-1.18.2.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.18.2"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -82,7 +83,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.19.3/build.gradle
+++ b/forge-1.19.3/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -63,8 +63,9 @@ shadowJar {
    }
 	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_19_3.commons.codec')
    
-    archiveName = "Dynmap-${parent.version}-forge-1.19.3.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.19.3"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -82,7 +83,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.20.2/build.gradle
+++ b/forge-1.20.2/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -63,8 +63,9 @@ shadowJar {
    }
 	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_20_2.commons.codec')
    
-    archiveName = "Dynmap-${parent.version}-forge-1.20.2.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.20.2"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -82,7 +83,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/forge-1.20/build.gradle
+++ b/forge-1.20/build.gradle
@ -5,7 +5,7 @@ buildscript {
        mavenCentral()
    }
    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.+', changing: true
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@ -63,8 +63,9 @@ shadowJar {
    }
 	relocate('org.apache.commons.codec', 'org.dynmap.forge_1_20.commons.codec')
    
-    archiveName = "Dynmap-${parent.version}-forge-1.20.jar"
-    destinationDir = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = "forge-1.20"
+    destinationDirectory = file '../target'
 }

 shadowJar.doLast {
@ -82,7 +83,7 @@ reobf {

 task deobfJar(type: Jar) {
    from sourceSets.main.output
-    classifier = 'dev'
+    archiveClassifier = 'dev'
 }

 artifacts {
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/41
+++ b/41
@ -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,13 +80,11 @@ 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##*/}
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@ -133,22 +131,29 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi

 # Increase the maximum file descriptors if we can.
 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=SC2039,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=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
@ -205,6 +214,12 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
--- a/gradlew.bat
+++ b/gradlew.bat
@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+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

@ -56,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

@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/spigot/build.gradle
+++ b/spigot/build.gradle
@ -102,7 +102,7 @@ processResources {
 }

 jar {
-    classifier = 'unshaded'
+    archiveClassifier = 'unshaded'
 }

 shadowJar {
@ -130,9 +130,9 @@ shadowJar {
        include(dependency(':bukkit-helper-120-5'))
    }
    relocate('org.bstats', 'org.dynmap.bstats')
-    destinationDir = file '../target'
-    archiveName = "Dynmap-${parent.version}-spigot.jar"
-    classifier = ''
+    destinationDirectory = file '../target'
+    archiveBaseName = "Dynmap"
+    archiveClassifier = 'spigot'
 }
 shadowJar.doLast {
    task ->