avoid kotlinCompile

ursjoss · May 24, 2024 · f2215f6 · f2215f6
1 parent 8bd8798
commit f2215f6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 44 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,5 @@
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.dokka.gradle.DokkaTaskPartial
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URI
 
 buildscript {
@@ -24,6 +23,10 @@ plugins {
     jacoco
 }
 
+kotlin {
+    jvmToolchain(libs.versions.java.get().toInt())
+}
+
 jacoco {
     toolVersion = libs.versions.jacoco.get()
 }
@@ -51,6 +54,8 @@ nexusPublishing {
     }
 }
 
+val kotlinSrcSet = "/src/main/kotlin"
+
 tasks {
     val deleteOutFolderTask by registering(Delete::class) {
         delete("out")
@@ -72,14 +77,6 @@ tasks {
     }
 }
 
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))
-    }
-}
-
-val kotlinSrcSet = "/src/main/kotlin"
-
 subprojects.forEach { subProject ->
     if (subProject.name in setOf("kris-core", "kris-io")) {
         apply {
@@ -99,23 +96,16 @@ subprojects.forEach { subProject ->
             }
         }
     }
+
     subProject.tasks {
-        val kotlinVersion = libs.versions.kotlin.get()
-        val kotlinApiLangVersion = kotlinVersion.subSequence(0, 3).toString()
-        val jvmTargetVersion = libs.versions.java.get()
-        withType<KotlinCompile>().configureEach {
-            kotlinOptions {
+        named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) {
+            val kotlinApiLangVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.fromVersion(libs.versions.kotlin.get().take(3))
+            compilerOptions {
                 apiVersion = kotlinApiLangVersion
                 languageVersion = kotlinApiLangVersion
-                jvmTarget = jvmTargetVersion
-                freeCompilerArgs = freeCompilerArgs + listOf("-opt-in=kotlin.RequiresOptIn")
+                freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
             }
         }
-        withType<JavaCompile>().configureEach {
-            sourceCompatibility = jvmTargetVersion
-            targetCompatibility = jvmTargetVersion
-        }
-
         withType<Test> {
             useJUnitPlatform {
                 includeEngines("junit-jupiter", "kotest")
@@ -128,11 +118,6 @@ subprojects.forEach { subProject ->
                 }
             }
         }
-        kotlin {
-            jvmToolchain {
-                languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))
-            }
-        }
     }
 }
 

diff --git a/gradle-plugins/publishing/build.gradle.kts b/gradle-plugins/publishing/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     `java-gradle-plugin`
@@ -8,9 +6,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))
-    }
+    jvmToolchain(libs.versions.java.get().toInt())
 }
 
 dependencies {

diff --git a/gradle-plugins/verification/build.gradle.kts b/gradle-plugins/verification/build.gradle.kts
@@ -13,9 +13,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get()))
-    }
+    jvmToolchain(libs.versions.java.get().toInt())
 }
 
 detekt {

diff --git a/subprojects/kris-guide/kris-guide.gradle.kts b/subprojects/kris-guide/kris-guide.gradle.kts
@@ -1,18 +1,8 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     `java-library`
     kotlin("jvm")
 }
 
-tasks {
-    withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = libs.versions.java.get()
-        }
-    }
-}
-
 dependencies {
     testImplementation(project(":kris-io"))