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 variants.

Browse source
This commit is contained in:
Cedric Beust 2016-02-15 17:14:16 -08:00
parent 221c7850e8
commit e37930253d
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
}
fun sourceDirectories(project: Project, context: KobaltContext) : List<File> {
val result = hashSetOf<File>()
val result = arrayListOf<File>()
val compilerContributors = ActorUtils.selectAffinityActors(project, context,
context.pluginInfo.compilerContributors)
compilerContributors.forEach {
@ -53,6 +53,7 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
* Might be used by plug-ins.
*/
fun resourceDirectories(project: Project) = sourceDirectories(project, "resources", variantFirst = false)
.filter { it.path.contains("resources") || it.path.contains("res") }
/**
* suffix is either "java" (to find source files) or "resources" (to find resources).
@ -97,7 +98,8 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null,
val filteredResult = result.filter { File(project.directory, it.path).exists() }
val sortedResult = if (variantFirst) filteredResult
else filteredResult.reversed().toList()
return LinkedHashSet(sortedResult).toList()
val deduplicatedResult = LinkedHashSet(sortedResult).toList()
return deduplicatedResult
}
fun archiveName(project: Project, archiveName: String?, suffix: String) : String {