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

Apt fix.

Browse source
This commit is contained in:
Cedric Beust 2015-12-10 01:06:02 +04:00
parent 843f88565f
commit 6386f503b7
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt
View file

@ -19,14 +19,19 @@ import javax.inject.Singleton
@Singleton @Singleton
public class AptPlugin @Inject constructor(val depFactory: DepFactory) public class AptPlugin @Inject constructor(val depFactory: DepFactory)
: ConfigPlugin<AptConfig>(), ICompilerFlagContributor { : ConfigPlugin<AptConfig>(), ICompilerFlagContributor {
companion object { companion object {
const val PLUGIN_NAME = "Apt" const val PLUGIN_NAME = "Apt"
} }
override val name = PLUGIN_NAME override val name = PLUGIN_NAME
private fun generated(project: Project, context: KobaltContext, outputDir: String) =
KFiles.joinAndMakeDir(project.directory, project.buildDirectory, outputDir,
context.variant.toIntermediateDir())
// ICompilerFlagContributor // ICompilerFlagContributor
override fun flagsFor(project: Project, currentFlags: List<String>) : List<String> { override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>) : List<String> {
val result = arrayListOf<String>() val result = arrayListOf<String>()
configurationFor(project)?.let { config -> configurationFor(project)?.let { config ->
aptDependencies[project.name]?.let { aptDependencies -> aptDependencies[project.name]?.let { aptDependencies ->
@ -44,9 +49,8 @@ public class AptPlugin @Inject constructor(val depFactory: DepFactory)
result.add("-processorpath") result.add("-processorpath")
result.add((dependencyJarFiles + dependencies).joinToString(":")) result.add((dependencyJarFiles + dependencies).joinToString(":"))
val generated = KFiles.joinAndMakeDir(project.directory, project.buildDirectory, config.outputDir)
result.add("-s") result.add("-s")
result.add(generated) result.add(generated(project, context, config.outputDir))
} }
log(2, "New flags from apt: " + result.joinToString(" ")) log(2, "New flags from apt: " + result.joinToString(" "))
} }