kotlin 2

Author: shalom938

common-build-logic/build.gradle.kts

@@ -14,7 +14,6 @@ dependencies {
     //when updating intellij-platform-gradle-plugin update also org.jetbrains.intellij.platform.settings plugin
     // in settings file to the same version. we need to maintain it in two places, unfortunately.
     implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.1") // Update also org.jetbrains.intellij.platform.settings in settings.gradle.kts
-//    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
     implementation("com.glovoapp.gradle:versioning:1.1.10")
     implementation("de.undercouch:gradle-download-task:5.6.0")

common-build-logic/src/main/kotlin/common-kotlin.gradle.kts

@@ -42,18 +42,17 @@ tasks {
     withType<KotlinCompile> {
 
         doFirst {
-            //todo: migrate to 2.0.20, see https://kotlinlang.org/docs/gradle-compiler-options.html#target-the-jvm
             logger.lifecycle("compiling kotlin with jdk: ${kotlinJavaToolchain.javaVersion}")
-            logger.lifecycle("Compiling kotlin with jvmTarget:${kotlinOptions.jvmTarget},apiVersion:${kotlinOptions.apiVersion},languageVersion:${kotlinOptions.languageVersion}")
+            logger.lifecycle("Compiling kotlin with jvmTarget:${compilerOptions.jvmTarget.get()},apiVersion:${compilerOptions.apiVersion.get()},languageVersion:${compilerOptions.languageVersion.get()}")
         }
 
-        //todo: migrate to 2.0.20, see https://kotlinlang.org/docs/gradle-compiler-options.html#target-the-jvm
-        kotlinOptions {
+        compilerOptions {
             verbose = true
-            jvmTarget = project.currentProfile().javaVersion
-            apiVersion = project.currentProfile().kotlinTarget
-            languageVersion = project.currentProfile().kotlinTarget
+            apiVersion.set(project.currentProfile().kotlinTarget)
+            languageVersion.set(project.currentProfile().kotlinTarget)
+            jvmTarget.set(project.currentProfile().kotlinJvmTarget)
         }
+
     }
 
 }

common-build-logic/src/main/kotlin/common/BuildProfile.kt

@@ -1,9 +1,12 @@
+@file:Suppress("unused")
+
 package common
 
 import org.gradle.api.GradleException
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 //todo: some functions here are marked as not used but they are used. its an intellij issue.
@@ -74,6 +77,7 @@ fun Project.useBinaryInstaller(): Boolean = !this.currentProfile().isEAP
 
 object BuildProfiles {
 
+    @Suppress("EnumEntryName")
     enum class Profile { p231, p232, p233, p241, p242, p243 }
 
     fun Profile.greaterThan(other:Profile):Boolean{
@@ -143,7 +147,8 @@ object BuildProfiles {
             platformVersionCode = "231",
             pluginSinceBuild = "231",
             pluginUntilBuild = "231.*",
-            kotlinTarget = KotlinVersion.KOTLIN_1_8.version,
+            kotlinTarget = KotlinVersion.KOTLIN_1_8,
+            kotlinJvmTarget = JvmTarget.JVM_17,
             javaVersion = JavaVersion.VERSION_17.majorVersion
         ),
 
@@ -157,7 +162,8 @@ object BuildProfiles {
             platformVersionCode = "232",
             pluginSinceBuild = "232",
             pluginUntilBuild = "232.*",
-            kotlinTarget = KotlinVersion.KOTLIN_1_8.version,
+            kotlinTarget = KotlinVersion.KOTLIN_1_8,
+            kotlinJvmTarget = JvmTarget.JVM_17,
             javaVersion = JavaVersion.VERSION_17.majorVersion
         ),
 
@@ -172,7 +178,8 @@ object BuildProfiles {
             platformVersionCode = "233",
             pluginSinceBuild = "233",
             pluginUntilBuild = "233.*",
-            kotlinTarget = KotlinVersion.KOTLIN_1_9.version,
+            kotlinTarget = KotlinVersion.KOTLIN_1_9,
+            kotlinJvmTarget = JvmTarget.JVM_17,
             javaVersion = JavaVersion.VERSION_17.majorVersion
         ),
 
@@ -187,7 +194,8 @@ object BuildProfiles {
             platformVersionCode = "241",
             pluginSinceBuild = "241",
             pluginUntilBuild = "241.*",
-            kotlinTarget = KotlinVersion.KOTLIN_1_9.version,
+            kotlinTarget = KotlinVersion.KOTLIN_1_9,
+            kotlinJvmTarget = JvmTarget.JVM_17,
             javaVersion = JavaVersion.VERSION_17.majorVersion,
         ),
 
@@ -203,7 +211,8 @@ object BuildProfiles {
             platformVersionCode = "242",
             pluginSinceBuild = "242",
             pluginUntilBuild = "242.*",
-            kotlinTarget = KotlinVersion.KOTLIN_1_9.version,
+            kotlinTarget = KotlinVersion.KOTLIN_1_9,
+            kotlinJvmTarget = JvmTarget.JVM_17,
             javaVersion = JavaVersion.VERSION_17.majorVersion,
         ),
 
@@ -225,7 +234,8 @@ object BuildProfiles {
             platformVersionCode = "243",
             pluginSinceBuild = "243",
             pluginUntilBuild = "243.*",
-            kotlinTarget = KotlinVersion.KOTLIN_2_0.version,
+            kotlinTarget = KotlinVersion.KOTLIN_2_0,
+            kotlinJvmTarget = JvmTarget.JVM_21,
             javaVersion = JavaVersion.VERSION_21.majorVersion,
         )
 
@@ -244,6 +254,7 @@ data class BuildProfile(
     val platformVersionCode: String,
     val pluginSinceBuild: String,
     val pluginUntilBuild: String,
-    val kotlinTarget: String,
+    val kotlinTarget: KotlinVersion,
+    val kotlinJvmTarget: JvmTarget,
     val javaVersion: String,
 )