Update to Gradle 8.4, move to GitHub Actions for CI (#9)

.github/workflows/publish.yml

@@ -0,0 +1,16 @@
+name: Publish
+
+on:
+ push:
+ branches: [ "master" ]
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+ uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
+ with:
+ java: 8
+ gradle_tasks: "publish"
+ artifact_name: "mergetool"

build.gradle

@@ -1,26 +1,31 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
  id 'java'
  id 'eclipse'
  id 'maven-publish'
  id 'org.cadixdev.licenser' version '0.6.1'
- id 'com.github.johnrengelman.shadow' version '7.1.2'
- id 'com.github.ben-manes.versions' version '0.42.0'
+ id 'com.github.johnrengelman.shadow' version '8.1.1'
+ id 'com.github.ben-manes.versions' version '0.47.0'
  id 'net.minecraftforge.gradleutils' version '2.+'
 }
 
 group = 'net.minecraftforge'
 version = gradleutils.getTagOffsetVersion()
-println('Version: ' + version)
+println "Version: $version"
 
 repositories {
  mavenCentral()
- maven { url = 'https://maven.minecraftforge.net' }
+ maven {
+ name = 'MinecraftForge'
+ url = 'https://maven.minecraftforge.net'
+ }
 }
 
 license {
- header project.file('LICENSE-header.txt')
+ header = file('LICENSE-header.txt')
  include 'net/minecraftforge/mergetool/**/*.java'
- newLine false
+ newLine = false
 }
 
 sourceSets {
@@ -30,36 +35,45 @@ sourceSets {
 }
 
 java {
- toolchain.languageVersion = JavaLanguageVersion.of(8)
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(8)
+ }
  withSourcesJar()
 }
 
-jar {
- manifest.attributes('Main-Class': 'net.minecraftforge.mergetool.ConsoleMerger')
- manifest.attributes('Implementation-Version': project.version)
+tasks.named('jar', Jar).configure {
+ manifest {
+ attributes('Main-Class': 'net.minecraftforge.mergetool.ConsoleMerger')
+ attributes('Implementation-Version': project.version)
+ }
  from sourceSets.cpwFML.output
  from sourceSets.forgeFML.output
  from sourceSets.forgeAPI.output
 }
-shadowJar {
- classifier 'fatjar'
+
+tasks.named('shadowJar', ShadowJar).configure {
+ archiveClassifier = 'fatjar'
 }
-sourcesJar {
+
+tasks.named('sourcesJar', Jar).configure {
  from sourceSets.cpwFML.allSource
  from sourceSets.forgeFML.allSource
  from sourceSets.forgeAPI.allSource
 }
-task cpwFML(type: Jar) {
- classifier 'cpw'
+
+tasks.register('cpwFML', Jar) {
+ archiveClassifier = 'cpw'
  from sourceSets.cpwFML.output
 }
-task forgeFML(type: Jar) {
- classifier 'forge'
+
+tasks.register('forgeFML', Jar) {
+ archiveClassifier = 'forge'
  from sourceSets.forgeFML.output
 }
-task forgeAPI(type: Jar) {
+
+tasks.register('forgeAPI', Jar) {
  manifest.attributes('Automatic-Module-Name': 'net.minecraftforge.mergetool.api')
- classifier 'api'
+ archiveClassifier = 'api'
  from sourceSets.forgeAPI.output
 }
 
@@ -83,12 +97,14 @@ artifacts {
 }
 
 publishing {
- publications.create("mavenJava", MavenPublication) {
+ publications.register('mavenJava', MavenPublication) {
  from components.java
  artifact cpwFML
  artifact forgeFML
  artifact forgeAPI
 
+ artifactId = 'mergetool'
+
  pom {
  name = 'MergeTool'
  description = 'Merges two jar files together, useful for rebuilding Retroguard stripped jars.'

gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.configureondemand=true
+org.gradle.caching=true
+org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 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,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=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 +198,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 +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.

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

settings.gradle

@@ -1,8 +1,15 @@
 pluginManagement {
  repositories {
  gradlePluginPortal()
- maven { url = 'https://maven.minecraftforge.net/' }
+ maven {
+ name = 'MinecraftForge'
+ url = 'https://maven.minecraftforge.net/'
+ }
  }
 }
 
-rootProject.name = 'mergetool'
+plugins {
+ id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
+}
+
+rootProject.name = 'MergeTool'