chore: switch to new kotlin compilerOptions syntax

block · Jan 22, 2025 · 9cf5c09 · 9cf5c09
1 parent 1471a05
commit 9cf5c09
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/build-logic/conventions/build.gradle.kts b/build-logic/conventions/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("java-gradle-plugin")
@@ -24,21 +24,22 @@ dependencies {
 }
 
 val javaTarget = JavaLanguageVersion.of(libs.versions.java.get())
+val kotlinTarget = JvmTarget.fromTarget(libs.versions.java.get())
 
 java {
   toolchain {
     languageVersion = javaTarget
   }
 }
 
-tasks.withType<JavaCompile> {
-  options.release.set(javaTarget.asInt())
+kotlin {
+  compilerOptions {
+    jvmTarget = kotlinTarget
+  }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = javaTarget.toString()
-  }
+tasks.withType<JavaCompile> {
+  options.release.set(javaTarget.asInt())
 }
 
 tasks.named<Test>("test") {

diff --git a/kotlin-format/build.gradle.kts b/kotlin-format/build.gradle.kts
@@ -1,6 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   id("application")
@@ -24,6 +24,7 @@ dependencies {
 }
 
 val javaTarget = JavaLanguageVersion.of(libs.versions.java.get())
+val kotlinTarget = JvmTarget.fromTarget(libs.versions.java.get())
 val artifactName = "kotlin-formatter"
 
 java {
@@ -32,14 +33,14 @@ java {
   }
 }
 
-tasks.withType<JavaCompile> {
-  options.release.set(javaTarget.asInt())
+kotlin {
+  compilerOptions {
+    jvmTarget = kotlinTarget
+  }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions {
-    jvmTarget = javaTarget.toString()
-  }
+tasks.withType<JavaCompile> {
+  options.release.set(javaTarget.asInt())
 }
 
 application {