From 9bbb9fe09d2065dfc1900a56296a5120c56dae60 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 20 Feb 2016 12:46:47 -0800 Subject: [PATCH] Fix source bug. --- .../src/main/kotlin/com/beust/kobalt/Variant.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt index 2469dbb1..e2ff55ca 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt @@ -68,14 +68,12 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null, private fun sourceDirectories(project: Project, suffix: String, variantFirst: Boolean, sourceSet: SourceSet) : List { val result = arrayListOf() - val sourceDirectories = - if (sourceSet == SourceSet.MAIN) { - project.sourceDirectories.map { File(it) }.filter { it.exists() } - } else if (sourceSet == SourceSet.TEST){ - project.sourceDirectoriesTest.map { File(it) }.filter { it.exists() } - } else { - throw KobaltException("Unknown source set: $sourceSet") - } + val sourceDirectories = (if (sourceSet == SourceSet.MAIN) project.sourceDirectories + else if (sourceSet == SourceSet.TEST) project.sourceDirectoriesTest + else throw KobaltException("Unknown source set: $sourceSet")) + .filter { File(project.directory, it).exists() } + .map { File(it) } + if (isDefault) { result.addAll(sourceDirectories) } else {