From 196907b2ef155bcfe628dcb6dd6dca71b67420b2 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 5 Feb 2020 17:55:30 +0300 Subject: [PATCH] [Gradle, JS] Compatibility with lower than 4.9 --- .../kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt | 2 +- .../org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt index cb9458499b5..8ea1d7348f0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt @@ -96,7 +96,7 @@ abstract class KotlinJsIrSubTarget( testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP testJs.description = testTaskDescription - testJs.inputFileProperty.set(compilation.developmentLinkTask.flatMap { it.outputFileProperty }) + testJs.inputFileProperty.set(compilation.developmentLinkTask.map { it.outputFileProperty.get() }) testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask) 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 b8af5ca26b7..a31f869f721 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 @@ -34,7 +34,7 @@ open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) : compilation: KotlinJsIrCompilation ) { val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME)) { - inputFileProperty.set(compilation.developmentLinkTask.flatMap { it.outputFileProperty }) + inputFileProperty.set(compilation.developmentLinkTask.map { it.outputFileProperty.get() }) } target.runTask.dependsOn(runTaskHolder) }