Replace deprecated kotlinOptions with compilerOptions for instrumentation modules

mannodermaus · mannodermaus · commit 48dc37a07ef2 · 2025-08-15T23:50:04.000+09:00
diff --git a/instrumentation/core/build.gradle.kts b/instrumentation/core/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -57,9 +58,11 @@ junitPlatform {
   }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = javaVersion.toString()
-  kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=all")
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
+    freeCompilerArgs.add("-Xjvm-default=all")
+  }
 }
 
 tasks.withType<Test> {
diff --git a/instrumentation/extensions/build.gradle.kts b/instrumentation/extensions/build.gradle.kts
@@ -1,6 +1,7 @@
 import libs.plugins.android
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
@@ -63,8 +64,10 @@ android {
   }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = javaVersion.toString()
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
+  }
 }
 
 tasks.withType<Test> {
diff --git a/instrumentation/runner/build.gradle.kts b/instrumentation/runner/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
@@ -62,8 +63,10 @@ android {
   }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = javaVersion.toString()
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
+  }
 }
 
 tasks.withType<Test> {
diff --git a/instrumentation/testutil/build.gradle.kts b/instrumentation/testutil/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -45,8 +46,10 @@ android {
   }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = javaVersion.toString()
+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(javaVersion.toString())
+  }
 }
 
 tasks.withType<Test> {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import org.gradle.api.tasks.testing.logging.TestExceptionFormat`
`2`	`2`	`import org.gradle.api.tasks.testing.logging.TestLogEvent`
	`3`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`3`	`4`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`4`	`5`
`5`	`6`	`plugins {`
`@@ -57,9 +58,11 @@ junitPlatform {`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`
`60`		`-tasks.withType<KotlinCompile> {`
`61`		`- kotlinOptions.jvmTarget = javaVersion.toString()`
`62`		`- kotlinOptions.freeCompilerArgs = listOf("-Xjvm-default=all")`
	`61`	`+kotlin {`
	`62`	`+ compilerOptions {`
	`63`	`+ jvmTarget = JvmTarget.fromTarget(javaVersion.toString())`
	`64`	`+ freeCompilerArgs.add("-Xjvm-default=all")`
	`65`	`+ }`
`63`	`66`	`}`
`64`	`67`
`65`	`68`	`tasks.withType<Test> {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import libs.plugins.android`
`2`	`2`	`import org.gradle.api.tasks.testing.logging.TestExceptionFormat`
`3`	`3`	`import org.gradle.api.tasks.testing.logging.TestLogEvent`
	`4`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`4`	`5`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`5`	`6`
`6`	`7`	`buildscript {`
`@@ -63,8 +64,10 @@ android {`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`
`66`		`-tasks.withType<KotlinCompile> {`
`67`		`- kotlinOptions.jvmTarget = javaVersion.toString()`
	`67`	`+kotlin {`
	`68`	`+ compilerOptions {`
	`69`	`+ jvmTarget = JvmTarget.fromTarget(javaVersion.toString())`
	`70`	`+ }`
`68`	`71`	`}`
`69`	`72`
`70`	`73`	`tasks.withType<Test> {`