Skip to content

Update Gradle to 9.7.1 #12323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Aug 28, 2026
+8 −8
Merged

Update Gradle to 9.7.1 #12323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ variables:
BUILD_JOB_NAME: "build"
DEPENDENCY_CACHE_POLICY: pull
BUILD_CACHE_POLICY: pull
GRADLE_VERSION: "9.7.0" # must match gradle-wrapper.properties
GRADLE_VERSION: "9.7.1" # must match gradle-wrapper.properties
MASS_READ_URL: "https://mass-read.us1.ddbuild.io"
MAVEN_REPOSITORY_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
GRADLE_PLUGIN_PROXY: "https://depot-read-api-java.us1.ddbuild.io/magicmirror/magicmirror/@current/"
Expand Down
6 changes: 3 additions & 3 deletions dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
latestDepTestImplementation group: "com.alipay.sofa", name: "sofa-rpc-all", version: "+"

constraints {
// Regression fix for Gradle 9.6.0 (should be fixed in 9.7.0)
// Regression fix for Gradle 9.6.0.
//
// The `sofa-rpc-all:5.14.2` brings `netty-all:4.1.44.Final`, which is a fat jar,
// while `grpc-netty:1.53.0` brings individual `netty-*:4.1.79.Final` modules.
Expand All @@ -41,8 +41,8 @@ dependencies {
// produces a `NoSuchMethodError` at runtime in netty's `AbstractReferenceCountedByteBuf`.
//
// The workaround is to force `netty-all` to `4.1.79` so the fat jar and the individual
// modules are aligned on the same version. This should be fixed in 9.7.0 and consequently
// removed from the constraints.
// modules are aligned on the same version. The fix is behind Gradle 9.7's
// ENHANCED_GRAPH_ORDERING preview, which currently exposes other fat-jar conflicts.
// See https://github.com/gradle/gradle/issues/38057 for more details.
testImplementation("io.netty:netty-all:4.1.79.Final") {
because "sofa-rpc-all brings netty-all:4.1.44.Final (fat jar) while grpc-netty brings individual netty-*:4.1.79.Final modules; Gradle 9.6.0 classpath ordering regression causes 4.1.44 classes to shadow 4.1.79, producing NoSuchMethodError"
Expand Down
4 changes: 2 additions & 2 deletions dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Pinned latest eligible stable versions (>=48h old) for CI Visibility Gradle smoke tests.
# Updated automatically by the update-smoke-test-latest-versions workflow.
gradle.latest=9.7.0
gradle.latest=9.7.1
# Latest eligible stable patch per Gradle major release. Used to resolve the "oldest" smoke-test
# Gradle version (the latest patch of the oldest major the current TestKit supports).
gradle.latest.3=3.5.1
Expand All @@ -9,4 +9,4 @@ gradle.latest.5=5.6.4
gradle.latest.6=6.9.4
gradle.latest.7=7.6.6
gradle.latest.8=8.14.5
gradle.latest.9=9.7.0
gradle.latest.9=9.7.1
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down