Update Kotlin to 1.9.20 (#10059)

* Update Kotlin to 1.9.20 * Remove useIR as it's just in test * ksp 1.9.20-1.0.14
micronaut-projects · Nov 3, 2023 · 17da29d · 17da29d
1 parent 1ca4e99
commit 17da29d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 55 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ managed-groovy = "4.0.14"
 managed-jakarta-annotation-api = "2.1.1"
 managed-jackson = "2.15.3"
 managed-jackson-databind = "2.15.3"
-managed-kotlin = "1.9.10"
+managed-kotlin = "1.9.20"
 managed-kotlin-coroutines = "1.7.3"
 managed-methvin-directory-watcher = "0.18.0"
 managed-netty = "4.1.100.Final"
@@ -72,7 +72,7 @@ managed-reactive-streams = "1.0.4"
 managed-reactor = "3.5.11"
 managed-snakeyaml = "2.0"
 managed-java-parser-core = "3.25.5"
-managed-ksp = "1.9.10-1.0.13"
+managed-ksp = "1.9.20-1.0.14"
 micronaut-docs = "2.0.0"
 
 [libraries]

diff --git a/...test/src/main/kotlin/io/micronaut/annotation/processing/test/support/KotlinCompilation.kt b/...test/src/main/kotlin/io/micronaut/annotation/processing/test/support/KotlinCompilation.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2018 original authors
+ * Copyright 2017-2023 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,9 +57,6 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 	/** Generate metadata for Java 1.8 reflection on method parameters */
 	var javaParameters: Boolean = false
 
-	/** Use the IR backend */
-	var useIR: Boolean = false
-
 	/** Use the old JVM backend */
 	var useOldBackend: Boolean = false
 
@@ -267,7 +264,6 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 
 		args.jvmTarget = jvmTarget
 		args.javaParameters = javaParameters
-		args.useIR = useIR
 		args.useOldBackend = useOldBackend
 
 		if(javaModulePath != null)

diff --git a/src/main/docs/guide/introduction/whatsNew.adoc b/src/main/docs/guide/introduction/whatsNew.adoc
@@ -1,8 +1,8 @@
 == 4.2.0
 
-=== Kotlin base version updated to 1.9.10
+=== Kotlin base version updated to 1.9.20
 
-Kotlin has been updated to 1.9.10, which may cause issues when compiling or linking to Kotlin libraries.
+Kotlin has been updated to 1.9.20, which may cause issues when compiling or linking to Kotlin libraries.
 
 
 == 4.1.0

diff --git a/src/main/docs/guide/languageSupport/kotlin/kotlinretainparamnames.adoc b/src/main/docs/guide/languageSupport/kotlin/kotlinretainparamnames.adoc
@@ -7,7 +7,6 @@ To enable retention of parameter name data with Kotlin, set the `javaParameters`
 ----
 compileTestKotlin {
     kotlinOptions {
-        jvmTarget = '17'
         javaParameters = true
     }
 }

diff --git a/src/main/docs/guide/languageSupport/kotlin/ksp.adoc b/src/main/docs/guide/languageSupport/kotlin/ksp.adoc
@@ -10,9 +10,9 @@ If you use the https://micronaut-projects.github.io/micronaut-gradle-plugin/late
 .build.gradle.kts
 ----
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.9.10"
-    id("com.google.devtools.ksp") version "1.9.10-1.0.13"
-    id("org.jetbrains.kotlin.plugin.allopen") version "1.9.10"
+    id("org.jetbrains.kotlin.jvm") version "1.9.20"
+    id("com.google.devtools.ksp") version "1.9.20-1.0.13"
+    id("org.jetbrains.kotlin.plugin.allopen") version "1.9.20"
     id("io.micronaut.application") version "4.0.0"
 }
 version = "0.1"
@@ -29,22 +29,6 @@ dependencies {
 application {
     mainClass.set("example.micronaut.Application")
 }
-java {
-    sourceCompatibility = JavaVersion.toVersion("17")
-    targetCompatibility = JavaVersion.toVersion("17")
-}
-tasks {
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-    }
-    compileTestKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-    }
-}
 graalvmNative.toolchainDetection.set(false)
 micronaut {
     runtime("netty")
@@ -61,9 +45,9 @@ If you don't use the https://micronaut-projects.github.io/micronaut-gradle-plugi
 [source, kotlin]
 ----
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.9.10"
-    id("com.google.devtools.ksp") version "1.9.10-1.0.13"
-    id("org.jetbrains.kotlin.plugin.allopen") version "1.9.10"
+    id("org.jetbrains.kotlin.jvm") version "1.9.20"
+    id("com.google.devtools.ksp") version "1.9.20-1.0.13"
+    id("org.jetbrains.kotlin.plugin.allopen") version "1.9.20"
     application
 }
 version = "0.1"
@@ -100,22 +84,7 @@ application {
     mainClass.set("dockerisms.Application")
 }
 
-java {
-    sourceCompatibility = JavaVersion.toVersion("17")
-    targetCompatibility = JavaVersion.toVersion("17")
-}
-
 tasks {
-    compileKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-    }
-    compileTestKotlin {
-        kotlinOptions {
-            jvmTarget = "17"
-        }
-    }
     withType<Test> {
         useJUnitPlatform()
     }

diff --git a/test-suite-kotlin-ksp/build.gradle b/test-suite-kotlin-ksp/build.gradle
@@ -84,10 +84,6 @@ configurations.testRuntimeClasspath {
 //    kotlinDaemonJvmArgs = ["-Xdebug","-Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=y"]
 //}
 
-tasks.named("compileTestKotlin") {
-    kotlinOptions.jvmTarget = "17"
-}
-
 tasks.named("test") {
     useJUnitPlatform()
 }
diff --git a/test-suite-kotlin/build.gradle b/test-suite-kotlin/build.gradle
@@ -82,10 +82,6 @@ configurations.testRuntimeClasspath {
     }
 }
 
-tasks.named("compileTestKotlin") {
-    kotlinOptions.jvmTarget = "17"
-}
-
 tasks.named("test") {
     useJUnitPlatform()
 }