From 6386f503b7ee9b1460d33fbf4c311884d4b827f9 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 10 Dec 2015 01:06:02 +0400 Subject: [PATCH] Apt fix. --- .../kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt index 27558895..7cf40947 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt @@ -19,14 +19,19 @@ import javax.inject.Singleton @Singleton public class AptPlugin @Inject constructor(val depFactory: DepFactory) : ConfigPlugin(), ICompilerFlagContributor { + companion object { const val PLUGIN_NAME = "Apt" } 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 - override fun flagsFor(project: Project, currentFlags: List) : List { + override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List) : List { val result = arrayListOf() configurationFor(project)?.let { config -> aptDependencies[project.name]?.let { aptDependencies -> @@ -44,9 +49,8 @@ public class AptPlugin @Inject constructor(val depFactory: DepFactory) result.add("-processorpath") result.add((dependencyJarFiles + dependencies).joinToString(":")) - val generated = KFiles.joinAndMakeDir(project.directory, project.buildDirectory, config.outputDir) result.add("-s") - result.add(generated) + result.add(generated(project, context, config.outputDir)) } log(2, "New flags from apt: " + result.joinToString(" ")) }