Update gradle (GoogleCloudPlatform#211)

* Update shadow-plugin API to be compatible with gradle v8

* Update gradle wrapper to gradle 8.0.2

* Update GoogleCloudBuild images to use gradle v8

Author: psx95

cloudbuild-e2e-cloud-functions-gen2.yaml

@@ -14,7 +14,7 @@
 
 steps:
   # Generate shadowJar for the instrumented test server
-  - name: "gradle:7.5.1-jdk11"
+  - name: "gradle:8.0.2-jdk11"
     id: generate-jar
     entrypoint: "gradle"
     timeout: 4m

e2e.Dockerfile

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 # Build relative to root of repository i.e. `docker build --file e2e.Dockerfile --tag=$tag ..`
-FROM gradle:7.5.1-jdk11 as builder
+FROM gradle:8.0.2-jdk11 as builder
 
 COPY --chown=gradle:gradle . /app/src
 WORKDIR /app/src

exporters/auto/build.gradle

@@ -42,8 +42,8 @@ dependencies {
 }
 
 
-shadowJar{
-	classifier = null
+shadowJar {
+	archiveClassifier.set('shaded')
 	mergeServiceFiles()
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-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

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

gradlew.bat

@@ -17,7 +17,7 @@ pluginManagement {
 	plugins {
 		id "com.diffplug.spotless" version "5.9.0"
 		id 'nebula.release' version '15.2.0'
-		id "com.github.johnrengelman.shadow" version "7.1.2"
+		id "com.github.johnrengelman.shadow" version "8.1.1"
 		id 'com.google.cloud.tools.jib' version '3.1.4'
 	}
 }

settings.gradle

@@ -32,7 +32,7 @@ dependencies {
 }
 
 shadowJar{
-	classifier = null
+	archiveClassifier.set('')
 	relocate 'io.opentelemetry.semconv', 'com.google.cloud.opentelemetry.shadow.semconv'
 	dependencies {
 		exclude(dependency(libraries.opentelemetry_api))