From 6b164f84d999b4e3255c2cbc40fc073660589bfa Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 19 Apr 2023 12:36:03 +0530
Subject: [PATCH] refactor(build): migrate to Kotlin `compilerOptions` DSL

---
 build-logic/build.gradle.kts                  |  3 ++-
 .../claw/gradle/KotlinCommonPlugin.kt         | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index b7c498b5..8c394c16 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -7,6 +7,7 @@
 import org.gradle.api.JavaVersion
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins { `kotlin-dsl` }
@@ -17,7 +18,7 @@ tasks.withType<JavaCompile>().configureEach {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-  kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() }
+  compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
 }
 
 gradlePlugin {
diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
index cbc11cc5..21a53292 100644
--- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
@@ -13,7 +13,9 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 @Suppress("Unused")
 class KotlinCommonPlugin : Plugin<Project> {
@@ -24,13 +26,14 @@ class KotlinCommonPlugin : Plugin<Project> {
         sourceCompatibility = JavaVersion.VERSION_11.toString()
         targetCompatibility = JavaVersion.VERSION_11.toString()
       }
-      withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-          allWarningsAsErrors =
-            false // project.providers.environmentVariable("GITHUB_WORKFLOW").isPresent
-          jvmTarget = JavaVersion.VERSION_11.toString()
-          freeCompilerArgs = freeCompilerArgs + ADDITIONAL_COMPILER_ARGS
-          languageVersion = "1.7"
+      withType<KotlinJvmCompile>().configureEach {
+        compilerOptions {
+          allWarningsAsErrors.set(
+            project.providers.environmentVariable("GITHUB_WORKFLOW").isPresent
+          )
+          jvmTarget.set(JvmTarget.JVM_11)
+          freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
+          languageVersion.set(KotlinVersion.KOTLIN_1_7)
         }
       }
       withType<Test>().configureEach {