From db86076864f09b0d4aefac7adb159657c37daf21 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 10 Feb 2020 17:19:59 +0300 Subject: [PATCH] [Gradle, JS] Remove redundant dependsOn - in CopySpec if task in from, dependsOn is automatically set --- .../kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt | 6 +----- .../kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt index d68d3794c35..12688680038 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt @@ -140,11 +140,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : DISTRIBUTE_RESOURCES_TASK_NAME ) ) { - it.dependsOn( - processResourcesTask - ) - - it.from(compilation.output.resourcesDir) + it.from(processResourcesTask) it.into(distribution.directory ?: baseDist) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 98078647dfe..26c7dfe3c24 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -169,9 +169,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : DISTRIBUTE_RESOURCES_TASK_NAME ) ) { - it.dependsOn(processResourcesTask) - - it.from(compilation.output.resourcesDir) + it.from(processResourcesTask) it.into(distribution.directory ?: baseDist) }