Gradle, js, run: fix run dependencies on browserRun and nodeRun

This commit is contained in:
Sergey Rostov
2019-05-15 12:38:16 +03:00
parent 156d50646d
commit 2a2f59ae1c
2 changed files with 5 additions and 4 deletions
@@ -50,7 +50,7 @@ class KotlinBrowserJs(target: KotlinJsTarget) :
project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME).dependsOn(it)
}
project.createOrRegisterTask<KotlinWebpack>(disambiguateCamelCased("run")) {
val run = project.createOrRegisterTask<KotlinWebpack>(disambiguateCamelCased("run")) {
val compileKotlinTask = compilation.compileKotlinTask
it.dependsOn(
target.npmResolveTaskHolder.getTaskOrProvider(),
@@ -67,7 +67,8 @@ class KotlinBrowserJs(target: KotlinJsTarget) :
)
it.outputs.upToDateWhen { false }
target.runTask.dependsOn(it)
}
target.runTask.dependsOn(run.getTaskOrProvider())
}
}
@@ -36,11 +36,11 @@ class KotlinNodeJs(target: KotlinJsTarget) :
val npmProject = project.npmProject
runTask.args(npmProject.compileOutput(compileKotlinTask))
target.runTask.dependsOn(runTask)
}
addSourceMapSupport(compilation, runTaskHolder, project)
target.runTask.dependsOn(runTaskHolder.getTaskOrProvider())
}
private fun addSourceMapSupport(