From ca6527df3850a9a7dcb1fe788b6d0bf7fd905870 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Wed, 18 Nov 2015 17:36:54 -0800
Subject: [PATCH] Ordering: build type then product flavor.

---
 .../com/beust/kobalt/internal/JvmCompilerPlugin.kt    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index cb00879f..51c33780 100644
--- a/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -200,16 +200,17 @@ class Variant(val productFlavorName: String = "", val buildTypeName: String = ""
         if (isDefault) return sourceDirectories
         else {
             val result = arrayListOf<File>()
-            if (! productFlavorName.isBlank()) {
-                val dir = File(KFiles.joinDir("src", productFlavorName, project.projectInfo.sourceDirectory))
-                log(2, "Adding source for product flavor $productFlavorName: ${dir.path}")
-                result.add(dir)
-            }
+            // The ordering of files is: 1) build type 2) product flavor 3) default
             if (! buildTypeName.isBlank()) {
                 val dir = File(KFiles.joinDir("src", buildTypeName, project.projectInfo.sourceDirectory))
                 log(2, "Adding source for build type $buildTypeName: ${dir.path}")
                 result.add(dir)
             }
+            if (! productFlavorName.isBlank()) {
+                val dir = File(KFiles.joinDir("src", productFlavorName, project.projectInfo.sourceDirectory))
+                log(2, "Adding source for product flavor $productFlavorName: ${dir.path}")
+                result.add(dir)
+            }
             result.addAll(sourceDirectories)
             return result
         }