Upgrade gradlew from 8.1.1 to 8.3

Resolved warnings in build.gradle and distribution.gradle, telling about "Deprecated access to plugin conventions" that will be removed in Gradle 9.0

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

build.gradle

@@ -94,14 +94,9 @@ ext {
     releaseDir = "${buildDir}/release"
 }
 
-/*
- * The gradle plugin for netbeans sets the 'mainClass' property instead of
- * 'mainClassName'.
- *
- * If other IDEs set different properties when trying to execute
- * a given class feel free to add them here.
- */
-mainClassName = project.hasProperty('mainClass') ? mainClass : 'pcgen.system.Main'
+application {
+    mainClass.set('pcgen.system.Main')
+}
 
 /*
  * Which binary repositories this build uses.

code/gradle/distribution.gradle

@@ -39,7 +39,7 @@ ext {
             include 'docs/**'
         }
     }
-    
+
     programDistsImage = copySpec {
         from("$buildDir/launch4j") {
             include 'pcgen.exe'
@@ -83,17 +83,17 @@ ext {
     }
 }
 
-applicationDistribution.with(dataDistsImage)
-applicationDistribution.with(docsDistsImage)
-applicationDistribution.with(autobuildSpec)
-applicationDistribution.with(charactersImage)
-applicationDistribution.with(programScriptImage)
-applicationDistribution.with(programDistsImage)
-
 application{
     // Output the startScripts (.bat and .sh) in main distribute folder rather than .bin
     executableDir = ""
     applicationDefaultJvmArgs = ["-Dsun.java2d.d3d=false"]
+
+    applicationDistribution.with(dataDistsImage)
+    applicationDistribution.with(docsDistsImage)
+    applicationDistribution.with(autobuildSpec)
+    applicationDistribution.with(charactersImage)
+    applicationDistribution.with(programScriptImage)
+    applicationDistribution.with(programDistsImage)
 }
 
 run {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -130,10 +131,13 @@ 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.