From 4e3d727da6fd398846c1112fff5609992659923e Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Wed, 10 Aug 2016 23:20:29 -0800
Subject: [PATCH] Task order fix.

---
 .../kotlin/com/beust/kobalt/internal/BaseProjectRunner.kt | 8 ++------
 .../main/kotlin/com/beust/kobalt/internal/TaskManager.kt  | 2 +-
 .../kotlin/com/beust/kobalt/internal/TaskManagerTest.kt   | 6 +++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BaseProjectRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BaseProjectRunner.kt
index 6374f4c1..c93d01b9 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BaseProjectRunner.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/BaseProjectRunner.kt
@@ -150,14 +150,10 @@ abstract class BaseProjectRunner {
                     //
                     passedTasks.map { it.taskName }.let { taskNames ->
                         runBefore[taskName].forEach { from ->
-                            if (taskNames.contains(from)) {
-                                addEdge(result, from, taskName, newToProcess, "runBefore")
-                            }
+                            addEdge(result, from, taskName, newToProcess, "runBefore")
                         }
                         runAfter[taskName].forEach { to ->
-                            if (taskNames.contains(to)) {
-                                addEdge(result, taskName, to, newToProcess, "runAfter")
-                            }
+                            addEdge(result, to, taskName, newToProcess, "runAfter")
                         }
                     }
                     seen.add(taskName)
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
index 3d0337fd..6cb88983 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt
@@ -46,7 +46,7 @@ class TaskManager @Inject constructor(val args: Args,
     /**
      * Ordering: task2 runs after task 1.
      */
-    fun runAfter(task1: String, task2: String) = runAfter.put(task2, task1)
+    fun runAfter(task1: String, task2: String) = runAfter.put(task1, task2)
 
     /**
      * Wrapper task: task2 runs after task 1.
diff --git a/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt b/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt
index 1342cd35..1b5bc41a 100644
--- a/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt
+++ b/src/test/kotlin/com/beust/kobalt/internal/TaskManagerTest.kt
@@ -126,7 +126,7 @@ class TaskManagerTest : BaseTest() {
                     put("compile", "clean")
                 },
                 runAfter = TreeMultimap.create<String, String>().apply {
-                    put("compile", "example")
+                    put("example", "compile")
                 }).let { runTasks ->
             assertThat(runTasks).isEqualTo(listOf("clean", "compile"))
         }
@@ -138,7 +138,7 @@ class TaskManagerTest : BaseTest() {
                 runBefore = TreeMultimap.create<String, String>().apply {
                     put("compile", "example")
                 }).let { runTasks ->
-            assertThat(runTasks).isEqualTo(listOf("clean", "compile"))
+            assertThat(runTasks).isEqualTo(listOf("clean", "compile", "example"))
         }
 
         runTasks(listOf("compile", "example"),
@@ -158,7 +158,7 @@ class TaskManagerTest : BaseTest() {
                 runAfter = TreeMultimap.create<String, String>().apply {
                     put("compile", "example")
                 }).let { runTasks ->
-            assertThat(runTasks).isEqualTo(listOf("clean", "example", "compile"))
+            assertThat(runTasks).isEqualTo(listOf("clean", "compile", "example"))
         }
     }