erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-29 17:38:12 -07:00
Code Releases Activity

Fix Variant bug.

Browse source
This commit is contained in:
Cedric Beust 2016-05-23 21:26:17 -08:00
parent f60ab09594
commit 49041faa98
11 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Variant.kt
View file

@ -30,11 +30,11 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
* for {internal, release}, return [internalRelease, internal, release]
*/
fun allDirectories(project: Project): List<String> {
val result = arrayListOf<String>()
result.add(toCamelcaseDir())
if (productFlavor != null) result.add(productFlavor.name)
if (buildType != null) result.add(buildType.name)
return result
return arrayListOf<String>().apply {
add(toCamelcaseDir())
add(productFlavor.name)
add(buildType.name)
}
}
fun sourceDirectories(project: Project, context: KobaltContext, sourceSet: SourceSet) : List<File> {
@ -187,9 +187,10 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
override fun toString() = toTask("")
companion object {
val DEFAULT_PRODUCT_FLAVOR = ProductFlavorConfig(null, "")
val DEFAULT_BUILD_TYPE = BuildTypeConfig(null, "")
val DEFAULT_PRODUCT_FLAVOR = ProductFlavorConfig("")
val DEFAULT_BUILD_TYPE = BuildTypeConfig("")
fun allVariants(project: Project): List<Variant> {
val result = arrayListOf<Variant>()