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

apt: correct dependencies.

Browse source
This commit is contained in:
Cedric Beust 2016-02-13 01:45:15 +04:00
parent aa46de4d20
commit 1651035fe2
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import com.google.inject.Inject import com.google.inject.Inject
import java.io.File
import javax.inject.Singleton import javax.inject.Singleton
/** /**
@ -18,7 +19,22 @@ 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, ISourceDirectoryContributor {
// ISourceDirectoryContributor
override fun sourceDirectoriesFor(project: Project, context: KobaltContext): List<File> {
val config = configurationFor(project)
val result =
if (config != null) {
listOf(File(
KFiles.joinDir(KFiles.KOBALT_BUILD_DIR, config.outputDir, context.variant.toIntermediateDir())))
} else {
emptyList()
}
return result
}
companion object { companion object {
const val PLUGIN_NAME = "Apt" const val PLUGIN_NAME = "Apt"
@ -32,24 +48,19 @@ public class AptPlugin @Inject constructor(val depFactory: DepFactory)
// ICompilerFlagContributor // ICompilerFlagContributor
override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>, override fun flagsFor(project: Project, context: KobaltContext, currentFlags: List<String>,
suffixesBeingCompiled: List<String>) : List<String> { suffixesBeingCompiled: List<String>): List<String> {
if (!suffixesBeingCompiled.contains("java")) return emptyList()
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 ->
val dependencyJarFiles = aptDependencies.map {
JarFinder.byId(it)
}.map {
it.absolutePath
}
val deps = aptDependencies.map { depFactory.create(it) } val deps = aptDependencies.map { depFactory.create(it) }
val dependencies = context.dependencyManager.calculateDependencies(null, context, emptyList(), val dependencies = context.dependencyManager.calculateDependencies(null, context, emptyList(), deps)
deps).map { it.jarFile.get().path } .map { it.jarFile.get().path }
// result.add("-Xbootclasspath/a:" + dependencies)
result.add("-processorpath") result.add("-processorpath")
result.add((dependencyJarFiles + dependencies).joinToString(":")) result.add((dependencies).joinToString(":"))
result.add("-s") result.add("-s")
result.add(generated(project, context, config.outputDir)) result.add(generated(project, context, config.outputDir))
} }