From e27bd04ba20422b7bfd5af5e7616451ce7264f4d Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 2 Jun 2020 17:13:56 +0300 Subject: [PATCH] [Gradle, JS] Add dependency on dce task ^KT-32273 fixed ^KT-36451 fixed ^KT-37258 fixed --- .../kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.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/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index 5d4c269ab6f..8214908de5a 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 @@ -225,8 +225,6 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : contentBase = listOf(compilation.output.resourcesDir.canonicalPath) ) - outputs.upToDateWhen { false } - val actualDceTaskProvider = when (mode) { KotlinJsBinaryMode.PRODUCTION -> dceTaskProvider KotlinJsBinaryMode.DEVELOPMENT -> devDceTaskProvider @@ -239,6 +237,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : } ) + dependsOn(actualDceTaskProvider) + resolveFromModulesFirst = true commonRunConfigurations.forEach { configure ->