Skip to content

Commit ecb223d

Browse files
authored
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
1 parent 4b716ee commit ecb223d

File tree

9 files changed

+17
-11
lines changed

9 files changed

+17
-11
lines changed

cloudbuild-e2e-cloud-functions-gen2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
steps:
1616
# Generate shadowJar for the instrumented test server
17-
- name: "gradle:7.5.1-jdk11"
17+
- name: "gradle:8.0.2-jdk11"
1818
id: generate-jar
1919
entrypoint: "gradle"
2020
timeout: 4m

e2e.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515

1616
# Build relative to root of repository i.e. `docker build --file e2e.Dockerfile --tag=$tag ..`
17-
FROM gradle:7.5.1-jdk11 as builder
17+
FROM gradle:8.0.2-jdk11 as builder
1818

1919
COPY --chown=gradle:gradle . /app/src
2020
WORKDIR /app/src

exporters/auto/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ dependencies {
4242
}
4343

4444

45-
shadowJar{
46-
classifier = null
45+
shadowJar {
46+
archiveClassifier.set('shaded')
4747
mergeServiceFiles()
4848
}
4949

gradle/wrapper/gradle-wrapper.jar

852 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pluginManagement {
1717
plugins {
1818
id "com.diffplug.spotless" version "5.9.0"
1919
id 'nebula.release' version '15.2.0'
20-
id "com.github.johnrengelman.shadow" version "7.1.2"
20+
id "com.github.johnrengelman.shadow" version "8.1.1"
2121
id 'com.google.cloud.tools.jib' version '3.1.4'
2222
}
2323
}

shared/resourcemapping/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
}
3333

3434
shadowJar{
35-
classifier = null
35+
archiveClassifier.set('')
3636
relocate 'io.opentelemetry.semconv', 'com.google.cloud.opentelemetry.shadow.semconv'
3737
dependencies {
3838
exclude(dependency(libraries.opentelemetry_api))

0 commit comments

Comments
 (0)