Update Kotlin to 1.9.21 (#493)

* Update Kotlin to 1.9.21
* Remove browser from js and wasmJs
* Update yarn.lock* Don't run WASM tests on Windows
  - WASM tests still need an alpha version of node, and those aren't available for Windows

Author: eygraber

.circleci/config.yml

@@ -97,7 +97,7 @@ jobs:
             gradle-{{ checksum ".circleci/gradle_cache_seed" }}-{{ checksum
             ".circleci/config.yml" }}-windows
       - run:
-          command: ./gradlew --no-daemon build
+          command: ./gradlew --no-daemon build -x wasmNodeTest
           shell: bash.exe
       - save_cache:
           paths:
@@ -132,4 +132,4 @@ workflows:
           context: opensource-maven
           filters:
             branches:
-              only: main
+              only: main

assertk/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.common
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.wasm
@@ -22,14 +23,23 @@ kotlin {
         withJava()
     }
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyDefaultHierarchyTemplate {
+        group("coroutines") {
+            withNative()
+            withJs()
+            withJvm()
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {
                 implementation(libs.opentest4k)
             }
             kotlin.srcDir(compileTemplates)
         }
-        val commonTest by getting {
+        commonTest {
             dependencies {
                 implementation(kotlin("test"))
             }
@@ -46,20 +56,11 @@ kotlin {
             }
         }
 
-        val coroutinesTest by creating {
-            dependsOn(commonTest)
+        val coroutinesTest by getting {
             dependencies {
                 implementation(libs.kotlinx.coroutines)
                 implementation(libs.kotlinx.coroutines.test)
             }
         }
     }
-
-    targets.configureEach {
-        if (platformType != common && platformType != wasm) {
-            compilations.getByName("test")
-                .defaultSourceSet
-                .dependsOn(sourceSets.getByName("coroutinesTest"))
-        }
-    }
 }

…/wasmMain/kotlin/assertk/PlatformName.kt …asmJsMain/kotlin/assertk/PlatformName.ktassertk/src/wasmMain/kotlin/assertk/PlatformName.kt renamed to assertk/src/wasmJsMain/kotlin/assertk/PlatformName.kt assertk/src/wasmMain/kotlin/assertk/PlatformName.kt renamed to assertk/src/wasmJsMain/kotlin/assertk/PlatformName.kt

@@ -1,8 +1,13 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import org.apache.tools.ant.taskdefs.condition.Os
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithTests
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
+import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 plugins {
     kotlin("multiplatform")
@@ -27,16 +32,6 @@ if (libs.versions.assertk.get().endsWith("SNAPSHOT")) {
     }
 }
 
-val nativeTargets = arrayOf(
-    "linuxX64", "linuxArm64",
-    "macosX64", "macosArm64",
-    "mingwX64",
-    "iosArm32", "iosArm64", "iosX64", "iosSimulatorArm64",
-    "tvosArm64", "tvosX64", "tvosSimulatorArm64",
-    "watchosArm32", "watchosArm64", "watchosX86", "watchosX64", "watchosSimulatorArm64", "watchosDeviceArm64",
-    "androidNativeArm32", "androidNativeArm64", "androidNativeX86", "androidNativeX64",
-)
-
 kotlin {
     jvm()
     js {
@@ -50,33 +45,32 @@ kotlin {
     }
     // TODO Remove conditional once coroutines ships a version with WASM target.
     if (project.path != ":assertk-coroutines") {
-        wasm {
+        @OptIn(ExperimentalWasmDsl::class)
+        wasmJs {
             nodejs()
         }
     }
 
-    for (target in nativeTargets) {
-        targets.add(presets.getByName(target).createTarget(target))
-    }
-
-    sourceSets {
-        val commonMain by getting
-        val commonTest by getting
-        val nativeMain = create("nativeMain") {
-            dependsOn(commonMain)
-        }
-        val nativeTest = create("nativeTest") {
-            dependsOn(commonTest)
-        }
-        for (sourceSet in nativeTargets) {
-            getByName("${sourceSet}Main") {
-                dependsOn(nativeMain)
-            }
-            getByName("${sourceSet}Test") {
-                dependsOn(nativeTest)
-            }
-        }
-    }
+    linuxX64()
+    linuxArm64()
+    macosX64()
+    macosArm64()
+    mingwX64()
+    iosArm64()
+    iosX64()
+    iosSimulatorArm64()
+    tvosArm64()
+    tvosX64()
+    tvosSimulatorArm64()
+    watchosArm32()
+    watchosArm64()
+    watchosX64()
+    watchosSimulatorArm64()
+    watchosDeviceArm64()
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX86()
+    androidNativeX64()
 }
 
 tasks.withType<KotlinJvmCompile> {
@@ -130,3 +124,21 @@ val detektTest by tasks.registering(Detekt::class) {
 val detekt by tasks.getting {
     dependsOn(detektMain, detektTest)
 }
+
+// Node doesn't publish alpha versions for windows
+if(!Os.isFamily(Os.FAMILY_WINDOWS)) {
+    rootProject.the<NodeJsRootExtension>().apply {
+        nodeVersion = "22.0.0-v8-canary20231127cbafc81f11"
+        nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
+    }
+}
+
+rootProject.tasks.withType<KotlinNpmInstallTask>().configureEach {
+    args.add("--ignore-engines")
+}
+
+tasks.withType<KotlinCompilationTask<*>>().configureEach {
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+}