From 3562380da543778b9048e0557e71d59bef288118 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 29 Oct 2024 14:16:45 -0700 Subject: [PATCH] Upgrade Gradle to 8.10.2 and upgrade plugins com.github.johnrengelman.shadow is now com.gradleup.shadow (note the redirect) https://github.com/johnrengelman/shadow/releases/tag/8.3.0 --- alts/build.gradle | 2 +- authz/build.gradle | 2 +- build.gradle | 2 +- examples/example-hostname/build.gradle | 2 +- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- netty/shaded/build.gradle | 2 +- s2a/build.gradle | 2 +- settings.gradle | 10 ++++++---- xds/build.gradle | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) diff --git a/alts/build.gradle b/alts/build.gradle index 9477e2540a..de93c90546 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -2,8 +2,8 @@ plugins { id "java-library" id "maven-publish" - id "com.github.johnrengelman.shadow" id "com.google.protobuf" + id "com.gradleup.shadow" id "ru.vyarus.animalsniffer" } diff --git a/authz/build.gradle b/authz/build.gradle index 491e8f32a7..60c86ca0db 100644 --- a/authz/build.gradle +++ b/authz/build.gradle @@ -2,8 +2,8 @@ plugins { id "java-library" id "maven-publish" - id "com.github.johnrengelman.shadow" id "com.google.protobuf" + id "com.gradleup.shadow" id "ru.vyarus.animalsniffer" } diff --git a/build.gradle b/build.gradle index f647acdb38..1013a2a438 100644 --- a/build.gradle +++ b/build.gradle @@ -311,7 +311,7 @@ subprojects { } } - plugins.withId("com.github.johnrengelman.shadow") { + plugins.withId("com.gradleup.shadow") { tasks.named("shadowJar").configure { // Do a dance to remove Class-Path. This needs to run after the doFirst() from the // shadow plugin that adds Class-Path and before the core jar action. Using doFirst will diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index 7ade8da565..54407994da 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java' id "com.google.protobuf" version "0.9.4" - id 'com.google.cloud.tools.jib' version '3.4.3' // For releasing to Docker Hub + id 'com.google.cloud.tools.jib' version '3.4.4' // For releasing to Docker Hub } repositories { diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 0d1842103b..1e2fbf0d45 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c9..df97d72b8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/netty/shaded/build.gradle b/netty/shaded/build.gradle index a1151ca242..25682d60b7 100644 --- a/netty/shaded/build.gradle +++ b/netty/shaded/build.gradle @@ -9,7 +9,7 @@ plugins { id "java" id "maven-publish" - id "com.github.johnrengelman.shadow" + id "com.gradleup.shadow" id "ru.vyarus.animalsniffer" } diff --git a/s2a/build.gradle b/s2a/build.gradle index 900283d9a0..572c48a0c5 100644 --- a/s2a/build.gradle +++ b/s2a/build.gradle @@ -2,9 +2,9 @@ plugins { id "java-library" id "maven-publish" - id "com.github.johnrengelman.shadow" id "com.google.osdetector" id "com.google.protobuf" + id "com.gradleup.shadow" id "ru.vyarus.animalsniffer" } diff --git a/settings.gradle b/settings.gradle index b451242f7c..1d8600cbe8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,24 +4,26 @@ pluginManagement { // 8+ has many changes: https://github.com/grpc/grpc-java/issues/10152 id "com.android.application" version "7.4.1" id "com.android.library" version "7.4.1" - // https://github.com/johnrengelman/shadow/releases - id "com.github.johnrengelman.shadow" version "8.1.1" // https://github.com/kt3k/coveralls-gradle-plugin/tags id "com.github.kt3k.coveralls" version "2.12.2" // https://github.com/GoogleCloudPlatform/appengine-plugins/releases id "com.google.cloud.tools.appengine" version "2.8.0" // https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md - id "com.google.cloud.tools.jib" version "3.4.3" + id "com.google.cloud.tools.jib" version "3.4.4" // https://github.com/google/osdetector-gradle-plugin/tags id "com.google.osdetector" version "1.7.3" // https://github.com/google/protobuf-gradle-plugin/releases id "com.google.protobuf" version "0.9.4" + // https://github.com/GradleUp/shadow/releases + // 8.3.2+ requires Java 11+ + // 8.3.1 breaks apache imports for netty/shaded, fixed in 8.3.2 + id "com.gradleup.shadow" version "8.3.0" // https://github.com/melix/japicmp-gradle-plugin/blob/master/CHANGELOG.txt id "me.champeau.gradle.japicmp" version "0.4.2" // https://github.com/melix/jmh-gradle-plugin/releases id "me.champeau.jmh" version "0.7.2" // https://github.com/tbroyer/gradle-errorprone-plugin/releases - id "net.ltgt.errorprone" version "4.0.1" + id "net.ltgt.errorprone" version "4.1.0" // https://github.com/xvik/gradle-animalsniffer-plugin/releases id "ru.vyarus.animalsniffer" version "1.7.1" } diff --git a/xds/build.gradle b/xds/build.gradle index a738145a2a..e09b42d06a 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -4,8 +4,8 @@ plugins { id "java" id "maven-publish" - id "com.github.johnrengelman.shadow" id "com.google.protobuf" + id "com.gradleup.shadow" id "ru.vyarus.animalsniffer" }