Upgrade Gradle to 9.8.0

.gitlab-ci.yml

@@ -56,7 +56,7 @@ variables:
   BUILD_JOB_NAME: "build"
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
-  GRADLE_VERSION: "9.7.1" # must match gradle-wrapper.properties
+  GRADLE_VERSION: "9.8.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/"

build-logic/settings.gradle.kts

@@ -1,21 +1,22 @@
 pluginManagement {
   repositories {
     mavenLocal()
-    if (settings.extra.has("gradlePluginProxy")) {
+    providers.gradleProperty("gradlePluginProxy").orNull?.let { proxy ->
       maven {
-        url = uri(settings.extra["gradlePluginProxy"] as String)
+        url = uri(proxy)
         isAllowInsecureProtocol = true
       }
     }
-    if (settings.extra.has("mavenRepositoryProxy")) {
+    val mavenRepositoryProxy = providers.gradleProperty("mavenRepositoryProxy").orNull
+    mavenRepositoryProxy?.let { proxy ->
       maven {
-        url = uri(settings.extra["mavenRepositoryProxy"] as String)
+        url = uri(proxy)
         isAllowInsecureProtocol = true
       }
     }
     gradlePluginPortal()
     // TODO: temporary fix for Maven Central rate limiting
-    if (!settings.extra.has("mavenRepositoryProxy")) {
+    if (mavenRepositoryProxy == null) {
       mavenCentral()
     }
   }
@@ -29,15 +30,16 @@ dependencyResolutionManagement {
   }
   repositories {
     mavenLocal()
-    if (settings.extra.has("mavenRepositoryProxy")) {
+    val mavenRepositoryProxy = providers.gradleProperty("mavenRepositoryProxy").orNull
+    mavenRepositoryProxy?.let { proxy ->
       maven {
-        url = uri(settings.extra["mavenRepositoryProxy"] as String)
+        url = uri(proxy)
         isAllowInsecureProtocol = true
       }
     }
     gradlePluginPortal()
     // TODO: temporary fix for Maven Central rate limiting
-    if (!settings.extra.has("mavenRepositoryProxy")) {
+    if (mavenRepositoryProxy == null) {
       mavenCentral()
     }
     // Hosts gradle-tooling-api; used by the smoke-test plugin to run nested Gradle builds

buildSrc/settings.gradle.kts

@@ -1,3 +1,22 @@
+pluginManagement {
+  repositories {
+    mavenLocal()
+    providers.gradleProperty("gradlePluginProxy").orNull?.let { proxy ->
+      maven {
+        url = uri(proxy)
+        isAllowInsecureProtocol = true
+      }
+    }
+    providers.gradleProperty("mavenRepositoryProxy").orNull?.let { proxy ->
+      maven {
+        url = uri(proxy)
+        isAllowInsecureProtocol = true
+      }
+    }
+    gradlePluginPortal()
+  }
+}
+
 include(":call-site-instrumentation-plugin")
 include(":modifiable-config-agent")
 

gradle/maven-pom.gradle

@@ -1,28 +1,26 @@
 /** Applies the common elements to our generated POM files */
-tasks.withType(GenerateMavenPom).configureEach {
-  doFirst {
-    MavenPom pom = it.pom
-    pom.name = project.name
-    pom.description = project.description
-    pom.packaging = "jar"
-    pom.url = "https://github.com/datadog/dd-trace-java"
-    pom.licenses {
-      license {
-        name = "The Apache Software License, Version 2.0"
-        url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
-        distribution = "repo"
-      }
+publishing.publications.withType(MavenPublication).configureEach {
+  MavenPom pom = it.pom
+  pom.name = project.name
+  pom.description = providers.provider { project.description }
+  pom.packaging = "jar"
+  pom.url = "https://github.com/datadog/dd-trace-java"
+  pom.licenses {
+    license {
+      name = "The Apache Software License, Version 2.0"
+      url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+      distribution = "repo"
     }
-    pom.scm {
-      connection = "scm:https://datadog@github.com/datadog/dd-trace-java"
-      developerConnection = "scm:git@github.com:datadog/dd-trace-java.git"
-      url = "https://github.com/datadog/dd-trace-java"
-    }
-    pom.developers {
-      developer {
-        id = "datadog"
-        name = "Datadog"
-      }
+  }
+  pom.scm {
+    connection = "scm:https://datadog@github.com/datadog/dd-trace-java"
+    developerConnection = "scm:git@github.com:datadog/dd-trace-java.git"
+    url = "https://github.com/datadog/dd-trace-java"
+  }
+  pom.developers {
+    developer {
+      id = "datadog"
+      name = "Datadog"
     }
   }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionSha256Sum=bafd5ce9cfaea0fbccfdc8439a1ac42fbd4cd9c89dc9a988228d8a2639a58e6c
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

settings.gradle.kts

@@ -2,21 +2,22 @@ pluginManagement {
   repositories {
     mavenLocal()
 
-    if (settings.extra.has("gradlePluginProxy")) {
+    providers.gradleProperty("gradlePluginProxy").orNull?.let { proxy ->
       maven {
-        url = uri(settings.extra["gradlePluginProxy"] as String)
+        url = uri(proxy)
         isAllowInsecureProtocol = true
       }
     }
-    if (settings.extra.has("mavenRepositoryProxy")) {
+    val mavenRepositoryProxy = providers.gradleProperty("mavenRepositoryProxy").orNull
+    mavenRepositoryProxy?.let { proxy ->
       maven {
-        url = uri(settings.extra["mavenRepositoryProxy"] as String)
+        url = uri(proxy)
         isAllowInsecureProtocol = true
       }
     }
     gradlePluginPortal()
     // TODO: temporary fix for Maven Central rate limiting
-    if (!settings.extra.has("mavenRepositoryProxy")) {
+    if (mavenRepositoryProxy == null) {
       mavenCentral()
     }
     // Hosts gradle-tooling-api, a transitive dep of the build-logic:smoke-test plugin used

test-published-dependencies/settings.gradle.kts

@@ -1,3 +1,22 @@
+pluginManagement {
+  repositories {
+    mavenLocal()
+    providers.gradleProperty("gradlePluginProxy").orNull?.let { proxy ->
+      maven {
+        url = uri(proxy)
+        isAllowInsecureProtocol = true
+      }
+    }
+    providers.gradleProperty("mavenRepositoryProxy").orNull?.let { proxy ->
+      maven {
+        url = uri(proxy)
+        isAllowInsecureProtocol = true
+      }
+    }
+    gradlePluginPortal()
+  }
+}
+
 rootProject.name = "test-published-dependencies"
 
 dependencyResolutionManagement {