From d04879dde5dc012da9ae5f5d4f4fc1130b70e765 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 1 Jun 2016 21:39:28 -0800 Subject: [PATCH] GITHUB-220: Apt fix Fixes https://github.com/cbeust/kobalt/issues/220 --- .../kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 4c7f5e7c..386574e5 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt @@ -28,7 +28,10 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va val result = if (config != null) { 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 { emptyList() } @@ -54,13 +57,6 @@ class AptPlugin @Inject constructor(val dependencyManager: DependencyManager, va val result = arrayListOf() configurationFor(project)?.let { config -> 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(generated(project, context, config.outputDir)) }