Update gradle compile tasks written in list format (#9618)

* Change compile task lists to lazy API formatting

* Add types to Groovy and Java compilation tasks

---------

Co-authored-by: Brice Dutheil <[email protected]>

Author: sarahchen6

dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle

@@ -32,7 +32,7 @@ excludedClassesCoverage += ['com.datadog.profiling.controller.jfr.JdkTypeIDs']
 
 // Shared JFR implementation. The earliest Java version JFR is working on is Java 8
 
-tasks.named("compileTestJava") {
+tasks.named("compileTestJava", JavaCompile) {
   setJavaVersion(it, 11)
   // tests should be compiled in Java 8 compatible way
   sourceCompatibility = JavaVersion.VERSION_1_8

dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle

@@ -18,7 +18,7 @@ apply from: "$rootDir/gradle/test-with-scala.gradle"
 addTestSuite('akka23Test')
 addTestSuiteForDir('latestDepTest', 'test')
 
-tasks.named("compileAkka23TestGroovy") {
+tasks.named("compileAkka23TestGroovy", GroovyCompile) {
   classpath += files(sourceSets.akka23Test.scala.classesDirectory)
 }
 
@@ -41,7 +41,7 @@ sourceSets {
     }
   }
 }
-tasks.named("compileLatestDepTestGroovy") {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   classpath += files(sourceSets.latestDepTest.scala.classesDirectory)
 }
 

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle

@@ -43,21 +43,27 @@ repositories {
 
 addTestSuiteForDir('latestDepTest', 'test')
 
-[compileMain_java11Java, compileTestScala, compileLatestDepTestScala].each {
-  it.configure {
+tasks.named("compileMain_java11Java", JavaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+["compileTestScala", "compileLatestDepTestScala"].each { name ->
+  tasks.named(name, ScalaCompile) {
     setJavaVersion(it, 11)
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
   }
 }
 
-compileTestGroovy {
+tasks.named("compileTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
   dependsOn compileTestScala
   classpath += files(compileTestScala.destinationDirectory)
 }
 
-compileLatestDepTestGroovy {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
   dependsOn compileLatestDepTestScala
   classpath += files(compileLatestDepTestScala.destinationDirectory)

dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle

@@ -25,8 +25,14 @@ addTestSuiteForDir("jetty11Test", "test/jetty11")
 addTestSuiteExtendingForDir("jetty9LatestDepTest", "latestDepTest", "test/jetty9")
 addTestSuiteExtendingForDir("jetty11LatestDepTest", "latestDepTest", "test/jetty11")
 
-[compileJetty11TestGroovy, jetty11Test, compileJetty11LatestDepTestGroovy, jetty11LatestDepTest].each {
-  it.configure {
+["compileJetty11TestGroovy", "compileJetty11LatestDepTestGroovy"].each { name ->
+  tasks.named(name, GroovyCompile) {
+    javaLauncher = getJavaLauncherFor(11)
+  }
+}
+
+["jetty11Test", "jetty11LatestDepTest"].each { name ->
+  tasks.named(name, Test) {
     javaLauncher = getJavaLauncherFor(11)
   }
 }

dd-java-agent/instrumentation/axis2-1.3/build.gradle

@@ -23,14 +23,14 @@ configurations.configureEach {
   }
 }
 
-[compileLatestDepForkedTestGroovy, compileLatestDepTestGroovy].each {
-  it.configure {
+["compileLatestDepForkedTestGroovy", "compileLatestDepTestGroovy"].each { name ->
+  tasks.named(name, GroovyCompile) {
     javaLauncher = getJavaLauncherFor(11)
   }
 }
 
-[compileLatestDepForkedTestJava, compileLatestDepTestJava].each {
-  it.configure {
+["compileLatestDepForkedTestJava", "compileLatestDepTestJava"].each { name ->
+  tasks.named(name, JavaCompile) {
     setJavaVersion(it, 11)
   }
 }

dd-java-agent/instrumentation/cxf-2.1/build.gradle

@@ -23,32 +23,32 @@ apply from: "${rootDir}/gradle/java.gradle"
 addTestSuite('latestDepTest')
 addTestSuiteForDir('cxf3LatestDepTest', 'test')
 
-[compileCxf3LatestDepTestJava].each {
-  it.configure {
-    setJavaVersion(it, 11)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-  }
+tasks.named("compileCxf3LatestDepTestJava", JavaCompile) {
+  setJavaVersion(it, 11)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-[compileLatestDepTestJava].each {
-  it.configure {
-    setJavaVersion(it, 17)
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-  }
+tasks.named("compileLatestDepTestJava", JavaCompile) {
+  setJavaVersion(it, 17)
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-[compileLatestDepTestGroovy, latestDepTest].each {
-  it.configure {
-    javaLauncher = getJavaLauncherFor(17)
-  }
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(17)
 }
 
-[compileCxf3LatestDepTestGroovy, cxf3LatestDepTest].each {
-  it.configure {
-    javaLauncher = getJavaLauncherFor(11)
-  }
+tasks.named("latestDepTest", Test) {
+  javaLauncher = getJavaLauncherFor(17)
+}
+
+tasks.named("compileCxf3LatestDepTestGroovy", GroovyCompile) {
+  javaLauncher = getJavaLauncherFor(11)
+}
+
+tasks.named("cxf3LatestDepTest", Test) {
+  javaLauncher = getJavaLauncherFor(11)
 }
 
 dependencies {

dd-java-agent/instrumentation/exception-profiling/build.gradle

@@ -19,11 +19,13 @@ dependencies {
 }
 
 // Must use Java 11 to build JFR enabled code - there is no JFR in OpenJDK 8 (revisit once JFR in Java 8 is available)
-[compileMain_java11Java, compileTestJava].each {
-  setJavaVersion(it, 11)
-  it.sourceCompatibility = JavaVersion.VERSION_1_8
-  it.targetCompatibility = JavaVersion.VERSION_1_8
-  it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
+["compileMain_java11Java", "compileTestJava"].each { name ->
+  tasks.named(name, JavaCompile) {
+    setJavaVersion(it, 11)
+    it.sourceCompatibility = JavaVersion.VERSION_1_8
+    it.targetCompatibility = JavaVersion.VERSION_1_8
+    it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path'])
+  }
 }
 
 forbiddenApisMain_java11 {

dd-java-agent/instrumentation/finatra-2.9/build.gradle

@@ -35,12 +35,12 @@ dependencies {
   latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
 }
 
-tasks.named("compileLatestDepTestGroovy") {
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory))
   dependsOn "compileLatestDepTestScala"
 }
 
-tasks.named("compileLatestPre207TestGroovy") {
+tasks.named("compileLatestPre207TestGroovy", GroovyCompile) {
   classpath = classpath.plus(files(compileLatestPre207TestScala.destinationDirectory))
   dependsOn "compileLatestPre207TestScala"
 }

dd-java-agent/instrumentation/graal/native-image/build.gradle

@@ -13,17 +13,19 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: "idea"
 
-[compileMain_java11Java, compileTestJava].each {
-  it.sourceCompatibility = JavaVersion.VERSION_11
-  it.targetCompatibility = JavaVersion.VERSION_11
-  setJavaVersion(it, 11)
-  it.options.compilerArgs.addAll([
-    '-Xlint:all,-processing,-options,-path',
-    '--add-modules',
-    'jdk.internal.vm.ci',
-    '--add-exports',
-    'jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED'
-  ])
+["compileMain_java11Java", "compileTestJava"].each { name ->
+  tasks.named(name, JavaCompile) {
+    it.sourceCompatibility = JavaVersion.VERSION_11
+    it.targetCompatibility = JavaVersion.VERSION_11
+    setJavaVersion(it, 11)
+    it.options.compilerArgs.addAll([
+      '-Xlint:all,-processing,-options,-path',
+      '--add-modules',
+      'jdk.internal.vm.ci',
+      '--add-exports',
+      'jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED'
+    ])
+  }
 }
 
 dependencies {

dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle

@@ -12,10 +12,10 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepJava11Test', 'latestDepTest', 'test')
 
-tasks.named("compileLatestDepJava11TestJava") {
+tasks.named("compileLatestDepJava11TestJava", JavaCompile) {
   setJavaVersion(it, 11)
 }
-tasks.named("compileLatestDepJava11TestGroovy") {
+tasks.named("compileLatestDepJava11TestGroovy", GroovyCompile) {
   javaLauncher = getJavaLauncherFor(11)
 }
 tasks.named("latestDepJava11Test") {