azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wasm] Port stdlib and kotlin.test build to wasm gradle plugin

Browse Source
This commit is contained in:
Igor Laevsky
2021-10-22 19:54:08 +03:00
parent 5a11446c79
commit cb10bd3a95
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/build.gradle.kts
+4 -4
View File
@@ -371,11 +371,11 @@ projectTest("wasmTest", true) {
include("org/jetbrains/kotlin/js/test/wasm/semantics/*") include("org/jetbrains/kotlin/js/test/wasm/semantics/*")
dependsOn(":kotlin-stdlib-wasm:compileKotlinJs") dependsOn(":kotlin-stdlib-wasm:compileKotlinWasm")
systemProperty("kotlin.wasm.stdlib.path", "libraries/stdlib/wasm/build/classes/kotlin/js/main") systemProperty("kotlin.wasm.stdlib.path", "libraries/stdlib/wasm/build/classes/kotlin/wasm/main")
dependsOn(":kotlin-test:kotlin-test-wasm:compileKotlinJs") dependsOn(":kotlin-test:kotlin-test-wasm:compileKotlinWasm")
systemProperty("kotlin.wasm.kotlin.test.path", "libraries/kotlin.test/wasm/build/classes/kotlin/js/main") systemProperty("kotlin.wasm.kotlin.test.path", "libraries/kotlin.test/wasm/build/classes/kotlin/wasm/main")
setUpBoxTests() setUpBoxTests()
} }
libraries/kotlin.test/build.gradle.kts
+2 -2
View File
@@ -263,7 +263,7 @@ val (wasmApi, wasmRuntime) = listOf("api", "runtime").map { usage ->
isCanBeResolved = false isCanBeResolved = false
attributes { attributes {
attribute(Usage.USAGE_ATTRIBUTE, objects.named("kotlin-$usage")) attribute(Usage.USAGE_ATTRIBUTE, objects.named("kotlin-$usage"))
attribute(KotlinPlatformType.attribute, KotlinPlatformType.js) attribute(KotlinPlatformType.attribute, KotlinPlatformType.wasm)
} }
} }
} }
@@ -274,7 +274,7 @@ dependencies {
} }
artifacts { artifacts {
val wasmJar = tasks.getByPath(":kotlin-test:kotlin-test-wasm:jsJar") val wasmJar = tasks.getByPath(":kotlin-test:kotlin-test-wasm:wasmJar")
add(wasmApi.name, wasmJar) add(wasmApi.name, wasmJar)
add(wasmRuntime.name, wasmJar) add(wasmRuntime.name, wasmJar)
} }
libraries/kotlin.test/wasm/build.gradle.kts
+3 -3
View File
@@ -18,7 +18,7 @@ val commonMainSources by task<Sync> {
} }
kotlin { kotlin {
js(IR) { wasm {
nodejs() nodejs()
} }
@@ -29,7 +29,7 @@ kotlin {
} }
kotlin.srcDir(commonMainSources.get().destinationDir) kotlin.srcDir(commonMainSources.get().destinationDir)
} }
val jsMain by getting { val wasmMain by getting {
dependencies { dependencies {
api(project(":kotlin-stdlib-wasm")) api(project(":kotlin-stdlib-wasm"))
} }
@@ -46,7 +46,7 @@ tasks.withType<KotlinCompile<*>>().configureEach {
) )
} }
tasks.named("compileKotlinJs") { tasks.named("compileKotlinWasm") {
(this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test" (this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test"
dependsOn(commonMainSources) dependsOn(commonMainSources)
} }
libraries/stdlib/wasm/build.gradle.kts
+4 -4
View File
@@ -54,11 +54,11 @@ val commonMainSources by task<Sync> {
} }
kotlin { kotlin {
js(IR) { wasm {
nodejs() nodejs()
} }
sourceSets { sourceSets {
val jsMain by getting { val wasmMain by getting {
kotlin.srcDirs("builtins", "internal", "runtime", "src", "stubs") kotlin.srcDirs("builtins", "internal", "runtime", "src", "stubs")
kotlin.srcDirs("../native-wasm/") kotlin.srcDirs("../native-wasm/")
kotlin.srcDirs(files(builtInsSources.map { it.destinationDir })) kotlin.srcDirs(files(builtInsSources.map { it.destinationDir }))
@@ -84,7 +84,7 @@ tasks.withType<KotlinCompile<*>>().configureEach {
) )
} }
tasks.named("compileKotlinJs") { tasks.named("compileKotlinWasm") {
(this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin" (this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin"
dependsOn(commonMainSources) dependsOn(commonMainSources)
dependsOn(builtInsSources) dependsOn(builtInsSources)
@@ -95,7 +95,7 @@ val apiElements by configurations.creating {}
publish { publish {
pom.packaging = "klib" pom.packaging = "klib"
artifact(tasks.named("jsJar")) { artifact(tasks.named("wasmJar")) {
extension = "klib" extension = "klib"
} }
} }