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

Ordering: build type then product flavor.

Browse source
This commit is contained in:
Cedric Beust 2015-11-18 17:36:54 -08:00
parent 6d605f3100
commit ca6527df38
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -200,16 +200,17 @@ class Variant(val productFlavorName: String = "", val buildTypeName: String = ""
if (isDefault) return sourceDirectories if (isDefault) return sourceDirectories
else { else {
val result = arrayListOf<File>() val result = arrayListOf<File>()
if (! productFlavorName.isBlank()) { // The ordering of files is: 1) build type 2) product flavor 3) default
val dir = File(KFiles.joinDir("src", productFlavorName, project.projectInfo.sourceDirectory))
log(2, "Adding source for product flavor $productFlavorName: ${dir.path}")
result.add(dir)
}
if (! buildTypeName.isBlank()) { if (! buildTypeName.isBlank()) {
val dir = File(KFiles.joinDir("src", buildTypeName, project.projectInfo.sourceDirectory)) val dir = File(KFiles.joinDir("src", buildTypeName, project.projectInfo.sourceDirectory))
log(2, "Adding source for build type $buildTypeName: ${dir.path}") log(2, "Adding source for build type $buildTypeName: ${dir.path}")
result.add(dir) 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) result.addAll(sourceDirectories)
return result return result
} }