Merge branch 'refs/heads/master' into fix_input_autocomplete

Kotlin · May 27, 2024 · 1abae63 · 1abae63
2 parents 761ac2e + a502c9f
commit 1abae63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 target
 build
 .gradle
+.kotlin
 *~
 *.versionsBackup
 **/karma/node_modules

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
  * -PversionTag - works together with "branch-build" profile and overrides "-SNAPSHOT" suffix of the version.
  */
 plugins {
-    kotlin("multiplatform") version "1.9.22"
+    kotlin("multiplatform") version "2.0.0"
     id("maven-publish")
     id("signing")
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
@@ -131,8 +131,7 @@ kotlin {
         common {
             group("jsCommon") {
                 withJs()
-                // TODO: switch to `withWasmJs()` after upgrade to Kotlin 2.0
-                withWasm()
+                withWasmJs()
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     target
     build
     .gradle
+    .kotlin
     *~
     *.versionsBackup
     **/karma/node_modules
@@ Expand Down @@