diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt index d511ad9921c..f9d3971f993 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt @@ -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( 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(disambiguateCamelCased(RUN_TASK_NAME)) { + it.dependsOn(runTask) + } } } } @@ -152,7 +156,7 @@ open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) : val webpackTask = project.registerTask( 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(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" } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt index 8c18b1af8a7..20a3e819c47 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt @@ -131,4 +131,8 @@ abstract class KotlinJsSubTarget( } protected abstract fun configureMain(compilation: KotlinJsCompilation) + + companion object { + const val RUN_TASK_NAME = "run" + } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt index d6b4a0de670..da807ef8192 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt @@ -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) }