irgaly · irgaly · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,9 @@
 .idea/inspectionProfiles
 .idea/appInsightsSettings.xml
 
+# Kotlin
+.kotlin
+
 # Created by https://www.toptal.com/developers/gitignore/api/macos,windows,android,intellij,androidstudio,xcode
 # Edit at https://www.toptal.com/developers/gitignore?templates=macos,windows,android,intellij,androidstudio,xcode
 

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -26,5 +26,5 @@ gradlePlugin {
     }
 }
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 }
diff --git a/build-logic/src/main/kotlin/io/github/irgaly/buildlogic/Extensions.kt b/build-logic/src/main/kotlin/io/github/irgaly/buildlogic/Extensions.kt
@@ -98,7 +98,7 @@ fun Project.configureMultiplatformLibrary() {
     extensions.configure<KotlinMultiplatformExtension> {
         pluginManager.withPlugin("com.android.library") {
             // Android AAR
-            android {
+            androidTarget {
                 publishAllLibraryVariants()
             }
         }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,21 +22,23 @@ plugins {
 }
 
 subprojects {
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "11"
-        }
-    }
     tasks.withType<Test> {
         useJUnitPlatform()
         testLogging.showStandardStreams = true
     }
+    listOf(
+        "org.jetbrains.kotlin.android",
+        "org.jetbrains.kotlin.multiplatform",
+    ).forEach {
+        pluginManager.withPlugin(it) {
+            extensions.configure<KotlinProjectExtension> {
+                jvmToolchain(17)
+            }
+        }
+    }
     afterEvaluate {
         // libs アクセスのための afterEvaluate
         pluginManager.withPlugin(libs.plugins.kotlin.multiplatform.get().pluginId) {
-            extensions.configure<KotlinProjectExtension> {
-                jvmToolchain(11)
-            }
             extensions.configure<KotlinMultiplatformExtension> {
                 sourceSets {
                     val commonTest by getting {
@@ -57,21 +59,6 @@ subprojects {
             }
         }
     }
-    listOf(
-        "com.android.application",
-        "com.android.library"
-    ).forEach {
-        pluginManager.withPlugin(it) {
-            extensions.configure<BaseExtension> {
-                compileOptions {
-                    // Android JVM toolchain workarounds
-                    // https://issuetracker.google.com/issues/260059413
-                    sourceCompatibility = JavaVersion.VERSION_11
-                    targetCompatibility = JavaVersion.VERSION_11
-                }
-            }
-        }
-    }
     if (!path.startsWith(":sample") && !path.endsWith(":test")) {
         apply(plugin = "maven-publish")
         apply(plugin = "signing")
@@ -81,8 +68,8 @@ subprojects {
             version = libs.versions.kottage.get()
         }
         val emptyJavadocJar = tasks.create<Jar>("emptyJavadocJar") {
-            archiveClassifier.set("javadoc")
-            destinationDirectory.set(File(buildDir, "libs_emptyJavadoc"))
+            archiveClassifier = "javadoc"
+            destinationDirectory = File(buildDir, "libs_emptyJavadoc")
         }
         extensions.configure<PublishingExtension> {
             afterEvaluate {
@@ -99,26 +86,26 @@ subprojects {
                         artifact(javadocJar)
                         artifactId = "${path.split(":").drop(1).joinToString("-")}$artifactSuffix"
                         pom {
-                            name.set(artifactId)
-                            description.set("Kotlin KVS Storage for Kotlin Multiplatform.")
-                            url.set("https://github.com/irgaly/kottage")
+                            name = artifactId
+                            description = "Kotlin KVS Storage for Kotlin Multiplatform."
+                            url = "https://github.com/irgaly/kottage"
                             developers {
                                 developer {
-                                    id.set("irgaly")
-                                    name.set("irgaly")
-                                    email.set("irgaly@gmail.com")
+                                    id = "irgaly"
+                                    name = "irgaly"
+                                    email = "irgaly@gmail.com"
                                 }
                             }
                             licenses {
                                 license {
-                                    name.set("The Apache License, Version 2.0")
-                                    url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                                    name = "The Apache License, Version 2.0"
+                                    url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
                                 }
                             }
                             scm {
-                                connection.set("git@github.com:irgaly/kottage.git")
-                                developerConnection.set("git@github.com:irgaly/kottage.git")
-                                url.set("https://github.com/irgaly/kottage")
+                                connection = "git@github.com:irgaly/kottage.git"
+                                developerConnection = "git@github.com:irgaly/kottage.git"
+                                url = "https://github.com/irgaly/kottage"
                             }
                         }
                     }
@@ -147,7 +134,7 @@ plugins.withType<NodeJsRootPlugin> {
             val nodeExtension = this@configure
             val nodeEnv = nodeExtension.requireConfigured()
             val node = nodeEnv.nodeExecutable.replace(File.separator, "/")
-            val nodeDir = nodeEnv.nodeDir.path.replace(File.separator, "/")
+            val nodeDir = nodeEnv.dir.path.replace(File.separator, "/")
             val nodeBinDir = nodeEnv.nodeBinDir.path.replace(File.separator, "/")
             val npmCli = if (OperatingSystem.current().isWindows) {
                 "$nodeDir/node_modules/npm/bin/npm-cli.js"
@@ -184,9 +171,9 @@ nexusPublishing {
     repositories {
         sonatype {
             // io.github.irgaly staging profile
-            stagingProfileId.set("6c098027ed608f")
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+            stagingProfileId = "6c098027ed608f"
+            nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
+            snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
         }
     }
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,8 @@
 [versions]
 kottage = "1.6.0"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 kotlinx-coroutines = "1.8.0"
-compose-compiler = "1.5.11"
-kotest = "5.8.1"
+kotest = "5.9.0"
 gradle-android = "8.3.1"
 gradle-android-compile-sdk = "34"
 gradle-android-target-sdk = "34"
@@ -23,7 +22,6 @@ androidx-core = { module = "androidx.core:core-ktx", version = "1.12.0" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
 androidx-lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version = "2.7.0" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version = "2024.04.00" }
-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
 compose-material = { module = "androidx.compose.material:material" }
 compose-material3 = { module = "androidx.compose.material3:material3" }
 compose-uiTooling = { module = "androidx.compose.ui:ui-tooling" }
@@ -60,6 +58,7 @@ compose = ["compose-material", "compose-material3", "compose-uiTooling", "compos
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 android-application = { id = "com.android.application", version.ref = "gradle-android" }
 android-library = { id = "com.android.library", version.ref = "gradle-android" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew