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

Gradle, js, npm: fix targets and compilation listener

Browse Source 
#KT-32293 Fixed
This commit is contained in:
Sergey Rostov
2019-08-06 11:53:13 +03:00
parent 87e80317a0
commit 1dc860f206
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt
+2 -2
View File
@@ -49,7 +49,7 @@ internal class KotlinProjectNpmResolver(
when (kotlin) { when (kotlin) {
is KotlinSingleTargetExtension -> addTargetListeners(kotlin.target) is KotlinSingleTargetExtension -> addTargetListeners(kotlin.target)
is KotlinMultiplatformExtension -> kotlin.targets.forEach { is KotlinMultiplatformExtension -> kotlin.targets.all {
addTargetListeners(it) addTargetListeners(it)
} }
else -> error("Unsupported kotlin model: $kotlin") else -> error("Unsupported kotlin model: $kotlin")
@@ -60,7 +60,7 @@ internal class KotlinProjectNpmResolver(
check(!closed) { resolver.alreadyResolvedMessage("add target $target") } check(!closed) { resolver.alreadyResolvedMessage("add target $target") }
if (target.platformType == KotlinPlatformType.js) { if (target.platformType == KotlinPlatformType.js) {
target.compilations.forEach { compilation -> target.compilations.all { compilation ->
if (compilation is KotlinJsCompilation) { if (compilation is KotlinJsCompilation) {
// compilation may be KotlinWithJavaTarget for old Kotlin2JsPlugin // compilation may be KotlinWithJavaTarget for old Kotlin2JsPlugin
addCompilation(compilation) addCompilation(compilation)