Refactor Kotlin compile options to use JvmTarget for jvmVersion

yonatankarp · yonatankarp · commit d33f503239b3 · 2025-04-25T09:59:55.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -14,8 +15,8 @@ allprojects {
     apply(plugin = "org.jetbrains.kotlin.jvm")
 
     tasks.withType(KotlinCompile::class.java) {
-        kotlinOptions {
-            jvmTarget = jvmVersion
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget(jvmVersion)
         }
     }
 
@@ -53,8 +54,7 @@ allprojects {
                 },
             )
             trimTrailingWhitespace()
-            indentWithTabs(2)
-            indentWithSpaces(4)
+            leadingTabsToSpaces(4)
             endWithNewline()
             ktlint()
         }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`1`	`2`	`import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`2`	`3`
`3`	`4`	`plugins {`
`@@ -14,8 +15,8 @@ allprojects {`
`14`	`15`	`apply(plugin = "org.jetbrains.kotlin.jvm")`
`15`	`16`
`16`	`17`	`tasks.withType(KotlinCompile::class.java) {`
`17`		`- kotlinOptions {`
`18`		`- jvmTarget = jvmVersion`
	`18`	`+ compilerOptions {`
	`19`	`+ jvmTarget = JvmTarget.fromTarget(jvmVersion)`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
`@@ -53,8 +54,7 @@ allprojects {`
`53`	`54`	`},`
`54`	`55`	`)`
`55`	`56`	`trimTrailingWhitespace()`
`56`		`- indentWithTabs(2)`
`57`		`- indentWithSpaces(4)`
	`57`	`+ leadingTabsToSpaces(4)`
`58`	`58`	`endWithNewline()`
`59`	`59`	`ktlint()`
`60`	`60`	`}`