Update dependency org.jetbrains.kotlin.multiplatform to v1.9.21

build.gradle.kts

@@ -5,6 +5,14 @@ plugins {
     alias(libs.plugins.mavenPublish) apply false
 }
 
+subprojects {
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) {
+        compilerOptions {
+            freeCompilerArgs.add("-Xexpect-actual-classes")
+        }
+    }
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -70,4 +78,4 @@ allprojects {
 tasks.withType<org.jetbrains.dokka.gradle.DokkaMultiModuleTask>().configureEach {
     moduleName.set("Kache")
     outputDirectory.set(file("$rootDir/docs/api"))
-}
+}

file-kache-core/build.gradle.kts

@@ -6,31 +6,32 @@ plugins {
 }
 
 kotlin {
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
-    targetHierarchy.default()
-
     jvm {
         compilations.configureEach {
             kotlinOptions.jvmTarget = "1.8"
         }
     }
 
-    js(IR) {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
+    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
+        testTask {
+            useMocha {
+                timeout = "30s"
             }
         }
+    }
+
+    js {
+        // Has no FileSystem implementation in Okio
+        // browser { configureTests() }
 
-        nodejs()
+        nodejs { configureTests() }
     }
 
     // Still experimental
     // Blocked by coroutines (issue: https://github.com/Kotlin/kotlinx.coroutines/issues/3713),
     // Okio (issue: https://github.com/square/okio/issues/1203), and Kotest (depends on coroutines)
-    // wasm()
+    // wasmJs()
+    // wasmWasi()
 
     macosX64()
     macosArm64()
@@ -62,9 +63,10 @@ kotlin {
     // androidNativeX86()
     // androidNativeX64()
 
-    @Suppress("UNUSED_VARIABLE")
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 api(project(":kache-core"))
 
@@ -75,7 +77,7 @@ kotlin {
             }
         }
 
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(libs.kotest.assertions)
@@ -84,4 +86,4 @@ kotlin {
             }
         }
     }
-}
+}

file-kache-okio-only/build.gradle.kts

@@ -6,26 +6,32 @@ plugins {
 }
 
 kotlin {
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
-    targetHierarchy.default()
-
     jvm {
         compilations.configureEach {
             kotlinOptions.jvmTarget = "1.8"
         }
     }
 
-    js(IR) {
+    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
+        testTask {
+            useMocha {
+                timeout = "30s"
+            }
+        }
+    }
+
+    js {
         // Has no FileSystem implementation in Okio
-        // browser()
+        // browser { configureTests() }
 
-        nodejs()
+        nodejs { configureTests() }
     }
 
     // Still experimental
     // Blocked by coroutines (issue: https://github.com/Kotlin/kotlinx.coroutines/issues/3713),
     // Okio (issue: https://github.com/square/okio/issues/1203), and Kotest (depends on coroutines)
-    // wasm()
+    // wasmJs()
+    // wasmWasi()
 
     macosX64()
     macosArm64()
@@ -57,9 +63,10 @@ kotlin {
     // androidNativeX86()
     // androidNativeX64()
 
-    @Suppress("UNUSED_VARIABLE")
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":kache"))
                 api(project(":file-kache-core"))
@@ -70,7 +77,7 @@ kotlin {
             }
         }
 
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
 
@@ -82,10 +89,10 @@ kotlin {
             }
         }
 
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 implementation(libs.okio.nodeFilesystem)
             }
         }
     }
-}
+}

file-kache-okio/build.gradle.kts

@@ -6,25 +6,31 @@ plugins {
 }
 
 kotlin {
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
-    targetHierarchy.default()
-
     jvm {
         compilations.configureEach {
             kotlinOptions.jvmTarget = "1.8"
         }
     }
 
-    js(IR) {
+    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
+        testTask {
+            useMocha {
+                timeout = "30s"
+            }
+        }
+    }
+
+    js {
         // Has no FileSystem implementation in Okio
-        // browser()
+        // browser { configureTests() }
 
-        nodejs()
+        nodejs { configureTests() }
     }
 
     // Still experimental
     // Blocked by Okio (issue: https://github.com/square/okio/issues/1203)
-    // wasm()
+    // wasmJs()
+    // wasmWasi()
 
     macosX64()
     macosArm64()
@@ -56,9 +62,10 @@ kotlin {
     // androidNativeX86()
     // androidNativeX64()
 
-    @Suppress("UNUSED_VARIABLE")
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 api(project(":file-kache-okio-only"))
                 api(project(":file-kache"))
@@ -67,7 +74,7 @@ kotlin {
             }
         }
 
-        val jsMain by getting {
+        jsMain {
             dependencies {
                 implementation(libs.okio.nodeFilesystem)
             }
@@ -79,4 +86,4 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
     dokkaSourceSets.named("commonMain") {
         skipEmptyPackages.set(false)
     }
-}
+}

file-kache/build.gradle.kts

@@ -6,31 +6,32 @@ plugins {
 }
 
 kotlin {
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
-    targetHierarchy.default()
-
     jvm {
         compilations.configureEach {
             kotlinOptions.jvmTarget = "1.8"
         }
     }
 
-    js(IR) {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                }
+    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
+        testTask {
+            useMocha {
+                timeout = "30s"
             }
         }
+    }
+
+    js {
+        // Has no FileSystem implementation in Okio
+        // browser { configureTests() }
 
-        nodejs()
+        nodejs { configureTests() }
     }
 
     // Still experimental
     // Blocked by coroutines (issue: https://github.com/Kotlin/kotlinx.coroutines/issues/3713) and
     // Okio (issue: https://github.com/square/okio/issues/1203)
-    // wasm()
+    // wasmJs()
+    // wasmWasi()
 
     macosX64()
     macosArm64()
@@ -62,9 +63,10 @@ kotlin {
     // androidNativeX86()
     // androidNativeX64()
 
-    @Suppress("UNUSED_VARIABLE")
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
-        val commonMain by getting {
+        commonMain {
             dependencies {
                 implementation(project(":file-kache-okio-only"))
                 api(project(":file-kache-core"))
@@ -75,4 +77,4 @@ kotlin {
             }
         }
     }
-}
+}

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.8.21"
+kotlin = "1.9.21"
 
 dokka = "1.8.10"
 mavenPublish = "0.25.2"

internal-collections/build.gradle.kts

@@ -5,9 +5,6 @@ plugins {
 }
 
 kotlin {
-    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
-    targetHierarchy.default()
-
     jvm {
         compilations.configureEach {
             kotlinOptions.jvmTarget = "1.8"
@@ -16,16 +13,29 @@ kotlin {
         withJava()
     }
 
-    js(IR) {
-        browser()
-        nodejs()
+    fun org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl.configureTests() {
+        testTask {
+            useMocha {
+                timeout = "30s"
+            }
+        }
+    }
+
+    js {
+        browser { configureTests() }
+        nodejs { configureTests() }
+    }
+
+    @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
+    wasmJs {
+        browser { configureTests() }
+        nodejs { configureTests() }
+        d8 { configureTests() }
     }
 
     @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
-    wasm {
-        browser()
-        nodejs()
-        d8()
+    wasmWasi {
+        nodejs { configureTests() }
     }
 
     macosX64()
@@ -55,25 +65,26 @@ kotlin {
     androidNativeX86()
     androidNativeX64()
 
-    @Suppress("UNUSED_VARIABLE")
-    sourceSets {
-        val commonMain by getting
+    applyDefaultHierarchyTemplate()
 
+    sourceSets {
         val nativeAndWasmMain by creating {
-            dependsOn(commonMain)
+            dependsOn(commonMain.get())
         }
 
-        val nativeMain by getting {
-            dependsOn(nativeAndWasmMain)
-        }
+        nativeMain.get().dependsOn(nativeAndWasmMain)
 
-        val wasmMain by getting {
+        val wasmMain by creating {
             dependsOn(nativeAndWasmMain)
         }
+
+        // WASM source sets are not found in the predefined conventions
+        getByName("wasmJsMain").dependsOn(wasmMain)
+        getByName("wasmWasiMain").dependsOn(wasmMain)
     }
 }
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-}
+}