From 4de2f7ef2710bccb149fb8c71942e8aa84c11aac Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Tue, 30 Jan 2024 10:57:26 +0100 Subject: [PATCH] [Gradle] Fix warnings in KotlinRootNpmResolver ^KT-56904 In Progress --- .../js/npm/resolver/KotlinRootNpmResolver.kt | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt index 383b919ae34..2f4f920622e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinRootNpmResolver.kt @@ -59,7 +59,6 @@ class KotlinRootNpmResolver internal constructor( var containsWasmJs = false var containsWasmWasi = false var containsIrJs = false - var containsLegacyJs = false val errorMessage = "Cannot resolve project dependency $src -> $target." + "Dependency to project with multiple js/wasm compilations is not supported yet." @@ -68,31 +67,23 @@ class KotlinRootNpmResolver internal constructor( check(mainCompilations.size <= maxMainCompilationsCount) { errorMessage } for (npmResolver in mainCompilations) { - when (val compilation = npmResolver.compilation) { - is KotlinJsIrCompilation -> { - if (compilation.platformType == KotlinPlatformType.wasm) { - val jsTarget = compilation.target as KotlinJsIrTarget - if (jsTarget.wasmTargetType == KotlinWasmTargetType.JS) { - check(!containsWasmJs) { errorMessage } - containsWasmJs = true - } - if (jsTarget.wasmTargetType == KotlinWasmTargetType.WASI) { - check(!containsWasmWasi) { errorMessage } - containsWasmWasi = true - } - } else { - check(!containsIrJs) { errorMessage } - containsIrJs = true - } + val compilation = npmResolver.compilation + if (compilation.platformType == KotlinPlatformType.wasm) { + val jsTarget = compilation.target as KotlinJsIrTarget + if (jsTarget.wasmTargetType == KotlinWasmTargetType.JS) { + check(!containsWasmJs) { errorMessage } + containsWasmJs = true } - - else -> { - check(!containsLegacyJs) { errorMessage } - containsLegacyJs = true + if (jsTarget.wasmTargetType == KotlinWasmTargetType.WASI) { + check(!containsWasmWasi) { errorMessage } + containsWasmWasi = true } + } else { + check(!containsIrJs) { errorMessage } + containsIrJs = true } } - check(containsWasmJs || containsWasmWasi || containsIrJs || containsLegacyJs) { errorMessage } + check(containsWasmJs || containsWasmWasi || containsIrJs) { errorMessage } return mainCompilations }