From a3aa1f6121ad4fea25a250b9f2d13e6f6aed37f9 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 1 Aug 2023 17:18:12 +0200 Subject: [PATCH] [Gradle, Wasm] Add wasm wasi stdlib by default --- .../gradle/internal/stdlibDependencyManagement.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 30afcc698ff..fa4d02de6ff 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 @@ -23,6 +23,8 @@ import org.jetbrains.kotlin.gradle.plugin.sources.android.AndroidVariantType import org.jetbrains.kotlin.gradle.plugin.sources.android.androidSourceSetInfoOrNull import org.jetbrains.kotlin.gradle.plugin.sources.internal import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope +import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType +import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget import org.jetbrains.kotlin.gradle.targets.js.npm.SemVer import org.jetbrains.kotlin.gradle.utils.withType @@ -31,7 +33,9 @@ internal const val KOTLIN_STDLIB_MODULE_NAME = "kotlin-stdlib" internal const val KOTLIN_STDLIB_JDK7_MODULE_NAME = "kotlin-stdlib-jdk7" internal const val KOTLIN_STDLIB_JDK8_MODULE_NAME = "kotlin-stdlib-jdk8" internal const val KOTLIN_STDLIB_JS_MODULE_NAME = "kotlin-stdlib-js" -internal const val KOTLIN_STDLIB_WASM_MODULE_NAME = "kotlin-stdlib-wasm-js" +internal const val KOTLIN_STDLIB_WASM_JS_MODULE_NAME = "kotlin-stdlib-wasm-js" +internal const val KOTLIN_STDLIB_WASM_WASI_MODULE_NAME = "kotlin-stdlib-wasm-wasi" + internal const val KOTLIN_ANDROID_JVM_STDLIB_MODULE_NAME = KOTLIN_STDLIB_MODULE_NAME internal fun Project.configureStdlibDefaultDependency( @@ -208,7 +212,12 @@ internal fun KotlinPlatformType.stdlibPlatformType( } KotlinPlatformType.js -> if (isVersionWithGradleMetadata) KOTLIN_STDLIB_MODULE_NAME else KOTLIN_STDLIB_JS_MODULE_NAME - KotlinPlatformType.wasm -> KOTLIN_STDLIB_WASM_MODULE_NAME + KotlinPlatformType.wasm -> { + when ((kotlinTarget as KotlinJsIrTarget).wasmTargetType!!) { + KotlinWasmTargetType.JS -> KOTLIN_STDLIB_WASM_JS_MODULE_NAME + KotlinWasmTargetType.WASI -> KOTLIN_STDLIB_WASM_WASI_MODULE_NAME + } + } KotlinPlatformType.native -> null KotlinPlatformType.common -> // there's no platform compilation that the source set is default for if (isVersionWithGradleMetadata) KOTLIN_STDLIB_MODULE_NAME else KOTLIN_STDLIB_COMMON_MODULE_NAME