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

GITHUB-220: Apt fix

Browse source 
Fixes https://github.com/cbeust/kobalt/issues/220
This commit is contained in:
Cedric Beust 2016-06-01 21:39:28 -08:00
parent 6e32b4ade2
commit d04879dde5
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,10 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
val result = val result =
if (config != null) { if (config != null) {
listOf(File( listOf(File(
KFiles.joinDir(KFiles.KOBALT_BUILD_DIR, config.outputDir, context.variant.toIntermediateDir()))) KFiles.joinDir(project.directory,
KFiles.KOBALT_BUILD_DIR,
config.outputDir,
context.variant.toIntermediateDir())))
} else { } else {
emptyList() emptyList()
} }
@ -54,13 +57,6 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va
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 deps = aptDependencies.map { dependencyManager.create(it) }
val dependencies = context.dependencyManager.calculateDependencies(null, context, emptyList(), deps)
.map { it.jarFile.get().path }
result.add("-processorpath")
result.add((dependencies).joinToString(":"))
result.add("-s") result.add("-s")
result.add(generated(project, context, config.outputDir)) result.add(generated(project, context, config.outputDir))
} }