erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28: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 {

3
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/TaskContributor.kt
View file

@ -46,12 +46,11 @@ class TaskContributor @Inject constructor(val incrementalManager: IncrementalMan
runTask: (Project) -> IncrementalTaskInfo) {
Variant.allVariants(project).forEach { variant ->
val variantTaskName = variant.toTask(taskName)
context.variant = variant
dynamicTasks.add(DynamicTask(plugin, variantTaskName, variantTaskName,
runBefore = runBefore.map { variant.toTask(it) },
runAfter = runAfter.map { variant.toTask(it) },
alwaysRunAfter = alwaysRunAfter.map { variant.toTask(it) },
closure = incrementalManager.toIncrementalTaskClosure(taskName, runTask)))
closure = incrementalManager.toIncrementalTaskClosure(taskName, runTask, variant)))
}
}

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

@ -2,6 +2,8 @@ package com.beust.kobalt.internal
import com.beust.kobalt.IncrementalTaskInfo
import com.beust.kobalt.TaskResult
import com.beust.kobalt.Variant
import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.api.Project
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log
@ -74,9 +76,11 @@ class IncrementalManager(val fileName: String = IncrementalManager.BUILD_INFO_FI
* @return a closure that invokes that method and decide whether to run the task or not based
* on the content of that IncrementalTaskInfo
*/
fun toIncrementalTaskClosure(shortTaskName: String, method: (Project) -> IncrementalTaskInfo)
fun toIncrementalTaskClosure(shortTaskName: String, method: (Project) -> IncrementalTaskInfo,
variant: Variant = Variant())
: (Project) -> TaskResult {
return { project: Project ->
Kobalt.context?.variant = variant
val iit = method(project)
val taskName = project.name + ":" + shortTaskName
var upToDate = false

11
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -113,13 +113,14 @@ open class JvmCompilerPlugin @Inject constructor(
throw IllegalArgumentException("Custom source sets not supported yet: $sourceSet")
}
if (sourceDirs.size > 0) {
val variantSourceDirs = context.variant.resourceDirectories(project)
if (variantSourceDirs.size > 0) {
lp(project, "Copying $sourceSet resources")
val absOutputDir = File(KFiles.joinDir(project.directory, project.buildDirectory, outputDir))
sourceDirs.map { File(project.directory, it) }.filter {
variantSourceDirs.map { File(project.directory, it.path) }.filter {
it.exists()
}.forEach {
log(2, "Copying from $sourceDirs to $absOutputDir")
log(2, "Copying from $it to $absOutputDir")
KFiles.copyRecursively(it, absOutputDir, deleteFirst = false)
}
} else {
@ -241,7 +242,7 @@ open class JvmCompilerPlugin @Inject constructor(
* Runs all the contributors and interceptors relevant to that task.
*/
protected fun createCompilerActionInfo(project: Project, context: KobaltContext, isTest: Boolean,
sourceDirectories: Set<File>, sourceSuffixes: List<String>): CompilerActionInfo {
sourceDirectories: List<File>, sourceSuffixes: List<String>): CompilerActionInfo {
copyResources(project, JvmCompilerPlugin.SOURCE_SET_MAIN)
val fullClasspath = if (isTest) dependencyManager.testDependencies(project, context)
@ -312,7 +313,7 @@ open class JvmCompilerPlugin @Inject constructor(
return result
}
val sourceDirectories = hashSetOf<File>()
val sourceDirectories = arrayListOf<File>()
// ISourceDirectoryContributor
override fun sourceDirectoriesFor(project: Project, context: KobaltContext)