Fixed Groovy compiler settings.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/aerospike-4.0/build.gradle

@@ -13,13 +13,11 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
-
 addTestSuiteForDir("latestDepTest", "test")
 addTestSuiteForDir("latest7DepTest", "test")
 addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
 addTestSuiteExtendingForDir("latest7DepForkedTest", "latest7DepTest", "test")
 
-
 dependencies {
   compileOnly group: 'com.aerospike', name: 'aerospike-client', version: '4.0.0'
 
@@ -34,9 +32,8 @@ tasks.withType(Test).configureEach {
   usesService(testcontainersLimit)
 }
 
-// TODO: strange workaround for Groovy?
-tasks.matching { it.name.startsWith('compileLatestDep') && it.name.endsWith('Groovy') }.configureEach {
-  javaLauncher = javaToolchains.launcherFor {
-    it.languageVersion = JavaLanguageVersion.of(21)
+["compileLatestDepTestGroovy", "compileLatestDepForkedTestGroovy"].each { name ->
+  tasks.named(name, GroovyCompile) {
+    configureCompiler(it, 21)
   }
 }

dd-java-agent/instrumentation/junit/junit-5.3/build.gradle

@@ -66,3 +66,8 @@ configurations.matching { it.name.startsWith('test') }.configureEach {
 tasks.named("compileLatestDepTestJava", JavaCompile) {
   configureCompiler(it, 17, JavaVersion.VERSION_1_8)
 }
+
+tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
+  configureCompiler(it, 17, JavaVersion.VERSION_1_8)
+}
+

dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle

@@ -31,7 +31,7 @@ addTestSuiteExtendingForDir("boot2LatestDepForkedTest", "boot2LatestDepTest", "t
 addTestSuiteExtendingForDir("boot3ForkedTest", "boot3Test", "test")
 addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
 
-["compileLatestDepTestGroovy", "compileBoot3TestGroovy"].each { name ->
+["compileLatestDepTestGroovy", "compileBoot3TestGroovy", "compileBoot3ForkedTestGroovy"].each { name ->
   tasks.named(name, GroovyCompile) {
     configureCompiler(it, 17)
   }