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

[Gradle, JS] Distribution and distribute task for KotlinBrowserJsIr.kt

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-07 14:54:14 +03:00
parent bbb98f9168
commit e53fd1b582
1 changed files with 15 additions and 9 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/ir/KotlinBrowserJsIr.kt
+15 -9
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Devtool import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Devtool
import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig.Mode
import org.jetbrains.kotlin.gradle.tasks.registerTask import org.jetbrains.kotlin.gradle.tasks.registerTask
import org.slf4j.LoggerFactory
import javax.inject.Inject import javax.inject.Inject
open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) : open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
@@ -97,8 +96,8 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
it.compilation = compilation it.compilation = compilation
it.entry = getByKind( it.entry = getByKind(
kind, kind,
compilation.productionLinkTask.map {it.outputFile}, compilation.productionLinkTask.map { it.outputFile },
compilation.developmentLinkTask.map{it.outputFile} compilation.developmentLinkTask.map { it.outputFile }
).get() ).get()
it.description = "start ${kind.name.toLowerCase()} webpack dev server" it.description = "start ${kind.name.toLowerCase()} webpack dev server"
@@ -134,13 +133,15 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName) val baseDist = project.buildDir.resolve(basePluginConvention!!.distsDirName)
distribution.directory = distribution.directory ?: baseDist distribution.directory = distribution.directory ?: baseDist
val distributionTask = project.registerTask<Copy>( val processResourcesTask = target.project.tasks.named(compilation.processResourcesTaskName)
val distributeResourcesTask = project.registerTask<Copy>(
disambiguateCamelCased( disambiguateCamelCased(
DISTRIBUTION_TASK_NAME DISTRIBUTE_RESOURCES_TASK_NAME
) )
) { ) {
it.dependsOn( it.dependsOn(
target.project.tasks.getByName(compilation.processResourcesTaskName) processResourcesTask
) )
it.from(compilation.output.resourcesDir) it.from(compilation.output.resourcesDir)
@@ -148,7 +149,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
} }
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
@@ -165,7 +166,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
compilation.productionLinkTask, compilation.productionLinkTask,
compilation.developmentLinkTask compilation.developmentLinkTask
), ),
distributionTask distributeResourcesTask
) )
it.configureOptimization(kind) it.configureOptimization(kind)
@@ -186,9 +187,13 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
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)
}
} }
} }
} }
@@ -240,6 +245,7 @@ open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
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"
} }
} }