From cb10bd3a9542e733429e879710b93ff253d60856 Mon Sep 17 00:00:00 2001
From: Igor Laevsky <igor.laevsky@jetbrains.com>
Date: Fri, 22 Oct 2021 19:54:08 +0300
Subject: [PATCH] [Wasm] Port stdlib and kotlin.test build to wasm gradle
 plugin

---
 js/js.tests/build.gradle.kts                | 8 ++++----
 libraries/kotlin.test/build.gradle.kts      | 4 ++--
 libraries/kotlin.test/wasm/build.gradle.kts | 6 +++---
 libraries/stdlib/wasm/build.gradle.kts      | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index d7728295973..e40b694f38f 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -371,11 +371,11 @@ projectTest("wasmTest", true) {
 
     include("org/jetbrains/kotlin/js/test/wasm/semantics/*")
 
-    dependsOn(":kotlin-stdlib-wasm:compileKotlinJs")
-    systemProperty("kotlin.wasm.stdlib.path", "libraries/stdlib/wasm/build/classes/kotlin/js/main")
+    dependsOn(":kotlin-stdlib-wasm:compileKotlinWasm")
+    systemProperty("kotlin.wasm.stdlib.path", "libraries/stdlib/wasm/build/classes/kotlin/wasm/main")
 
-    dependsOn(":kotlin-test:kotlin-test-wasm:compileKotlinJs")
-    systemProperty("kotlin.wasm.kotlin.test.path", "libraries/kotlin.test/wasm/build/classes/kotlin/js/main")
+    dependsOn(":kotlin-test:kotlin-test-wasm:compileKotlinWasm")
+    systemProperty("kotlin.wasm.kotlin.test.path", "libraries/kotlin.test/wasm/build/classes/kotlin/wasm/main")
 
     setUpBoxTests()
 }
diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts
index e0f897a63dd..43787f016fd 100644
--- a/libraries/kotlin.test/build.gradle.kts
+++ b/libraries/kotlin.test/build.gradle.kts
@@ -263,7 +263,7 @@ val (wasmApi, wasmRuntime) = listOf("api", "runtime").map { usage ->
         isCanBeResolved = false
         attributes {
             attribute(Usage.USAGE_ATTRIBUTE, objects.named("kotlin-$usage"))
-            attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
+            attribute(KotlinPlatformType.attribute, KotlinPlatformType.wasm)
         }
     }
 }
@@ -274,7 +274,7 @@ dependencies {
 }
 
 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(wasmRuntime.name, wasmJar)
 }
diff --git a/libraries/kotlin.test/wasm/build.gradle.kts b/libraries/kotlin.test/wasm/build.gradle.kts
index 2a79b07f522..e6b89ef4b5e 100644
--- a/libraries/kotlin.test/wasm/build.gradle.kts
+++ b/libraries/kotlin.test/wasm/build.gradle.kts
@@ -18,7 +18,7 @@ val commonMainSources by task<Sync> {
 }
 
 kotlin {
-    js(IR) {
+    wasm {
         nodejs()
     }
 
@@ -29,7 +29,7 @@ kotlin {
             }
             kotlin.srcDir(commonMainSources.get().destinationDir)
         }
-        val jsMain by getting {
+        val wasmMain by getting {
             dependencies {
                 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"
     dependsOn(commonMainSources)
 }
diff --git a/libraries/stdlib/wasm/build.gradle.kts b/libraries/stdlib/wasm/build.gradle.kts
index 82d37c014e4..bf5ce4f7cc2 100644
--- a/libraries/stdlib/wasm/build.gradle.kts
+++ b/libraries/stdlib/wasm/build.gradle.kts
@@ -54,11 +54,11 @@ val commonMainSources by task<Sync> {
 }
 
 kotlin {
-    js(IR) {
+    wasm {
         nodejs()
     }
     sourceSets {
-        val jsMain by getting {
+        val wasmMain by getting {
             kotlin.srcDirs("builtins", "internal", "runtime", "src", "stubs")
             kotlin.srcDirs("../native-wasm/")
             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"
     dependsOn(commonMainSources)
     dependsOn(builtInsSources)
@@ -95,7 +95,7 @@ val apiElements by configurations.creating {}
 
 publish {
     pom.packaging = "klib"
-    artifact(tasks.named("jsJar")) {
+    artifact(tasks.named("wasmJar")) {
         extension = "klib"
     }
 }