Fix deprecated kotlin compiler configuration (#11501)

instrumentation/kotlinx-coroutines/kotlinx-coroutines-1.0/javaagent/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("org.jetbrains.kotlin.jvm")
@@ -44,12 +44,10 @@ dependencies {
   testLibrary("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.0.0")
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
     // generate metadata for Java 1.8 reflection on method parameters, used in @WithSpan tests
     javaParameters = true
   }
 }
-}

instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent-kotlin/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 // We are using a separate module for kotlin source instead of placing them in
 // instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent because muzzle
@@ -14,10 +14,8 @@ dependencies {
   compileOnly(project(":instrumentation-api"))
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
-    }
   }
 }

instrumentation/kotlinx-coroutines/kotlinx-coroutines-flow-1.3/javaagent/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("org.jetbrains.kotlin.jvm")
@@ -36,13 +36,12 @@ dependencies {
   testLibrary("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.3.0")
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
   }
 }
-  withType<Test>().configureEach {
+
+tasks.withType<Test>().configureEach {
   jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false")
 }
-}

instrumentation/ktor/ktor-1.0/library/build.gradle.kts

@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
   id("otel.library-instrumentation")
@@ -22,19 +23,14 @@ dependencies {
   latestDepTestLibrary("io.ktor:ktor-server-netty:1.+") // see ktor-2.0 module
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
+    @Suppress("deprecation")
+    languageVersion.set(KotlinVersion.KOTLIN_1_4)
   }
 }
 
-  compileKotlin {
-    kotlinOptions {
-      languageVersion = "1.4"
-    }
-  }
-}
 tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
 }

instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("org.jetbrains.kotlin.jvm")
@@ -33,10 +33,10 @@ dependencies {
   testLibrary("io.ktor:ktor-client-cio:$ktorVersion")
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
+    // generate metadata for Java 1.8 reflection on method parameters, used in @WithSpan tests
-    }
+    javaParameters = true
   }
 }

instrumentation/ktor/ktor-2.0/library/build.gradle.kts

@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
   id("otel.library-instrumentation")
@@ -24,16 +25,10 @@ dependencies {
   testLibrary("io.ktor:ktor-client-cio:$ktorVersion")
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
+    @Suppress("deprecation")
-    }
+    languageVersion.set(KotlinVersion.KOTLIN_1_6)
-  }
-
-  compileKotlin {
-    kotlinOptions {
-      languageVersion = "1.6"
-    }
   }
 }

instrumentation/ktor/ktor-2.0/testing/build.gradle.kts

@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("otel.java-conventions")
@@ -21,10 +21,8 @@ dependencies {
   compileOnly("io.ktor:ktor-client-cio:$ktorVersion")
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
-    }
   }
 }

instrumentation/ktor/ktor-common/library/build.gradle.kts

@@ -1,4 +1,5 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
   id("otel.library-instrumentation")
@@ -10,16 +11,10 @@ dependencies {
   testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
 }
 
-tasks {
+kotlin {
-  withType(KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
+    @Suppress("deprecation")
-    }
+    languageVersion.set(KotlinVersion.KOTLIN_1_4)
-  }
-
-  compileKotlin {
-    kotlinOptions {
-      languageVersion = "1.4"
-    }
   }
 }

instrumentation/opentelemetry-extension-kotlin-1.0/javaagent/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("otel.javaagent-instrumentation")
@@ -42,10 +44,8 @@ if (!(findProperty("testLatestDeps") as Boolean)) {
   }
 }
 
-tasks {
+kotlin {
-  withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).configureEach {
+  compilerOptions {
-    kotlinOptions {
+    jvmTarget.set(JvmTarget.JVM_1_8)
-      jvmTarget = "1.8"
-    }
   }
 }