Skip to content

Commit 3562380

Browse files
committed
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
1 parent 766b923 commit 3562380

File tree

10 files changed

+15
-13
lines changed

10 files changed

+15
-13
lines changed

alts/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ plugins {
22
id "java-library"
33
id "maven-publish"
44

5-
id "com.github.johnrengelman.shadow"
65
id "com.google.protobuf"
6+
id "com.gradleup.shadow"
77
id "ru.vyarus.animalsniffer"
88
}
99

authz/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ plugins {
22
id "java-library"
33
id "maven-publish"
44

5-
id "com.github.johnrengelman.shadow"
65
id "com.google.protobuf"
6+
id "com.gradleup.shadow"
77
id "ru.vyarus.animalsniffer"
88
}
99

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ subprojects {
311311
}
312312
}
313313

314-
plugins.withId("com.github.johnrengelman.shadow") {
314+
plugins.withId("com.gradleup.shadow") {
315315
tasks.named("shadowJar").configure {
316316
// Do a dance to remove Class-Path. This needs to run after the doFirst() from the
317317
// shadow plugin that adds Class-Path and before the core jar action. Using doFirst will

examples/example-hostname/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'java'
44

55
id "com.google.protobuf" version "0.9.4"
6-
id 'com.google.cloud.tools.jib' version '3.4.3' // For releasing to Docker Hub
6+
id 'com.google.cloud.tools.jib' version '3.4.4' // For releasing to Docker Hub
77
}
88

99
repositories {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

netty/shaded/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
id "java"
1010
id "maven-publish"
1111

12-
id "com.github.johnrengelman.shadow"
12+
id "com.gradleup.shadow"
1313
id "ru.vyarus.animalsniffer"
1414
}
1515

s2a/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ plugins {
22
id "java-library"
33
id "maven-publish"
44

5-
id "com.github.johnrengelman.shadow"
65
id "com.google.osdetector"
76
id "com.google.protobuf"
7+
id "com.gradleup.shadow"
88
id "ru.vyarus.animalsniffer"
99
}
1010

settings.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,26 @@ pluginManagement {
44
// 8+ has many changes: https://github.com/grpc/grpc-java/issues/10152
55
id "com.android.application" version "7.4.1"
66
id "com.android.library" version "7.4.1"
7-
// https://github.com/johnrengelman/shadow/releases
8-
id "com.github.johnrengelman.shadow" version "8.1.1"
97
// https://github.com/kt3k/coveralls-gradle-plugin/tags
108
id "com.github.kt3k.coveralls" version "2.12.2"
119
// https://github.com/GoogleCloudPlatform/appengine-plugins/releases
1210
id "com.google.cloud.tools.appengine" version "2.8.0"
1311
// https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md
14-
id "com.google.cloud.tools.jib" version "3.4.3"
12+
id "com.google.cloud.tools.jib" version "3.4.4"
1513
// https://github.com/google/osdetector-gradle-plugin/tags
1614
id "com.google.osdetector" version "1.7.3"
1715
// https://github.com/google/protobuf-gradle-plugin/releases
1816
id "com.google.protobuf" version "0.9.4"
17+
// https://github.com/GradleUp/shadow/releases
18+
// 8.3.2+ requires Java 11+
19+
// 8.3.1 breaks apache imports for netty/shaded, fixed in 8.3.2
20+
id "com.gradleup.shadow" version "8.3.0"
1921
// https://github.com/melix/japicmp-gradle-plugin/blob/master/CHANGELOG.txt
2022
id "me.champeau.gradle.japicmp" version "0.4.2"
2123
// https://github.com/melix/jmh-gradle-plugin/releases
2224
id "me.champeau.jmh" version "0.7.2"
2325
// https://github.com/tbroyer/gradle-errorprone-plugin/releases
24-
id "net.ltgt.errorprone" version "4.0.1"
26+
id "net.ltgt.errorprone" version "4.1.0"
2527
// https://github.com/xvik/gradle-animalsniffer-plugin/releases
2628
id "ru.vyarus.animalsniffer" version "1.7.1"
2729
}

xds/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
id "java"
55
id "maven-publish"
66

7-
id "com.github.johnrengelman.shadow"
87
id "com.google.protobuf"
8+
id "com.gradleup.shadow"
99
id "ru.vyarus.animalsniffer"
1010
}
1111

0 commit comments

Comments
 (0)