From ba024d8f507cf2e380572fe324955976fb836bf1 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 8 Dec 2015 15:46:28 -0800 Subject: [PATCH] Restore variant dirs. --- src/main/kotlin/com/beust/kobalt/Variant.kt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/Variant.kt b/src/main/kotlin/com/beust/kobalt/Variant.kt index 9d903527..fe5a5442 100644 --- a/src/main/kotlin/com/beust/kobalt/Variant.kt +++ b/src/main/kotlin/com/beust/kobalt/Variant.kt @@ -56,16 +56,16 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null, }) // // The ordering of files is: 1) build type 2) product flavor 3) default -// buildType.let { -// val dir = File(KFiles.joinDir("src", it.name, project.projectInfo.sourceDirectory)) -// log(2, "Adding source for build type ${it.name}: ${dir.path}") -// result.add(dir) -// } -// productFlavor.let { -// val dir = File(KFiles.joinDir("src", it.name, project.projectInfo.sourceDirectory)) -// log(2, "Adding source for product flavor ${it.name}: ${dir.path}") -// result.add(dir) -// } + buildType.let { + val dir = File(KFiles.joinDir("src", it.name, project.projectInfo.sourceDirectory)) + log(2, "Adding source for build type ${it.name}: ${dir.path}") + result.add(dir) + } + productFlavor.let { + val dir = File(KFiles.joinDir("src", it.name, project.projectInfo.sourceDirectory)) + log(2, "Adding source for product flavor ${it.name}: ${dir.path}") + result.add(dir) + } // Now that all the variant source directories have been added, add the project's default ones result.addAll(sourceDirectories)