Upgrade Gradle wrapper to version 8.6. (#484)

Disable Editorconfig plugin due to incompatibility; compatible version would raise minimum required Java version to 16.

See also metafacture/metafacture-fix#341.

Author: blackwinter

build.gradle

@@ -18,7 +18,7 @@ import java.util.regex.Matcher
 
 plugins {
   id 'org.ajoberstar.grgit' version '2.3.0'
-  id 'org.ec4j.editorconfig' version '0.0.3'
+  //id 'org.ec4j.editorconfig' version '0.0.3'
   id 'org.sonarqube' version '2.6.2'
   id 'io.codearte.nexus-staging' version '0.30.0'
 }
@@ -54,19 +54,19 @@ project(':metafacture-runner') {
   apply plugin: 'java'
 }
 
-editorconfig {
-  excludes = [
-    '**/*.beacon',
-    '**/*.bgzf',
-    '**/*.bz2',
-    '**/*.bzip2',
-    '**/*.gzip',
-    '**/*.xz',
-    '**/.*',
-    '**/bin',
-    'gradlew*'
-  ]
-}
+//editorconfig {
+//  excludes = [
+//    '**/*.beacon',
+//    '**/*.bgzf',
+//    '**/*.bz2',
+//    '**/*.bzip2',
+//    '**/*.gzip',
+//    '**/*.xz',
+//    '**/.*',
+//    '**/bin',
+//    'gradlew*'
+//  ]
+//}
 
 task editorconfigChecker(type: Exec, group: 'Verification') {
   executable 'misc/bin/editorconfig-checker'
@@ -79,8 +79,7 @@ subprojects {
   apply plugin: 'checkstyle'
   apply plugin: 'maven-publish'
 
-  editorconfigCheck.dependsOn(editorconfigChecker)
-  check.dependsOn(editorconfigCheck)
+  check.dependsOn(editorconfigChecker)
   check.dependsOn(javadoc)
 
   sourceCompatibility = 1.8
@@ -98,15 +97,15 @@ subprojects {
   task sourceJar(type: Jar) {
     dependsOn tasks.classes
     from sourceSets.main.allJava
-    classifier 'sources'
+    archiveClassifier = 'sources'
     description 'Creates a jar containing the source files of this project.'
     group 'build'
   }
 
   task javadocJar(type: Jar) {
     dependsOn tasks.javadoc
     from tasks.javadoc
-    classifier 'javadoc'
+    archiveClassifier = 'javadoc'
     description 'Creates a jar containing the javadoc of this project.'
     group 'build'
   }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=bed1da33cca0f557ab13691c77f38bb67388119e4794d113e051039b80af9bb1
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.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,10 +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##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
@@ -143,12 +143,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
@@ -205,6 +209,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

@@ -27,6 +27,9 @@ configurations {
   provided {
     description = 'provided libraries'
   }
+
+  // The plugins configuration needs to be on the runtime classpath:
+  runtimeClasspath.extendsFrom plugins
 }
 
 dependencies {
@@ -58,9 +61,6 @@ dependencies {
   plugins project(':metafacture-yaml')
   plugins project(':metamorph')
 
-  // The plugins configuration needs to be on the runtime classpath:
-  runtimeClasspath configurations.plugins
-
   // In a perfect world the slf4j binding would be a provided dependency so that
   // the user can replace it easily with a different binding. However, slf4j
   // does not use the context class loader for loading its binding but the same
@@ -117,7 +117,7 @@ distributions {
         from configurations.provided
       }
       from('src/main/scripts') {
-        filter(ReplaceTokens, tokens: [jarfile: 'lib/' + jar.archiveName ])
+        filter(ReplaceTokens, tokens: [jarfile: 'lib/' + jar.archiveFileName.get() ])
         filteringCharset = 'UTF-8'
         fileMode = 0755
       }
@@ -140,15 +140,15 @@ def metamorph() {
 
 distTar {
   compression = Compression.GZIP
-  classifier = 'dist'
+  archiveClassifier = 'dist'
   archiveExtension = 'tar.gz'
 }
 
 distZip {
-  classifier = 'dist'
+  archiveClassifier = 'dist'
 }
 
 task('fluxCommands', type: JavaExec, description: 'Print available Flux commands') {
   classpath = sourceSets.main.runtimeClasspath
-  main = 'org.metafacture.flux.HelpPrinter'
+  mainClass = 'org.metafacture.flux.HelpPrinter'
 }

metafacture-runner/build.gradle

@@ -38,6 +38,6 @@ sourceSets {
     // for test TestMetamorphMacros#issue227_shouldSupportXincludeForMacros()
     // to work properly. A better solution would be to enable xinclude to load
     // resources from the classpath.
-    output.resourcesDir = sourceSets.test.java.outputDir
+    output.resourcesDir = sourceSets.test.java.classesDirectory
   }
 }