erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

"install" variants didn't have their dependencies set.

Browse source
This commit is contained in:
Cedric Beust 2016-05-24 02:56:32 -08:00
parent 5a67b8b9b2
commit baa0e94904
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt
View file

@ -49,11 +49,11 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor<Applica
override fun apply(project: Project, context: KobaltContext) { override fun apply(project: Project, context: KobaltContext) {
super.apply(project, context) super.apply(project, context)
taskContributor.addVariantTasks(this, project, context, "run", group = "run", runAfter = listOf("install"), taskContributor.addVariantTasks(this, project, context, "run", group = "run", dependsOn = listOf("install"),
runTask = { taskRun(project) }) runTask = { taskRun(project) })
} }
@Task(name = "run", description = "Run the main class", dependsOn = arrayOf("install")) @Task(name = "run", description = "Run the main class", group = "run", dependsOn = arrayOf("install"))
fun taskRun(project: Project): TaskResult { fun taskRun(project: Project): TaskResult {
val runContributor = ActorUtils.selectAffinityActor(project, context, val runContributor = ActorUtils.selectAffinityActor(project, context,
context.pluginInfo.runnerContributors) context.pluginInfo.runnerContributors)

3
src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
View file

@ -53,6 +53,9 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
taskContributor.addVariantTasks(this, project, context, "assemble", group = "build", taskContributor.addVariantTasks(this, project, context, "assemble", group = "build",
dependsOn = listOf("compile"), dependsOn = listOf("compile"),
runTask = { doTaskAssemble(project) }) runTask = { doTaskAssemble(project) })
taskContributor.addVariantTasks(this, project, context, "install",
dependsOn = listOf("assemble"),
runTask = { taskInstall(project) })
} }
/** /**