From 73e8fc6183ac868e22fd18a35fc4b8d32cf5353f Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Sun, 30 Jul 2023 13:15:27 +0200
Subject: [PATCH] [Gradle] Always add kotlin-stdlib-wasm

Published kotlin-stdlib with Gradle metadata does not yet include
kotlin-stdlib-wasm variant, so KGP should always add it separately even
if kotlin-stdlib was added into a common source set.

^KT-59000
---
 .../kotlin/gradle/KotlinSpecificDependenciesIT.kt   | 13 +++++++++++++
 .../gradle/internal/stdlibDependencyManagement.kt   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
index 01f0ce4280c..9e423c5c252 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
@@ -280,6 +280,19 @@ class KotlinSpecificDependenciesIT : KGPBaseTest() {
         }
     }
 
+    @JsGradlePluginTests
+    @DisplayName("Stdlib should be added into wasm compilations")
+    @GradleTest
+    fun testStdlibAddedIntoWasmCompilationDependencies(gradleVersion: GradleVersion) {
+        project("wasm-d8-simple-project", gradleVersion) {
+            checkTaskCompileClasspath(
+                "compileKotlinWasmJs",
+                listOf("kotlin-stdlib-wasm"),
+                isBuildGradleKts = true
+            )
+        }
+    }
+
     @JvmGradlePluginTests
     @DisplayName("KT-41642: adding stdlib should not resolve dependencies eagerly")
     @GradleTest
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt
index bb77b1d414a..1488f372078 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/stdlibDependencyManagement.kt
@@ -140,7 +140,7 @@ private fun KotlinTarget.addStdlibDependency(
                 // except standalone compilations which as not using 'common'
                 if (isMppProject &&
                     stdlibVersion >= kotlin1920Version &&
-                    compilation.platformType != KotlinPlatformType.common &&
+                    (compilation.platformType != KotlinPlatformType.common && compilation.platformType != KotlinPlatformType.wasm) &&
                     kotlinSourceSet.hasDependencyOnCommon()
                 ) return@withDependencies