azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Add dependency on dce task

Browse Source 
^KT-32273 fixed
^KT-36451 fixed
^KT-37258 fixed
This commit is contained in:
Ilya Goncharov
2020-06-02 17:13:56 +03:00
parent d3260bca27
commit e27bd04ba2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+2 -2
View File
@@ -225,8 +225,6 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
contentBase = listOf(compilation.output.resourcesDir.canonicalPath) contentBase = listOf(compilation.output.resourcesDir.canonicalPath)
) )
outputs.upToDateWhen { false }
val actualDceTaskProvider = when (mode) { val actualDceTaskProvider = when (mode) {
KotlinJsBinaryMode.PRODUCTION -> dceTaskProvider KotlinJsBinaryMode.PRODUCTION -> dceTaskProvider
KotlinJsBinaryMode.DEVELOPMENT -> devDceTaskProvider KotlinJsBinaryMode.DEVELOPMENT -> devDceTaskProvider
@@ -239,6 +237,8 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
} }
) )
dependsOn(actualDceTaskProvider)
resolveFromModulesFirst = true resolveFromModulesFirst = true
commonRunConfigurations.forEach { configure -> commonRunConfigurations.forEach { configure ->