From 53a23169d95e2654dce07a81a6e9df6003f92353 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 21 Aug 2020 15:37:08 +0300 Subject: [PATCH] [Gradle, JS] Node js binaries executable filtering ^KT-41566 fixed --- .../kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt index 58273cbb07d..bbcdaabd070 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt @@ -33,7 +33,9 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) : override fun configureRun( compilation: KotlinJsIrCompilation ) { - compilation.binaries.getIrBinaries(KotlinJsBinaryMode.DEVELOPMENT) + compilation.binaries + .getIrBinaries(KotlinJsBinaryMode.DEVELOPMENT) + .matching { it is Executable } .all { developmentExecutable -> val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) { group = taskGroupName @@ -47,7 +49,9 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) : override fun configureBuild( compilation: KotlinJsIrCompilation ) { - compilation.binaries.getIrBinaries(KotlinJsBinaryMode.PRODUCTION) + compilation.binaries + .getIrBinaries(KotlinJsBinaryMode.PRODUCTION) + .matching { it is Executable } .all { productionExecutable -> project.tasks.named(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(productionExecutable.linkTask) }