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

[Gradle] Fix warnings in KotlinRootNpmResolver

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Alexander.Likhachev
2024-01-30 10:57:26 +01:00
committed by Space Team
parent e159524c43
commit 4de2f7ef27
1 changed files with 13 additions and 22 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/KotlinRootNpmResolver.kt
+13 -22
View File
@@ -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
}