Skip to content

Update Gradle 8 tooling and smoke tests to 8.14.6 #12966

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
Oct 20, 2026
Merged

Update Gradle 8 tooling and smoke tests to 8.14.6 #12966

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 build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ abstract class MavenAppSpec @Inject constructor() : ApplicationSpec() {
* because the Spring Boot Gradle plugin pre-3.5.0 calls `Configuration.getUploadTaskName()`,
* removed in Gradle 9.
*/
const val DEFAULT_NESTED_GRADLE_VERSION = "8.14.5"
const val DEFAULT_NESTED_GRADLE_VERSION = "8.14.6"

/**
* Default JDK language version for the nested build. JDK 21 is the version the root build
Expand Down
14 changes: 7 additions & 7 deletions ...d-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SmokeTestAppPluginTest {
project.apply<JavaPlugin>()
val task = project.tasks.create("nestedBuild", NestedGradleBuild::class.java)
val userHome = File(project.projectDir, "gradle-user-home")
val daemonDir = userHome.resolve("daemon/8.14.5")
val daemonDir = userHome.resolve("daemon/8.14.6")
assertThat(daemonDir.mkdirs()).isTrue()
val staleLog = daemonDir.resolve("daemon-${ProcessHandle.current().pid()}.out.log")
staleLog.writeText("reused PID")
Expand Down Expand Up @@ -198,7 +198,7 @@ class SmokeTestAppPluginTest {
project.plugins.apply("dd-trace-java.smoke-test-app")

val extension = project.extensions.getByType<SmokeTestAppExtension>()
extension.gradleVersion.set("8.14.5")
extension.gradleVersion.set("8.14.6")
extension.gradleDistributionBaseUrl.set("https://mass.example")
extension.gradleApp {
taskName.set("packageApp")
Expand All @@ -216,7 +216,7 @@ class SmokeTestAppPluginTest {
.isEqualTo(project.layout.projectDirectory.dir("application").asFile)
assertThat(task.applicationBuildDir.get().asFile)
.isEqualTo(project.layout.buildDirectory.dir("application").get().asFile)
assertThat(task.gradleVersion.get()).isEqualTo("8.14.5")
assertThat(task.gradleVersion.get()).isEqualTo("8.14.6")
assertThat(task.gradleDistributionBaseUrl.get()).isEqualTo("https://mass.example")
assertThat(task.tasksToRun.get()).containsExactly("assemble", "check")
assertThat(task.buildArguments.get()).containsExactly("-Ddemo=true")
Expand Down Expand Up @@ -326,13 +326,13 @@ class SmokeTestAppPluginTest {

@Test
fun `Gradle distribution URI routes through MASS artifact path`() {
assertThat(gradleDistributionUri("https://mass.example", "8.14.5").toString())
assertThat(gradleDistributionUri("https://mass.example", "8.14.6").toString())
.isEqualTo(
"https://mass.example/internal/artifact/services.gradle.org/distributions/gradle-8.14.5-bin.zip",
"https://mass.example/internal/artifact/services.gradle.org/distributions/gradle-8.14.6-bin.zip",
)
assertThat(gradleDistributionUri("https://mass.example/", "8.14.5").toString())
assertThat(gradleDistributionUri("https://mass.example/", "8.14.6").toString())
.isEqualTo(
"https://mass.example/internal/artifact/services.gradle.org/distributions/gradle-8.14.5-bin.zip",
"https://mass.example/internal/artifact/services.gradle.org/distributions/gradle-8.14.6-bin.zip",
)
}

Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Up @@ -8,5 +8,5 @@ gradle.latest.4=4.10.3
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.8=8.14.6
gradle.latest.9=9.7.1
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Build
develocity = "4.6.0"
forbiddenapis = "3.11"
gradle-tooling-api = "8.14.5"
gradle-tooling-api = "8.14.6"
jsr305 = "3.0.2"
shadow = "9.4.2"
spotbugs_annotations = "4.10.4"
Expand Down
Loading