From f4f95c0da70170567c8fc3476d762ae6f4c0e7be Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 19 May 2016 05:36:49 -0800
Subject: [PATCH] [GITHUB-205] Fix flavor tasks.

Fixes https://github.com/cbeust/kobalt/issues/205
---
 .../kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt  | 7 -------
 .../main/kotlin/com/beust/kobalt/internal/TaskManager.kt   | 5 -----
 .../com/beust/kobalt/plugin/packaging/PackagingPlugin.kt   | 2 +-
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index db4519c0..41de8408 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -162,13 +162,6 @@ open class JvmCompilerPlugin @Inject constructor(
     @IncrementalTask(name = JvmCompilerPlugin.TASK_COMPILE, description = "Compile the project", group = GROUP_BUILD,
             runAfter = arrayOf(TASK_CLEAN))
     fun taskCompile(project: Project): IncrementalTaskInfo {
-        // Generate the BuildConfig before invoking sourceDirectories() since that call
-        // might add the buildConfig source directories
-        val sourceDirectory = context.variant.maybeGenerateBuildConfig(project, context)
-        if (sourceDirectory != null) {
-            sourceDirectories.add(sourceDirectory)
-        }
-
         // Set up the source files now that we have the variant
         sourceDirectories.addAll(context.variant.sourceDirectories(project, context, SourceSet.of(isTest = false)))
 
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 bd117f8b..416c37d8 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
@@ -78,11 +78,6 @@ class TaskManager @Inject constructor(val args: Args,
             }.forEach {
                 put(it.name, it)
             }
-            dynamicTasks.filter {
-                it.plugin.accept(project)
-            }.forEach {
-                put(it.name, it)
-            }
         }
     }
 
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
index 1418e815..9aa2715d 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt
@@ -49,7 +49,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana
         super.apply(project, context)
         project.projectProperties.put(LIBS_DIR, KFiles.libsDir(project))
         taskContributor.addVariantTasks(this, project, context, "assemble", group = "build",
-                runAfter = listOf ("compile"),
+                dependsOn = listOf("compile"),
                 runTask = { doTaskAssemble(project) })
     }