From e831d33b825de17fe90ff99d99291fd7f8a7dfa0 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 10 Oct 2015 03:04:03 -0700 Subject: [PATCH] Reformat. --- src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt | 11 ----------- src/main/kotlin/com/beust/kobalt/api/Plugin.kt | 8 +++++--- .../kotlin/com/beust/kobalt/internal/DynamicGraph.kt | 6 +++++- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt b/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt index 1813068f..ce878347 100644 --- a/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/api/BasePlugin.kt @@ -15,15 +15,4 @@ abstract public class BasePlugin : Plugin { override var methodTasks = arrayListOf() override fun accept(project: Project) = true var plugins : Plugins by Delegates.notNull() - - /** - * Add a dynamic task. - */ - fun addTask(project: Project, name: String, description: String = "", - runBefore: List = arrayListOf(), - runAfter: List = arrayListOf(), - task: (Project) -> TaskResult) { - addGenericTask(project, name, description, runBefore, runAfter, task) - } - } diff --git a/src/main/kotlin/com/beust/kobalt/api/Plugin.kt b/src/main/kotlin/com/beust/kobalt/api/Plugin.kt index c6a635b1..5978b6ce 100644 --- a/src/main/kotlin/com/beust/kobalt/api/Plugin.kt +++ b/src/main/kotlin/com/beust/kobalt/api/Plugin.kt @@ -18,12 +18,14 @@ public interface Plugin { val methodTasks : ArrayList fun addStaticTask(annotation: Task, project: Project, task: (Project) -> TaskResult) { - addGenericTask(project, annotation.name, annotation.description, annotation.runBefore.toList(), + addTask(project, annotation.name, annotation.description, annotation.runBefore.toList(), annotation.runAfter.toList(), task) } - fun addGenericTask(project: Project, name: String, description: String, - runBefore: List, runAfter: List, task: (Project) -> TaskResult) { + fun addTask(project: Project, name: String, description: String = "", + runBefore: List = arrayListOf(), + runAfter: List = arrayListOf(), + task: (Project) -> TaskResult) { tasks.add( object : BasePluginTask(this, name, description, project) { override fun call(): TaskResult2 { diff --git a/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt b/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt index 081ddb97..4be2a7ae 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt @@ -59,7 +59,11 @@ public class DynamicGraphExecutor(val graph: DynamicGraph, log(2, "Received task result ${taskResult}") n-- graph.setStatus(taskResult.value, - if (taskResult.success) DynamicGraph.Status.FINISHED else DynamicGraph.Status.ERROR) + if (taskResult.success) { + DynamicGraph.Status.FINISHED + } else { + DynamicGraph.Status.ERROR + }) } catch(ex: TimeoutException) { log(2, "Time out") }