diff --git a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt index 92a9551d068..d2fd3c60598 100644 --- a/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt +++ b/build-logic/smoke-test/src/main/kotlin/datadog/buildlogic/smoketest/SmokeTestAppExtension.kt @@ -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 diff --git a/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt b/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt index b1ee1333f8d..92980e492b1 100644 --- a/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt +++ b/build-logic/smoke-test/src/test/kotlin/datadog/buildlogic/smoketest/SmokeTestAppPluginTest.kt @@ -45,7 +45,7 @@ class SmokeTestAppPluginTest { project.apply() 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") @@ -198,7 +198,7 @@ class SmokeTestAppPluginTest { project.plugins.apply("dd-trace-java.smoke-test-app") val extension = project.extensions.getByType() - extension.gradleVersion.set("8.14.5") + extension.gradleVersion.set("8.14.6") extension.gradleDistributionBaseUrl.set("https://mass.example") extension.gradleApp { taskName.set("packageApp") @@ -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") @@ -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", ) } diff --git a/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties b/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties index 8529c2e4167..f6239313b71 100644 --- a/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties +++ b/dd-smoke-tests/gradle/src/test/resources/latest-tool-versions.properties @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5ca41e88055..e9a92756311 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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"