fix: scala/kotlin smoke test compilation

bric3 · bric3 · commit 3d129e41c66d · 2025-09-24T14:21:32.000+02:00
diff --git a/dd-smoke-tests/iast-propagation/build.gradle b/dd-smoke-tests/iast-propagation/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
   id 'com.gradleup.shadow'
   id 'java'
@@ -44,3 +46,7 @@ tasks.withType(ScalaCompile).configureEach {
   // * https://github.com/gradle/gradle/issues/19456
   configureCompiler(it, 8)
 }
+
+tasks.withType(KotlinCompile).configureEach {
+  compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+}
diff --git a/dd-smoke-tests/java9-modules/build.gradle b/dd-smoke-tests/java9-modules/build.gradle
@@ -11,7 +11,7 @@ jar {
 }
 
 tasks.withType(JavaCompile).configureEach { JavaCompile jc ->
-  configureCompiler(jc, 11, JavaVersion.VERSION_1_8)
+  configureCompiler(jc, 11, JavaVersion.VERSION_1_9, "Need Java module support")
   // read up classpath lazily to avoid early locking of gradle settings
   jc.options.compilerArgumentProviders.add(new CommandLineArgumentProvider() {
       @Override
diff --git a/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java b/dd-smoke-tests/kafka-3/application/src/main/java/datadog/smoketest/kafka/iast/IastController.java
@@ -34,13 +34,13 @@ public class IastController {
 
   public IastController(
       @Qualifier("iastStringTemplate")
-      final ReplyingKafkaTemplate<String, String, String> stringTemplate,
+          final ReplyingKafkaTemplate<String, String, String> stringTemplate,
       @Qualifier("iastByteArrayTemplate")
-      final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate,
+          final ReplyingKafkaTemplate<byte[], byte[], String> byteArrayTemplate,
       @Qualifier("iastByteBufferTemplate")
-      final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate,
+          final ReplyingKafkaTemplate<ByteBuffer, ByteBuffer, String> byteBufferTemplate,
       @Qualifier("iastJsonTemplate")
-      final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate) {
+          final ReplyingKafkaTemplate<IastMessage, IastMessage, String> jsonTemplate) {
     this.stringTemplate = stringTemplate;
     this.byteArrayTemplate = byteArrayTemplate;
     this.byteBufferTemplate = byteBufferTemplate;
diff --git a/dd-smoke-tests/play-2.4/build.gradle b/dd-smoke-tests/play-2.4/build.gradle
@@ -79,6 +79,14 @@ tasks.named("compileTestGroovy").configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {
diff --git a/dd-smoke-tests/play-2.5/build.gradle b/dd-smoke-tests/play-2.5/build.gradle
@@ -81,6 +81,14 @@ tasks.named("compileTestGroovy").configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {
diff --git a/dd-smoke-tests/play-2.6/build.gradle b/dd-smoke-tests/play-2.6/build.gradle
@@ -81,6 +81,14 @@ tasks.named('compileTestGroovy').configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {
diff --git a/dd-smoke-tests/play-2.7/build.gradle b/dd-smoke-tests/play-2.7/build.gradle
@@ -81,6 +81,14 @@ tasks.named('compileTestGroovy').configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {
diff --git a/dd-smoke-tests/play-2.8-otel/build.gradle b/dd-smoke-tests/play-2.8-otel/build.gradle
@@ -77,6 +77,14 @@ tasks.named('compileTestGroovy').configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {
diff --git a/dd-smoke-tests/play-2.8-split-routes/build.gradle b/dd-smoke-tests/play-2.8-split-routes/build.gradle
@@ -77,6 +77,14 @@ tasks.named('compileTestGroovy').configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {
diff --git a/dd-smoke-tests/play-2.8/build.gradle b/dd-smoke-tests/play-2.8/build.gradle
@@ -80,6 +80,14 @@ tasks.named('compileTestGroovy').configure {
   }
 }
 
+tasks.withType(ScalaCompile).configureEach {
+  // Despite the compatibility matrix, scala compiler doesn't properly
+  // ger the right compiler flags with JDK11 toolchain. Using 8 works.
+  // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
+  // * https://github.com/gradle/gradle/issues/19456
+  configureCompiler(it, 8)
+}
+
 tasks.withType(AbstractCopyTask).each {
   // Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once
   it.configure {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ jar {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`tasks.withType(JavaCompile).configureEach { JavaCompile jc ->`
`14`		`- configureCompiler(jc, 11, JavaVersion.VERSION_1_8)`
	`14`	`+ configureCompiler(jc, 11, JavaVersion.VERSION_1_9, "Need Java module support")`
`15`	`15`	`// read up classpath lazily to avoid early locking of gradle settings`
`16`	`16`	`jc.options.compilerArgumentProviders.add(new CommandLineArgumentProvider() {`
`17`	`17`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,14 @@ tasks.named("compileTestGroovy").configure {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
	`82`	`+tasks.withType(ScalaCompile).configureEach {`
	`83`	`+ // Despite the compatibility matrix, scala compiler doesn't properly`
	`84`	`+ // ger the right compiler flags with JDK11 toolchain. Using 8 works.`
	`85`	`+ // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html`
	`86`	`+ // * https://github.com/gradle/gradle/issues/19456`
	`87`	`+ configureCompiler(it, 8)`
	`88`	`+}`
	`89`	`+`
`82`	`90`	`tasks.withType(AbstractCopyTask).each {`
`83`	`91`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`84`	`92`	`it.configure {`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,14 @@ tasks.named("compileTestGroovy").configure {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+tasks.withType(ScalaCompile).configureEach {`
	`85`	`+ // Despite the compatibility matrix, scala compiler doesn't properly`
	`86`	`+ // ger the right compiler flags with JDK11 toolchain. Using 8 works.`
	`87`	`+ // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html`
	`88`	`+ // * https://github.com/gradle/gradle/issues/19456`
	`89`	`+ configureCompiler(it, 8)`
	`90`	`+}`
	`91`	`+`
`84`	`92`	`tasks.withType(AbstractCopyTask).each {`
`85`	`93`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`86`	`94`	`it.configure {`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,14 @@ tasks.named('compileTestGroovy').configure {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+tasks.withType(ScalaCompile).configureEach {`
	`85`	`+ // Despite the compatibility matrix, scala compiler doesn't properly`
	`86`	`+ // ger the right compiler flags with JDK11 toolchain. Using 8 works.`
	`87`	`+ // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html`
	`88`	`+ // * https://github.com/gradle/gradle/issues/19456`
	`89`	`+ configureCompiler(it, 8)`
	`90`	`+}`
	`91`	`+`
`84`	`92`	`tasks.withType(AbstractCopyTask).each {`
`85`	`93`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`86`	`94`	`it.configure {`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,14 @@ tasks.named('compileTestGroovy').configure {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
	`80`	`+tasks.withType(ScalaCompile).configureEach {`
	`81`	`+ // Despite the compatibility matrix, scala compiler doesn't properly`
	`82`	`+ // ger the right compiler flags with JDK11 toolchain. Using 8 works.`
	`83`	`+ // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html`
	`84`	`+ // * https://github.com/gradle/gradle/issues/19456`
	`85`	`+ configureCompiler(it, 8)`
	`86`	`+}`
	`87`	`+`
`80`	`88`	`tasks.withType(AbstractCopyTask).each {`
`81`	`89`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`82`	`90`	`it.configure {`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,14 @@ tasks.named('compileTestGroovy').configure {`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
	`83`	`+tasks.withType(ScalaCompile).configureEach {`
	`84`	`+ // Despite the compatibility matrix, scala compiler doesn't properly`
	`85`	`+ // ger the right compiler flags with JDK11 toolchain. Using 8 works.`
	`86`	`+ // * https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html`
	`87`	`+ // * https://github.com/gradle/gradle/issues/19456`
	`88`	`+ configureCompiler(it, 8)`
	`89`	`+}`
	`90`	`+`
`83`	`91`	`tasks.withType(AbstractCopyTask).each {`
`84`	`92`	`// Don't know why the play plugin tries to copy the logback.xml file twice, but only accept it once`
`85`	`93`	`it.configure {`