From 4238dc5a43b5b73392d9ed4d851d94050c7de04c Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 2 Jun 2023 13:40:59 +0300 Subject: [PATCH 1/3] kotlin 1.9.0-Beta --- gradle/libs.versions.toml | 4 ++-- .../space/kscience/gradle/KScienceExtension.kt | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3ff791e..5a49166 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.14.9-kotlin-1.8.20" -kotlin = "1.8.20" +tools = "0.14.9-kotlin-1.9.0-Beta" +kotlin = "1.9.0-Beta" atomicfu = "0.20.2" binary-compatibility-validator = "0.13.1" changelog = "2.0.0" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 9657003..d3b2bc9 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -425,7 +425,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro @OptIn(ExperimentalWasmDsl::class) public fun wasm(block: KotlinWasmTargetDsl.() -> Unit = {}) { - if(project.requestPropertyOrNull("kscience.wasm.disabled") == "true"){ + if (project.requestPropertyOrNull("kscience.wasm.disabled") == "true") { project.logger.warn("Wasm target is disabled with 'kscience.wasm.disabled' property") return } @@ -473,7 +473,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro binaries.executable() browser { webpackTask { - outputFileName = bundleName + mainOutputFileName.set(bundleName) } browserConfig() } @@ -560,6 +560,14 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro } configure(nativeTargets) { + + //TODO remove after https://youtrack.jetbrains.com/issue/KT-58837 + compilations.configureEach { + compilerOptions.configure { + freeCompilerArgs.add("-Xpartial-linkage=disable") + } + } + compilations["main"]?.apply { configure(kotlinSourceSets) { dependsOn(nativeMain) From 5463c9326b3d4e70c921b1a0a1a228788ad72b61 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 7 Jun 2023 15:14:13 +0300 Subject: [PATCH 2/3] Add gc to wasm --- gradle/libs.versions.toml | 2 +- .../space/kscience/gradle/KScienceExtension.kt | 2 +- .../kscience/gradle/KScienceProjectPlugin.kt | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a49166..257c55c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -tools = "0.14.9-kotlin-1.9.0-Beta" +tools = "0.14.9-kotlin-1.9.0-Beta-dev-3" kotlin = "1.9.0-Beta" atomicfu = "0.20.2" binary-compatibility-validator = "0.13.1" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index d3b2bc9..44dde80 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -437,7 +437,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro testTask { useKarma { this.webpackConfig.experiments.add("topLevelAwait") - useChromeHeadless() + useChromeHeadlessWasmGc() useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm")) } } diff --git a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt index 2b73d9e..4e1dda3 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt @@ -12,6 +12,9 @@ import org.jetbrains.changelog.ChangelogPlugin import org.jetbrains.changelog.ChangelogPluginExtension import org.jetbrains.dokka.gradle.AbstractDokkaTask import org.jetbrains.dokka.gradle.DokkaPlugin +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin +import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension import space.kscience.gradle.internal.* /** @@ -104,8 +107,8 @@ public open class KScienceProjectPlugin : Plugin { apply() apply() - allprojects{ - repositories{ + allprojects { + repositories { mavenCentral() maven("https://repo.kotlin.link") maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") @@ -250,9 +253,11 @@ public open class KScienceProjectPlugin : Plugin { } } - plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) { - rootProject.the().lockFileDirectory = - rootDir.resolve("gradle") + plugins.withType() { + rootProject.configure { + lockFileDirectory = rootDir.resolve("gradle") + yarnLockMismatchReport = YarnLockMismatchReport.WARNING + } } } From 8272c4ae4d1a788df9c87e5e3f33376f564592de Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Thu, 22 Jun 2023 20:28:21 +0300 Subject: [PATCH 3/3] 1.9.0-RC --- gradle/libs.versions.toml | 8 ++++---- .../kotlin/space/kscience/gradle/KScienceExtension.kt | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 257c55c..ce4862f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.14.9-kotlin-1.9.0-Beta-dev-3" -kotlin = "1.9.0-Beta" +tools = "0.14.9-kotlin-1.9.0-RC-dev-1" +kotlin = "1.9.0-RC" atomicfu = "0.20.2" binary-compatibility-validator = "0.13.1" changelog = "2.0.0" @@ -8,12 +8,12 @@ dokka = "1.8.10" kotlin-jupyter = "0.11.0-360" kotlinx-benchmark = "0.4.7" kotlinx-cli = "0.3.5" -kotlinx-coroutines = "1.7.0-RC" +kotlinx-coroutines = "1.7.1" kotlinx-datetime = "0.4.0" kotlinx-html = "0.8.0" kotlinx-knit = "0.4.0" kotlinx-nodejs = "0.0.7" -kotlinx-serialization = "1.5.0" +kotlinx-serialization = "1.5.1" ktor = "2.3.0" xmlutil = "0.86.0" yamlkt = "0.13.0" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index 44dde80..d317d9f 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -561,13 +561,6 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro configure(nativeTargets) { - //TODO remove after https://youtrack.jetbrains.com/issue/KT-58837 - compilations.configureEach { - compilerOptions.configure { - freeCompilerArgs.add("-Xpartial-linkage=disable") - } - } - compilations["main"]?.apply { configure(kotlinSourceSets) { dependsOn(nativeMain)