Update to gradle 8.5 (#182)

Author: ThadHouse

ToolchainPlugin/build.gradle

@@ -32,16 +32,13 @@ tasks.withType(Test).configureEach {
     useJUnitPlatform()
 }
 
-archivesBaseName = "Toolchain"
-
-sourceCompatibility = 11
-targetCompatibility = 11
+base {
+    archivesName = "Toolchain"
+}
 
-pluginBundle {
-    website = 'https://github.com/wpilibsuite/native-utils'
-    vcsUrl = 'https://github.com/wpilibsuite/native-utils'
-    description = 'FRC Toolchain Standalone Gradle Plugin'
-    tags = ['frc', 'wpilib', 'gradlerio']
+java {
+    sourceCompatibility = 11
+    targetCompatibility = 11
 }
 
 if (project.hasProperty('RunToolchainTests')) {
@@ -51,11 +48,15 @@ if (project.hasProperty('RunToolchainTests')) {
 }
 
 gradlePlugin {
+    website = 'https://github.com/wpilibsuite/native-utils'
+    vcsUrl = 'https://github.com/wpilibsuite/native-utils'
     plugins {
         toolchain {
             id = 'edu.wpi.first.Toolchain'
             displayName = 'Toolchain'
             implementationClass = 'edu.wpi.first.toolchain.ToolchainPlugin'
+            description = 'FRC Toolchain Standalone Gradle Plugin'
+            tags = ['frc', 'wpilib', 'gradlerio']
         }
     }
 }

build.gradle

@@ -1,14 +1,15 @@
 plugins {
-    id "com.gradle.plugin-publish" version "0.15.0"
+    id "com.gradle.plugin-publish" version "1.2.1"
     id 'java-gradle-plugin'
     id 'maven-publish'
     id 'groovy'
     id 'java'
-    id 'idea'
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+java {
+    sourceCompatibility = 11
+    targetCompatibility = 11
+}
 
 allprojects {
     group = "edu.wpi.first"
@@ -48,19 +49,16 @@ tasks.withType(JavaCompile) {
     options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 }
 
-pluginBundle {
+gradlePlugin {
     website = 'https://github.com/wpilibsuite/native-utils'
     vcsUrl = 'https://github.com/wpilibsuite/native-utils'
-    description = 'This plugin provides native build utilities for FRC projects.'
-    tags = ['groovy', 'native', 'utils', 'maven', 'frc', 'wpilib']
-}
-
-gradlePlugin {
     plugins {
         NativeUtils {
             id = 'edu.wpi.first.NativeUtils'
             displayName = 'NativeUtils'
             implementationClass = 'edu.wpi.first.nativeutils.NativeUtils'
+            description = 'This plugin provides native build utilities for FRC projects.'
+            tags = ['groovy', 'native', 'utils', 'maven', 'frc', 'wpilib']
         }
     }
 }
@@ -99,3 +97,8 @@ tasks.register('PatchExamples') {
 
 build.dependsOn PatchExamples
 jar.finalizedBy PatchExamples
+
+wrapper {
+    gradleVersion = '8.5'
+    distributionType = Wrapper.DistributionType.BIN
+}

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -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,26 +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
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ 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
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \