Upgrade gradle to v8.14

Author: sarahchen6

.cursor/mcp.json

@@ -0,0 +1,10 @@
+{
+  "mcpServers": {
+    "Datadog (alpha)": {
+      "command": "/Users/sarah.chen/.cursor/extensions/datadog.datadog-vscode-2.3.1/resources/scripts/mcp/stdio-app.mjs",
+      "args": [
+        "51811"
+      ]
+    }
+  }
+}

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
   BUILD_JOB_NAME: "build"
   DEPENDENCY_CACHE_POLICY: pull
   BUILD_CACHE_POLICY: pull
-  GRADLE_VERSION: "8.5" # must match gradle-wrapper.properties
+  GRADLE_VERSION: "8.14" # must match gradle-wrapper.properties
   MAVEN_REPOSITORY_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/maven-central/"
   GRADLE_PLUGIN_PROXY: "http://artifactual.artifactual.all-clusters.local-dc.fabric.dog:8081/repository/gradle-plugin-portal-proxy/"
   BUILDER_IMAGE_VERSION_PREFIX: "v25.06-" # use either an empty string (e.g. "") for latest images or a version followed by a hyphen (e.g. "v25.05-")

dd-java-agent/instrumentation/gradle-8.3/src/main/groovy/datadog/trace/instrumentation/gradle/GradleBuildScopeServices_8_3_Instrumentation.java

@@ -11,8 +11,8 @@
 import java.util.Set;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.matcher.ElementMatcher;
+import org.gradle.internal.service.DefaultServiceRegistry;
 import org.gradle.internal.service.ServiceRegistry;
-import org.gradle.internal.service.scopes.BuildScopeServices;
 
 @AutoService(InstrumenterModule.class)
 public class GradleBuildScopeServices_8_3_Instrumentation extends InstrumenterModule.CiVisibility
@@ -55,7 +55,7 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class Construct {
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void afterConstructor(
-        @Advice.This final BuildScopeServices buildScopeServices,
+        @Advice.This final DefaultServiceRegistry buildScopeServices,
         @Advice.Argument(0) final ServiceRegistry parentServices) {
       CiVisibilityGradleListenerInjector_8_3.injectCiVisibilityGradleListener(
           buildScopeServices, parentServices);

dd-java-agent/instrumentation/scala/build.gradle

@@ -27,7 +27,7 @@ final testTasks = scalaVersions.collect { scalaLibrary ->
   def (major, minor) = version.split('_').collect(Integer.&valueOf)
   final javaConcatenation = major > 2 || minor > 11 // after 2.11 scala uses java.lang.StringBuilder to perform concatenation
 
-  final configuration = configurations.create("${version}Implementation") {
+  final implementationConfiguration = configurations.create("${version}Implementation") {
     canBeConsumed = false
     canBeResolved = false
     canBeDeclared = true
@@ -36,14 +36,14 @@ final testTasks = scalaVersions.collect { scalaLibrary ->
     canBeConsumed = false
     canBeResolved = true
     canBeDeclared = false
-    extendsFrom(configuration)
+    extendsFrom(implementationConfiguration)
   }
 
   dependencies { handler ->
-    handler.add(configuration.name, scalaLibrary)
-    handler.add(configuration.name, libs.slf4j)
+    handler.add(implementationConfiguration.name, scalaLibrary)
+    handler.add(implementationConfiguration.name, libs.slf4j)
     if (javaConcatenation) {
-      handler.add(configuration.name, project(':dd-java-agent:instrumentation:java-lang'))
+      handler.add(implementationConfiguration.name, project(':dd-java-agent:instrumentation:java-lang'))
     }
   }
 
@@ -59,7 +59,7 @@ final testTasks = scalaVersions.collect { scalaLibrary ->
       .filter { !it.toString().contains('scala-library') }   // exclude default scala-library
       .minus(files(sourceSets.test.scala.classesDirectory))  // exclude default /build/classes/scala/test folder
       .plus(customSourceSet.output.classesDirs)              // add /build/classes/scala/${version} folder
-      .plus(classPathConfiguration)                                   // add new scala-library configuration
+      .plus(classPathConfiguration)                          // add new scala-library configuration
     systemProperty('uses.java.concat', javaConcatenation)
     dependsOn(tasks.named("compile${version.capitalize()}Scala"))
     group = 'verification'

gradle/test-suites.gradle

@@ -1,6 +1,6 @@
 import org.gradle.api.plugins.jvm.JvmTestSuite
 
-ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName, String dirName) -> {
+ext.addTestSuiteExtendingForDir = { testSuiteName, parentSuiteName, dirName ->
   testing {
     suites {
       create(testSuiteName, JvmTestSuite, {
@@ -27,16 +27,12 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName,
             }
           }
         }
-        dependencies {
-          implementation project(project.path)
-        }
       })
     }
   }
 
   configurations {
-    def extendConf = {
-      String suffix ->
+    def extendConf = { suffix ->
       def config = named("${testSuiteName}${suffix}")
       def parentConfig = named("${parentSuiteName}${suffix}")
       if (parentConfig.present) {
@@ -65,12 +61,16 @@ ext.addTestSuiteExtendingForDir = (String testSuiteName, String parentSuiteName,
     from(sourceSets.named(testSuiteName).get().output)
     archiveClassifier = testSuiteName
   }
+
+  project.dependencies {
+    "${testSuiteName}Implementation"(project(project.path))
+  }
 }
 
-ext.addTestSuiteForDir = (String testSuiteName, String dirName) -> {
+ext.addTestSuiteForDir = { testSuiteName, dirName ->
   ext.addTestSuiteExtendingForDir(testSuiteName, 'test', dirName)
 }
 
-ext.addTestSuite = (String testSuiteName) -> {
+ext.addTestSuite = { testSuiteName ->
   ext.addTestSuiteForDir(testSuiteName, testSuiteName)
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,8 +2,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 # Please note that the version specific cache directory in
 # .gitlab-ci.yml needs to match this version.
-distributionSha256Sum=c16d517b50dd28b3f5838f0e844b7520b8f1eb610f2f29de7e4e04a1b7c9c79b
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
+distributionSha256Sum=27607c0289f2150f8c8c1414c95d6c7ada6c24567cf71b48fab7c656d455e8d6
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME