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

[Gradle, JS] Depends on according to Task Configuration Avoidance

Browse Source
This commit is contained in:
Ilya Goncharov
2019-10-18 13:15:45 +03:00
parent d2727e2f25
commit 2ffd8bed48
1 changed files with 10 additions and 4 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
+10 -4
View File
@@ -73,7 +73,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
buildVariants.all { buildVariant -> buildVariants.all { buildVariant ->
val kind = buildVariant.kind val kind = buildVariant.kind
project.registerTask<KotlinWebpack>( val runTask = project.registerTask<KotlinWebpack>(
disambiguateCamelCased( disambiguateCamelCased(
lowerCamelCaseName( lowerCamelCaseName(
buildVariant.name, buildVariant.name,
@@ -110,10 +110,13 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
} }
BuildVariantKind.DEBUG -> { BuildVariantKind.DEBUG -> {
it.dependsOn(compileKotlinTask) it.dependsOn(compileKotlinTask)
target.runTask.dependsOn(it)
} }
} }
} }
if (kind == BuildVariantKind.DEBUG) {
target.runTask.dependsOn(runTask)
}
} }
} }
@@ -129,7 +132,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
buildVariants.all { buildVariant -> buildVariants.all { buildVariant ->
val kind = buildVariant.kind val kind = buildVariant.kind
project.registerTask<KotlinWebpack>( val webpackTask = project.registerTask<KotlinWebpack>(
disambiguateCamelCased( disambiguateCamelCased(
lowerCamelCaseName( lowerCamelCaseName(
buildVariant.name, buildVariant.name,
@@ -154,13 +157,16 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
} }
it.resolveFromModulesFirst = true it.resolveFromModulesFirst = true
it.dependsOn(dceTaskProvider) it.dependsOn(dceTaskProvider)
project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(it)
} }
BuildVariantKind.DEBUG -> { BuildVariantKind.DEBUG -> {
it.dependsOn(compileKotlinTask) it.dependsOn(compileKotlinTask)
} }
} }
} }
if (kind == BuildVariantKind.RELEASE) {
project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(webpackTask)
}
} }
} }