kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

0.15.8-kotlin-2.1.0 #51

Merged
altavir merged 54 commits from dev into master 2024-12-09 09:49:38 +03:00
Conversation 0 Commits 54 Files Changed 16 +12 -4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4238dc5a43 - Show all commits

4
gradle/libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions] [versions]
tools = "0.14.9-kotlin-1.8.20" tools = "0.14.9-kotlin-1.9.0-Beta"
kotlin = "1.8.20" kotlin = "1.9.0-Beta"
atomicfu = "0.20.2" atomicfu = "0.20.2"
binary-compatibility-validator = "0.13.1" binary-compatibility-validator = "0.13.1"
changelog = "2.0.0" changelog = "2.0.0"

12
src/main/kotlin/space/kscience/gradle/KScienceExtension.kt
View File

@ -425,7 +425,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
@OptIn(ExperimentalWasmDsl::class) @OptIn(ExperimentalWasmDsl::class)
public fun wasm(block: KotlinWasmTargetDsl.() -> Unit = {}) { 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") project.logger.warn("Wasm target is disabled with 'kscience.wasm.disabled' property")
return return
} }
@ -473,7 +473,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
binaries.executable() binaries.executable()
browser { browser {
webpackTask { webpackTask {
outputFileName = bundleName mainOutputFileName.set(bundleName)
} }
browserConfig() browserConfig()
} }
@ -560,6 +560,14 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
} }
configure(nativeTargets) { configure(nativeTargets) {
//TODO remove after https://youtrack.jetbrains.com/issue/KT-58837
compilations.configureEach {
compilerOptions.configure {
freeCompilerArgs.add("-Xpartial-linkage=disable")
}
}
compilations["main"]?.apply { compilations["main"]?.apply {
configure(kotlinSourceSets) { configure(kotlinSourceSets) {
dependsOn(nativeMain) dependsOn(nativeMain)