From dba45860f79f91fed3289c2267d614945bb87f54 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 31 Oct 2023 13:59:09 +0300 Subject: [PATCH] Finalization for 1.9.20 --- gradle/libs.versions.toml | 6 +++--- src/main/kotlin/space/kscience/gradle/KScienceExtension.kt | 6 ++---- src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 909d837..754f7d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.15.0-kotlin-1.9.20-RC2" -kotlin = "1.9.20-RC2" +tools = "0.15.0-kotlin-1.9.20" +kotlin = "1.9.20" # https://github.com/Kotlin/kotlinx-atomicfu atomicfu = "0.22.0" # https://github.com/Kotlin/binary-compatibility-validator @@ -10,7 +10,7 @@ changelog = "2.2.0" # https://github.com/Kotlin/dokka dokka = "1.9.10" # https://github.com/Kotlin/kotlin-jupyter -kotlin-jupyter = "0.12.0-78" +kotlin-jupyter = "0.12.0-81" # https://github.com/Kotlin/kotlinx-benchmark kotlinx-benchmark = "0.4.9" # https://github.com/Kotlin/kotlinx-cli diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index db82c59..8a61f45 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -432,9 +432,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro browser { testTask { useKarma { - webpackConfig.experiments.add("topLevelAwait") - useChromeHeadlessWasmGc() - useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm")) + useChromeCanaryHeadless() } } } @@ -443,7 +441,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro sourceSets { getByName("wasmJsTest") { dependencies { - implementation(kotlin("test")) + implementation(kotlin("test-wasm-js")) } } } diff --git a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt index 72858c1..97d8d58 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt @@ -32,7 +32,7 @@ public open class KScienceMPPlugin : Plugin { } getByName("commonTest") { dependencies { - implementation(kotlin("test-common")) + implementation(kotlin("test")) implementation(kotlin("test-annotations-common")) } }