[Gradle, JS] Add compatible aliases for old tasks

#KT-32323 fixed
#KT-32283 fixed
This commit is contained in:
Ilya Goncharov
2019-10-28 14:15:15 +03:00
parent dc3f3ce80d
commit 6ecc7eab7e
3 changed files with 16 additions and 3 deletions
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.targets.js.subtargets
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Task
import org.gradle.api.tasks.TaskProvider
import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
@@ -85,7 +86,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val runTask = project.registerTask<KotlinWebpack>(
disambiguateCamelCased(
buildVariant.name,
"run"
RUN_TASK_NAME
)
) {
it.dependsOn(
@@ -132,6 +133,9 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
if (kind == BuildVariantKind.DEVELOPMENT) {
target.runTask.dependsOn(runTask)
project.registerTask<Task>(disambiguateCamelCased(RUN_TASK_NAME)) {
it.dependsOn(runTask)
}
}
}
}
@@ -152,7 +156,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
val webpackTask = project.registerTask<KotlinWebpack>(
disambiguateCamelCased(
buildVariant.name,
"webpack"
WEBPACK_TASK_NAME
)
) {
@@ -191,6 +195,9 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
if (kind == BuildVariantKind.PRODUCTION) {
project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(webpackTask)
project.registerTask<Task>(disambiguateCamelCased(WEBPACK_TASK_NAME)) {
it.dependsOn(webpackTask)
}
}
}
}
@@ -265,5 +272,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
const val PRODUCTION = "production"
const val DEVELOPMENT = "development"
private const val WEBPACK_TASK_NAME = "webpack"
}
}
@@ -131,4 +131,8 @@ abstract class KotlinJsSubTarget(
}
protected abstract fun configureMain(compilation: KotlinJsCompilation)
companion object {
const val RUN_TASK_NAME = "run"
}
}
@@ -35,7 +35,7 @@ open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) :
private fun configureRun(
compilation: KotlinJsCompilation
) {
val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased("run"))
val runTaskHolder = NodeJsExec.create(compilation, disambiguateCamelCased(RUN_TASK_NAME))
target.runTask.dependsOn(runTaskHolder)
}