azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, Wasm] Not add target listeners for wasi projects

Browse Source 
^KT-66373 fixed
This commit is contained in:
Ilya Goncharov
2024-03-06 18:23:41 +00:00
committed by Space Team
parent 0bb6359ac5
commit 6fb6f04509
9 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
+8 -6
View File
@@ -12,10 +12,12 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinSingleTargetExtension
import org.jetbrains.kotlin.gradle.dsl.kotlinExtensionOrNull
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrCompilation
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
import org.jetbrains.kotlin.gradle.targets.js.npm.KotlinNpmResolutionManager
import org.jetbrains.kotlin.gradle.targets.js.npm.resolved.KotlinProjectNpmResolution
import org.jetbrains.kotlin.gradle.utils.withType
import java.io.Serializable
import kotlin.reflect.KClass
@@ -24,7 +26,7 @@ import kotlin.reflect.KClass
*/
class KotlinProjectNpmResolver(
project: Project,
var resolver: KotlinRootNpmResolver
var resolver: KotlinRootNpmResolver,
) : Serializable {
val projectPath by lazy { project.path }
@@ -52,19 +54,19 @@ class KotlinProjectNpmResolver(
?: error("NpmResolverPlugin should be applied after kotlin plugin")
when (kotlin) {
is KotlinSingleTargetExtension<*> -> addTargetListeners(kotlin.target)
is KotlinMultiplatformExtension -> kotlin.targets.all {
is KotlinSingleTargetExtension<*> -> addTargetListeners(kotlin.target as KotlinJsIrTarget)
is KotlinMultiplatformExtension -> kotlin.targets.withType<KotlinJsIrTarget>().configureEach {
addTargetListeners(it)
}
else -> error("Unsupported kotlin model: $kotlin")
}
}
private fun addTargetListeners(target: KotlinTarget) {
private fun addTargetListeners(target: KotlinJsIrTarget) {
check(resolution == null) { resolver.alreadyResolvedMessage("add target $target") }
if (target.platformType == KotlinPlatformType.js ||
target.platformType == KotlinPlatformType.wasm
target.platformType == KotlinPlatformType.wasm && target.wasmTargetType != KotlinWasmTargetType.WASI
) {
target.compilations.all { compilation ->
if (compilation is KotlinJsIrCompilation) {