Skip to content

Update Gradle to 9.7.0 #12162

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

Open
AlexeyKuznetsov-DD wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update Gradle to 9.7.0 #12162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6bd5405
Update Gradle to 9.7.0.
AlexeyKuznetsov-DD Aug 7, 2026
2a69fa7
Isolate Muzzle from Gradle classpath.
AlexeyKuznetsov-DD Aug 7, 2026
39163e1
Preserve platform JDK classes in Muzzle
AlexeyKuznetsov-DD Aug 7, 2026
35c9659
Merge branch 'master' into alexeyk/gradle-9.7.0
AlexeyKuznetsov-DD Aug 7, 2026
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 @@ -52,7 +52,7 @@ variables:
BUILD_JOB_NAME: "build"
DEPENDENCY_CACHE_POLICY: pull
BUILD_CACHE_POLICY: pull
GRADLE_VERSION: "9.6.1" # must match gradle-wrapper.properties
GRADLE_VERSION: "9.7.0" # 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: 5 additions & 1 deletion buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ abstract class MuzzleAction : WorkAction<MuzzleWorkParameters> {
@Volatile
private var lastBuildPathCount: Int = 0

fun createClassLoader(cp: FileCollection, parent: ClassLoader = ClassLoader.getSystemClassLoader()): ClassLoader {
// Keep Gradle's bundled libraries out while retaining platform JDK classes.
fun createClassLoader(
cp: FileCollection,
parent: ClassLoader? = ClassLoader.getSystemClassLoader().parent
): ClassLoader {
val urls = cp.map { it.toURI().toURL() }.toTypedArray()
return URLClassLoader(urls, parent)
}
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.6.1
gradle.latest=9.7.0
# 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.6.1
gradle.latest.9=9.7.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
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=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionSha256Sum=84fbba45c7f4c64abc77460e1c00f541e9f960e3c7ed2538f1ede19eacd873ae
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
Loading