chore: Align compiler configuration (#9709)

bric3 · web-flow · commit dbf4b9d46335 · 2025-10-10T15:42:43.000+02:00
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
@@ -27,7 +27,7 @@ addTestSuiteExtendingForDir("jetty11LatestDepTest", "latestDepTest", "test/jetty
 
 ["compileJetty11TestGroovy", "compileJetty11LatestDepTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(11)
+    configureCompiler(it, 11)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/axis2-1.3/build.gradle b/dd-java-agent/instrumentation/axis2-1.3/build.gradle
@@ -25,7 +25,7 @@ configurations.configureEach {
 
 ["compileLatestDepForkedTestGroovy", "compileLatestDepTestGroovy"].each {
   tasks.named(it, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(11)
+    configureCompiler(it, 11)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle
@@ -32,15 +32,15 @@ tasks.named("compileLatestDepTestJava", JavaCompile) {
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  javaLauncher = getJavaLauncherFor(17)
+  configureCompiler(it, 17)
 }
 
 tasks.named("latestDepTest", Test) {
   javaLauncher = getJavaLauncherFor(17)
 }
 
 tasks.named("compileCxf3LatestDepTestGroovy", GroovyCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
 }
 
 tasks.named("cxf3LatestDepTest", Test) {
diff --git a/dd-java-agent/instrumentation/ignite-2.0/build.gradle b/dd-java-agent/instrumentation/ignite-2.0/build.gradle
@@ -45,6 +45,6 @@ dependencies {
 
 for (task in ['compileLatestDepTestGroovy', 'compileLatestDepForkedTestGroovy']) {
   tasks.named(task, GroovyCompile) {
-    it.javaLauncher = getJavaLauncherFor(11)
+    configureCompiler(it, 11)
   }
 }
diff --git a/dd-java-agent/instrumentation/jakarta-jms/build.gradle b/dd-java-agent/instrumentation/jakarta-jms/build.gradle
@@ -25,7 +25,7 @@ repositories {
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  it.javaLauncher = getJavaLauncherFor(17)
+  configureCompiler(it, 17)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle
@@ -17,7 +17,7 @@ tasks.named("compileLatestDepJava11TestJava", JavaCompile) {
 }
 
 tasks.named("compileLatestDepJava11TestGroovy", GroovyCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
 }
 
 tasks.named("latestDepJava11Test", Test) {
diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle
@@ -17,7 +17,7 @@ tasks.named("compileMain_java11Java", JavaCompile) {
 }
 
 tasks.named("compileTestGroovy", GroovyCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
 }
 
 tasks.named("forbiddenApisMain_java11") {
diff --git a/dd-java-agent/instrumentation/jersey/build.gradle b/dd-java-agent/instrumentation/jersey/build.gradle
@@ -20,7 +20,7 @@ addTestSuiteForDir('jersey2JettyTest', 'jersey2JettyTest')
 addTestSuiteForDir('jersey3JettyTest', 'jersey3JettyTest')
 
 tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
 }
 
 compileTestJava.configure {
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
@@ -49,7 +49,7 @@ tasks.named("forbiddenApisMain_java17") {
 }
 
 tasks.withType(GroovyCompile).configureEach {
-  javaLauncher = getJavaLauncherFor(17)
+  configureCompiler(it, 17)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle
@@ -46,8 +46,8 @@ repositories {
   }
 }
 
-tasks.withType(org.gradle.api.tasks.scala.ScalaCompile) {
-  it.javaLauncher = getJavaLauncherFor(8)
+tasks.withType(ScalaCompile).configureEach {
+  configureCompiler(it, 8)
 }
 
 addTestSuiteForDir('latestDepTest', 'test')
diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle
@@ -139,7 +139,7 @@ tasks.named("compileLatestDepTestJava", JavaCompile) {
 }
 
 tasks.named("compileLatestDepTestScala", ScalaCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
   classpath = classpath + files(compileBaseTestJava.destinationDirectory)
   dependsOn 'compileBaseTestJava'
 }
@@ -192,7 +192,7 @@ tasks.register('buildLatestDepTestRoutes', JavaExec) {
 }
 
 tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
   classpath = classpath + files(compileLatestDepTestScala.destinationDirectory)
   dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala
 }
@@ -202,7 +202,7 @@ tasks.named("forbiddenApisLatestDepTestGenerated") {
 }
 
 tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
-  javaLauncher = getJavaLauncherFor(11)
+  configureCompiler(it, 11)
   classpath = classpath +
     files(compileLatestDepTestScala.destinationDirectory) +
     files(compileBaseTestGroovy.destinationDirectory) +
diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle
@@ -33,7 +33,7 @@ addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
 
 ["compileLatestDepTestGroovy", "compileBoot3TestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(17)
+    configureCompiler(it, 17)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/build.gradle
@@ -18,7 +18,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 ["compileTestGroovy", "compileLatestDepTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(17)
+    configureCompiler(it, 17)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle
@@ -35,7 +35,7 @@ addTestSuiteForDir('latestSpring5Test', 'test')
 
 ["compileSpring6TestGroovy", "compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(17)
+    configureCompiler(it, 17)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/build.gradle
@@ -12,7 +12,7 @@ tasks.withType(AbstractCompile).configureEach {
 }
 
 tasks.withType(GroovyCompile).configureEach {
-  javaLauncher = getJavaLauncherFor(17)
+  configureCompiler(it, 17)
 }
 
 dependencies {
diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle
@@ -16,7 +16,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 tasks.withType(GroovyCompile).configureEach {
-  it.javaLauncher = getJavaLauncherFor(17)
+  configureCompiler(it, 17)
 }
 
 tasks.named("iastTest", Test) {
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
@@ -74,13 +74,13 @@ configurations.configureEach {
 
 ["compileLatest10TestGroovy", "compileLatest10ForkedTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(11)
+    configureCompiler(it, 11)
   }
 }
 
 ["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(17)
+    configureCompiler(it, 17)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-11/build.gradle
@@ -19,7 +19,7 @@ addTestSuite("latestDepTest")
 
 ["compileTestGroovy", "compileLatestDepTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(11)
+    configureCompiler(it, 11)
   }
 }
 
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/jetty-websocket-12/build.gradle
@@ -32,7 +32,7 @@ addTestSuiteForDir("latestDepTest", "test")
 
 ["compileTestGroovy", "compileLatestDepTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
-    javaLauncher = getJavaLauncherFor(17)
+    configureCompiler(it, 17)
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ addTestSuiteExtendingForDir("jetty11LatestDepTest", "latestDepTest", "test/jetty`
`27`	`27`
`28`	`28`	`["compileJetty11TestGroovy", "compileJetty11LatestDepTestGroovy"].each { name ->`
`29`	`29`	`tasks.named(name, GroovyCompile) {`
`30`		`- javaLauncher = getJavaLauncherFor(11)`
	`30`	`+ configureCompiler(it, 11)`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ configurations.configureEach {`
`25`	`25`
`26`	`26`	`["compileLatestDepForkedTestGroovy", "compileLatestDepTestGroovy"].each {`
`27`	`27`	`tasks.named(it, GroovyCompile) {`
`28`		`- javaLauncher = getJavaLauncherFor(11)`
	`28`	`+ configureCompiler(it, 11)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ tasks.named("compileLatestDepTestJava", JavaCompile) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`tasks.named("compileLatestDepTestGroovy", GroovyCompile) {`
`35`		`- javaLauncher = getJavaLauncherFor(17)`
	`35`	`+ configureCompiler(it, 17)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`tasks.named("latestDepTest", Test) {`
`39`	`39`	`javaLauncher = getJavaLauncherFor(17)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`tasks.named("compileCxf3LatestDepTestGroovy", GroovyCompile) {`
`43`		`- javaLauncher = getJavaLauncherFor(11)`
	`43`	`+ configureCompiler(it, 11)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`tasks.named("cxf3LatestDepTest", Test) {`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ dependencies {`
`45`	`45`
`46`	`46`	`for (task in ['compileLatestDepTestGroovy', 'compileLatestDepForkedTestGroovy']) {`
`47`	`47`	`tasks.named(task, GroovyCompile) {`
`48`		`- it.javaLauncher = getJavaLauncherFor(11)`
	`48`	`+ configureCompiler(it, 11)`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ repositories {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`tasks.named("compileTestGroovy", GroovyCompile) {`
`28`		`- it.javaLauncher = getJavaLauncherFor(17)`
	`28`	`+ configureCompiler(it, 17)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ tasks.named("compileLatestDepJava11TestJava", JavaCompile) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`tasks.named("compileLatestDepJava11TestGroovy", GroovyCompile) {`
`20`		`- javaLauncher = getJavaLauncherFor(11)`
	`20`	`+ configureCompiler(it, 11)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`tasks.named("latestDepJava11Test", Test) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ tasks.named("compileMain_java11Java", JavaCompile) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`tasks.named("compileTestGroovy", GroovyCompile) {`
`20`		`- javaLauncher = getJavaLauncherFor(11)`
	`20`	`+ configureCompiler(it, 11)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`tasks.named("forbiddenApisMain_java11") {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ addTestSuiteForDir('jersey2JettyTest', 'jersey2JettyTest')`
`20`	`20`	`addTestSuiteForDir('jersey3JettyTest', 'jersey3JettyTest')`
`21`	`21`
`22`	`22`	`tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) {`
`23`		`- javaLauncher = getJavaLauncherFor(11)`
	`23`	`+ configureCompiler(it, 11)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`compileTestJava.configure {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ tasks.named("forbiddenApisMain_java17") {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`tasks.withType(GroovyCompile).configureEach {`
`52`		`- javaLauncher = getJavaLauncherFor(17)`
	`52`	`+ configureCompiler(it, 17)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ repositories {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-tasks.withType(org.gradle.api.tasks.scala.ScalaCompile) {`
`50`		`- it.javaLauncher = getJavaLauncherFor(8)`
	`49`	`+tasks.withType(ScalaCompile).configureEach {`
	`50`	`+ configureCompiler(it, 8)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`addTestSuiteForDir('latestDepTest', 'test')`