Use 2.1.20-Beta2 to use common webMain for both JS and WasmJS

Author: Artem.Kobzar

build.gradle.kts

@@ -1,9 +1,7 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon
+@file:OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
 
 plugins {
-    kotlin("multiplatform") version "2.1.10"
+    kotlin("multiplatform") version "2.2.20-Beta2"
     `maven-publish`
     signing
 }
@@ -28,7 +26,6 @@ afterEvaluate {
 
 repositories {
     mavenCentral()
-    mavenLocal()
 }
 
 val artifactId = "kotlinx-browser"
@@ -42,43 +39,26 @@ if (!versionSuffix.isNullOrBlank()) {
 }
 
 kotlin {
-    js()
+    compilerOptions {
+        optIn.add("kotlin.js.ExperimentalWasmJsInterop")
+    }
+
+    js {
+        nodejs()
+    }
 
-    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         nodejs()
     }
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         val commonMain by getting
-        val commonTest by getting
-        val browserMain by creating {
-            dependsOn(commonMain)
-        }
-        val browserTest by creating {
-            dependsOn(commonTest)
+        val webTest by getting {
             dependencies {
                 implementation(kotlin("test"))
             }
         }
-        val jsMain by getting {
-            dependsOn(browserMain)
-            dependencies {
-                implementation(kotlin("wasm-js-interop", "0.0.1-SNAPSHOT"))
-            }
-        }
-        val jsTest by getting {
-            dependsOn(browserTest)
-        }
-        val wasmJsMain by getting {
-            dependsOn(browserMain)
-        }
-        val wasmJsTest by getting {
-            dependsOn(browserTest)
-        }
     }
-}
-
-tasks.withType<KotlinCompileCommon>().configureEach {
-    enabled = false
 }

generator/src/main/kotlin/dukat/launchBrowser.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.tools.dukat.wasm.translateIdlToSourceSet
 import java.io.File
 
 fun main() {
-    val outputDirectory = "../src/browserMain/kotlin/org.w3c/"
+    val outputDirectory = "../src/webMain/kotlin/org.w3c/"
     val input = "../idl/org.w3c.dom.idl"
 
     val sourceSet = translateIdlToSourceSet(input)

generator/src/main/kotlin/helpers/generate.kt

@@ -26,7 +26,7 @@ fun generatePublicStdlibFunctions() {
         Conversion("Double", "Float64")
     )
 
-    FileWriter(File("../src/browserMain/kotlin/arrayCopy.kt")).use { writer: FileWriter ->
+    FileWriter(File("../src/webMain/kotlin/arrayCopy.kt")).use { writer: FileWriter ->
         with(writer) {
             appendLine(getHeader(seeDetailsAt = "generator/src/main/kotlin/helpers/generate.kt"))
             appendLine("package org.khronos.webgl")
@@ -148,7 +148,7 @@ private fun FileWriter.appendWasmConversionsForType(
 }
 
 fun generateTests() {
-    FileWriter(File("../src/browserTest/kotlin/arrayCopyTest.kt")).use { writer: FileWriter ->
+    FileWriter(File("../src/webtest/kotlin/arrayCopyTest.kt")).use { writer: FileWriter ->
         with(writer) {
             appendLine(getHeader(seeDetailsAt = "generator/src/main/kotlin/helpers/generate.kt"))
 

settings.gradle.kts

@@ -3,7 +3,7 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        kotlin("multiplatform").version("2.1.10")
+        kotlin("multiplatform").version("2.2.20-Beta2")
     }
 }
 

src/browserMain/kotlin/arrayCopy.kt src/webMain/kotlin/arrayCopy.ktsrc/browserMain/kotlin/arrayCopy.kt renamed to src/webMain/kotlin/arrayCopy.kt

@@ -5,6 +5,8 @@
 
 package org.w3c.dom
 
+import kotlin.js.JsAny
+
 public external interface ItemArrayLike<out T : JsAny?> : JsAny {
     public val length: Int
     public fun item(index: Int): T?