From 1dc860f2069aab09f505e548860cb22009d8f142 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 6 Aug 2019 11:53:13 +0300 Subject: [PATCH] Gradle, js, npm: fix targets and compilation listener #KT-32293 Fixed --- .../targets/js/npm/resolver/KotlinProjectNpmResolver.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt index a65d6a91c50..d3d5465a23c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinProjectNpmResolver.kt @@ -49,7 +49,7 @@ internal class KotlinProjectNpmResolver( when (kotlin) { is KotlinSingleTargetExtension -> addTargetListeners(kotlin.target) - is KotlinMultiplatformExtension -> kotlin.targets.forEach { + is KotlinMultiplatformExtension -> kotlin.targets.all { addTargetListeners(it) } else -> error("Unsupported kotlin model: $kotlin") @@ -60,7 +60,7 @@ internal class KotlinProjectNpmResolver( check(!closed) { resolver.alreadyResolvedMessage("add target $target") } if (target.platformType == KotlinPlatformType.js) { - target.compilations.forEach { compilation -> + target.compilations.all { compilation -> if (compilation is KotlinJsCompilation) { // compilation may be KotlinWithJavaTarget for old Kotlin2JsPlugin addCompilation(compilation)