From 4238dc5a43b5b73392d9ed4d851d94050c7de04c Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 2 Jun 2023 13:40:59 +0300 Subject: [PATCH] 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)