Start ForgeGradle 6.0 to support Gradle 8.x

Signed-off-by: SizableShrimp <[email protected]>

Author: SizableShrimp

.teamcity/settings.kts

@@ -33,15 +33,15 @@ project {
     buildType(PullRequestsJava17)
 
     params {
-        text("git_main_branch", "FG_5.0", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("git_main_branch", "FG_6.0", label = "Git Main Branch", description = "The git main or default branch to use in VCS operations.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("github_repository_name", "ForgeGradle", label = "The github repository name. Used to connect to it in VCS Roots.", description = "This is the repository slug on github. So for example `ForgeGradle` or `MinecraftForge`. It is interpolated into the global VCS Roots.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
         text("env.PUBLISHED_JAVA_ARTIFACT_ID", "ForgeGradle", label = "Published artifact id", description = "The maven coordinate artifact id that has been published by this build. Can not be empty.", allowEmpty = false)
         text("env.PUBLISHED_JAVA_GROUP", "net.minecraftforge.gradle", label = "Published group", description = "The maven coordinate group that has been published by this build. Can not be empty.", allowEmpty = false)
         text("git_branch_spec", """
                 +:refs/heads/(FG_*)
             """.trimIndent(), label = "The branch specification of the repository", description = "By default all main branches are build by the configuration. Modify this value to adapt the branches build.", display = ParameterDisplay.HIDDEN, allowEmpty = true)
         text("docker_jdk_version", "8", label = "JDK version", description = "The version of the JDK to use during execution of tasks in a JDK.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
-        text("docker_gradle_version", "7.4.2", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
+        text("docker_gradle_version", "8.1", label = "Gradle version", description = "The version of Gradle to use during execution of Gradle tasks.", display = ParameterDisplay.HIDDEN, allowEmpty = false)
     }
 
     features {

build.gradle

@@ -7,11 +7,11 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.39.0'
 }
 
-version = gradleutils.getTagOffsetBranchVersion('FG_5.0')
+version = gradleutils.getTagOffsetBranchVersion('FG_6.0')
 logger.lifecycle('Version: ' + version + ' Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 changelog {
-    fromTag '3.0'
+    fromTag '6.0'
     disableAutomaticPublicationRegistration()
 }
 sourceSets {
@@ -63,24 +63,24 @@ license {
 }
 
 tasks.named('wrapper', Wrapper).configure {
-    gradleVersion = '7.4.2'
+    gradleVersion = '8.1'
     distributionType = Wrapper.DistributionType.ALL
 }
 
 dependencies {
     commonImplementation gradleApi()
-    commonImplementation 'commons-io:commons-io:2.8.0'
-    commonImplementation 'com.google.code.gson:gson:2.8.6'
-    commonImplementation 'com.google.guava:guava:30.1-jre'
-    commonImplementation 'de.siegmar:fastcsv:2.0.0'
+    commonImplementation 'commons-io:commons-io:2.11.0'
+    commonImplementation 'com.google.code.gson:gson:2.10.1'
+    commonImplementation 'com.google.guava:guava:31.1-jre'
+    commonImplementation 'de.siegmar:fastcsv:2.2.1'
     commonImplementation('net.minecraftforge:artifactural:3.0.14') {
         transitive = false
     }
     commonImplementation('net.minecraftforge:unsafe:0.2.0') {
         transitive = false
     }
-    commonImplementation 'org.apache.maven:maven-artifact:3.6.3'
-    commonImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    commonImplementation 'org.apache.maven:maven-artifact:3.9.1'
+    commonImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
     commonImplementation 'net.minecraftforge:srgutils:0.4.15'
     commonImplementation 'net.minecraftforge:DiffPatch:2.0.7:all'
 
@@ -90,8 +90,8 @@ dependencies {
     userdevImplementation sourceSets.mcp.output
     userdevImplementation sourceSets.common.output
 
-    userdevImplementation 'net.minecraftforge:JarJarMetadata:0.3.17'
-    userdevImplementation 'net.minecraftforge:JarJarSelector:0.3.17'
+    userdevImplementation 'net.minecraftforge:JarJarMetadata:0.3.19'
+    userdevImplementation 'net.minecraftforge:JarJarSelector:0.3.19'
 }
 
 //Gradle doesn't add it's own source when doing the API. So lets hack it in!

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -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,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##*/}
-
-# 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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,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
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,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.

gradlew

@@ -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,7 +41,7 @@ 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.
@@ -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

gradlew.bat

@@ -39,7 +39,7 @@ public static void checkJavaRange(@Nullable JavaVersionParser.JavaVersion minVer
 
     public static void checkGradleRange(@Nullable GradleVersion minVersionInclusive, @Nullable GradleVersion maxVersionExclusive) {
         checkRange("Gradle", GradleVersion.current(), minVersionInclusive, maxVersionExclusive,
-                "\nNote: Upgrade your gradle version first before trying to switch to FG5.", "");
+                "\nNote: Upgrade your gradle version first before trying to switch to FG6.", "");
     }
 
     private static <T> void checkRange(String name, Comparable<T> current, @Nullable T minVersionInclusive, @Nullable T maxVersionExclusive, String additionalMin, String additionalMax) {
@@ -58,8 +58,8 @@ private static <T> void checkRange(String name, Comparable<T> current, @Nullable
      * Current environment checks:
      * <ul>
      *     <li>Java version is <em>1.8.0_101</em> or above (first JDK version to include Let's Encrypt certificates)</li>
-     *     <li>Gradle version is <em>7.1</em> or above (minimum version required by ForgeGradle)</li>
-     *     <li>Gradle version is below <em>8.0</em> (ForgeGradle 5 only supports the Gradle 7.x series)</li>
+     *     <li>Gradle version is <em>8.1</em> or above (minimum version required by ForgeGradle)</li>
+     *     <li>Gradle version is below <em>9.0</em> (ForgeGradle 6 only supports the Gradle 8.x series)</li>
      *     <li>Certificates for {@link Utils#FORGE_MAVEN} and {@link Utils#MOJANG_MAVEN} are valid (required repositories)</li>
      * </ul>
      *
@@ -83,8 +83,8 @@ public static void checkEnvironment(Project project) {
         if (ENABLE_GRADLE_CHECK) {
             logger.debug(ENV_CHECK, "Checking Gradle version");
             checkGradleRange(
-                    GradleVersion.version("7.1"),
-                    GradleVersion.version("8.0")
+                    GradleVersion.version("8.1"),
+                    GradleVersion.version("9.0")
             );
         } else {
             logger.debug(ENV_CHECK, "Gradle version check disabled by system property");