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

Be consistent with using taskContributor everywhere.

Browse source
This commit is contained in:
Cedric Beust 2017-04-25 10:40:16 -07:00
parent ba6ab5592e
commit 5e12e028bd
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/TaskContributor.kt
View file

@ -44,6 +44,23 @@ class TaskContributor @Inject constructor(val incrementalManagerFactory: Increme
} }
} }
fun addTask(plugin: IPlugin, project: Project, taskName: String, description: String,
group: String = AnnotationDefault.GROUP,
dependsOn: List<String> = emptyList(),
reverseDependsOn : List<String> = emptyList(),
runBefore : List<String> = emptyList(),
runAfter : List<String> = emptyList(),
runTask: (Project) -> TaskResult) {
dynamicTasks.add(DynamicTask(plugin, taskName, description, group, project,
dependsOn = dependsOn,
reverseDependsOn = reverseDependsOn,
runBefore = runBefore,
runAfter = runAfter,
closure = { p: Project ->
runTask(project)
}))
}
fun addIncrementalVariantTasks(plugin: IPlugin, project: Project, context: KobaltContext, taskName: String, fun addIncrementalVariantTasks(plugin: IPlugin, project: Project, context: KobaltContext, taskName: String,
group: String = AnnotationDefault.GROUP, group: String = AnnotationDefault.GROUP,
dependsOn: List<String> = emptyList(), dependsOn: List<String> = emptyList(),

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

@ -57,16 +57,14 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigsActor<Applic
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", dependsOn = listOf("install"),
// runTask = { taskRun(project) })
configurationFor(project)?.let { configs -> configurationFor(project)?.let { configs ->
configs.forEach { config -> configs.forEach { config ->
taskManager.addTask(this, project, config.taskName, taskContributor.addTask(this, project, config.taskName,
description = "Run the class " + config.mainClass, description = "Run the class " + config.mainClass,
group = "run", group = "run",
dependsOn = listOf("install"), dependsOn = listOf("install"),
task = { run(project, context, config) }) runTask = { run(project, context, config) })
} }
} }
} }

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

@ -41,7 +41,6 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
const val PACKAGES = "packages" const val PACKAGES = "packages"
const val TASK_ASSEMBLE: String = "assemble" const val TASK_ASSEMBLE: String = "assemble"
const val TASK_INSTALL: String = "install"
} }
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
@ -59,11 +58,11 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
configurationFor(project)?.let { configs -> configurationFor(project)?.let { configs ->
configs.forEach { config -> configs.forEach { config ->
taskManager.addTask(this, project, config.taskName, taskContributor.addTask(this, project, config.taskName,
description = "Install to \"" + config.target + "\"", description = "Install to \"" + config.target + "\"",
group = "build", group = "build",
dependsOn = listOf(PackagingPlugin.TASK_ASSEMBLE), dependsOn = listOf(PackagingPlugin.TASK_ASSEMBLE),
task = { taskInstall(project, context, config) }) runTask = { taskInstall(project, context, config) })
taskContributor.addVariantTasks(this, project, context, "config.taskName", taskContributor.addVariantTasks(this, project, context, "config.taskName",
dependsOn = listOf("assemble"), dependsOn = listOf("assemble"),
runTask = { taskInstall(project, context, config) }) runTask = { taskInstall(project, context, config) })