update to kotlin 2.0

Author: Alex009

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-mokoGradlePluginVersion = "0.5.1"
+mokoGradlePluginVersion = "0.6.0"
 
-kotlinVersion = "1.9.25"
+kotlinVersion = "2.0.20"
 androidGradlePluginVerison = "8.3.2"
 mobileMultiplatformVersion = "0.14.4"
-detektVersion = "1.22.0"
+detektVersion = "1.23.7"
 nexusPublishVersion = "2.0.0"
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/dev/icerock/moko/gradle/AndroidBasePlugin.kt

@@ -12,6 +12,7 @@ import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 class AndroidBasePlugin : Plugin<Project> {
@@ -38,7 +39,7 @@ class AndroidBasePlugin : Plugin<Project> {
         target.tasks
             .withType<KotlinCompile>()
             .configureEach {
-                kotlinOptions.jvmTarget = "11"
+                compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
             }
     }
 }

src/main/kotlin/dev/icerock/moko/gradle/DetektPlugin.kt

@@ -34,7 +34,7 @@ class DetektPlugin : Plugin<Project> {
         target.tasks.getByName("check").dependsOn(detektTask)
 
         target.dependencies {
-            "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
+            "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.7")
         }
     }
 }

src/main/kotlin/dev/icerock/moko/gradle/JvmPlugin.kt

@@ -14,6 +14,7 @@ import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 class JvmPlugin : Plugin<Project> {
@@ -32,7 +33,7 @@ class JvmPlugin : Plugin<Project> {
         target.tasks
             .withType<KotlinCompile>()
             .configureEach {
-                kotlinOptions.jvmTarget = "1.8"
+                compilerOptions.jvmTarget.set(JvmTarget.JVM_1_8)
             }
 
         target.plugins.withId("org.gradle.maven-publish") {

src/main/kotlin/dev/icerock/moko/gradle/KmmLibraryPlugin.kt

@@ -23,7 +23,7 @@ class KmmLibraryPlugin : Plugin<Project> {
         }
 
         target.configure<KotlinMultiplatformExtension> {
-            android {
+            androidTarget {
                 publishAllLibraryVariants()
                 publishLibraryVariantsGroupedByFlavor = true
             }

src/main/kotlin/dev/icerock/moko/gradle/PublicationPlugin.kt

@@ -21,9 +21,17 @@ import java.util.Base64
 class PublicationPlugin : Plugin<Project> {
 
     override fun apply(target: Project) {
+        val signingKeyId: String? = System.getenv("SIGNING_KEY_ID")
+        val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
+        val signingKey: String? = System.getenv("SIGNING_KEY")?.let { base64Key ->
+            String(Base64.getDecoder().decode(base64Key))
+        }
+
         with(target.plugins) {
             apply("org.gradle.maven-publish")
-            apply("signing")
+            if (signingKey != null) {
+                apply("signing")
+            }
         }
 
         val libraryName: String = target.requiredStringProperty("publish.name")
@@ -70,21 +78,17 @@ class PublicationPlugin : Plugin<Project> {
             }
         }
 
-        target.configure<SigningExtension> {
-            val signingKeyId: String? = System.getenv("SIGNING_KEY_ID")
-            val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
-            val signingKey: String? = System.getenv("SIGNING_KEY")?.let { base64Key ->
-                String(Base64.getDecoder().decode(base64Key))
-            }
-
-            if (signingKeyId != null) {
-                useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-                sign(target.extensions.getByType<PublishingExtension>().publications)
-            }
+        if (signingKey != null) {
+            target.configure<SigningExtension> {
+                if (signingKeyId != null) {
+                    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+                    sign(target.extensions.getByType<PublishingExtension>().publications)
+                }
 
-            val signingTasks = target.tasks.withType<Sign>()
-            target.tasks.withType<AbstractPublishToMaven>().configureEach {
-                dependsOn(signingTasks)
+                val signingTasks = target.tasks.withType<Sign>()
+                target.tasks.withType<AbstractPublishToMaven>().configureEach {
+                    dependsOn(signingTasks)
+                }
             }
         }
     }