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

[Gradle, JS] Distribution and distributeResources

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-04 11:58:19 +03:00
parent e302818e26
commit 60da37404e
1 changed files with 12 additions and 5 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
+12 -5
View File
@@ -155,9 +155,9 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val processResourcesTask = target.project.tasks.named(compilation.processResourcesTaskName) val processResourcesTask = target.project.tasks.named(compilation.processResourcesTaskName)
val distributionTask = project.registerTask<Copy>( val distributeResourcesTask = project.registerTask<Copy>(
disambiguateCamelCased( disambiguateCamelCased(
DISTRIBUTION_TASK_NAME DISTRIBUTE_RESOURCES_TASK_NAME
) )
) { ) {
it.dependsOn(processResourcesTask) it.dependsOn(processResourcesTask)
@@ -167,7 +167,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
} }
val assembleTask = project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME) val assembleTask = project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME)
assembleTask.dependsOn(distributionTask) assembleTask.dependsOn(distributeResourcesTask)
buildVariants.all { buildVariant -> buildVariants.all { buildVariant ->
val kind = buildVariant.kind val kind = buildVariant.kind
@@ -181,7 +181,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
it.dependsOn( it.dependsOn(
nodeJs.npmInstallTask, nodeJs.npmInstallTask,
processResourcesTask, processResourcesTask,
distributionTask distributeResourcesTask
) )
it.configureOptimization(kind) it.configureOptimization(kind)
@@ -212,9 +212,15 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
if (kind == BuildVariantKind.PRODUCTION) { if (kind == BuildVariantKind.PRODUCTION) {
assembleTask.dependsOn(webpackTask) assembleTask.dependsOn(webpackTask)
project.registerTask<Task>(disambiguateCamelCased(WEBPACK_TASK_NAME)) { val webpackCommonTask = project.registerTask<Task>(
disambiguateCamelCased(WEBPACK_TASK_NAME)
) {
it.dependsOn(webpackTask) it.dependsOn(webpackTask)
} }
project.registerTask<Task>(disambiguateCamelCased(DISTRIBUTION_TASK_NAME)) {
it.dependsOn(webpackCommonTask)
it.dependsOn(distributeResourcesTask)
}
} }
} }
} }
@@ -291,6 +297,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
const val DEVELOPMENT = "development" const val DEVELOPMENT = "development"
private const val WEBPACK_TASK_NAME = "webpack" private const val WEBPACK_TASK_NAME = "webpack"
private const val DISTRIBUTE_RESOURCES_TASK_NAME = "distributeResources"
private const val DISTRIBUTION_TASK_NAME = "distribution" private const val DISTRIBUTION_TASK_NAME = "distribution"
} }
} }