azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kapt: add Java task classpath to processorpath

Browse Source
This commit is contained in:
Yan Zhulanow
2016-01-27 18:09:43 +03:00
parent 203d9e150b
commit c6e6547559
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
+1 -1
View File
@@ -149,7 +149,7 @@ public class AnnotationProcessingManager(
generateAnnotationProcessorStubs(javaTask, annotationProcessorFqNames, stubOutputDir) generateAnnotationProcessorStubs(javaTask, annotationProcessorFqNames, stubOutputDir)
val processorPath = setOf(stubOutputDir) + aptFiles val processorPath = setOf(stubOutputDir) + aptFiles
setProcessorPath(javaTask, processorPath.joinToString(File.pathSeparator)) setProcessorPath(javaTask, (processorPath + javaTask.classpath).joinToString(File.pathSeparator))
javaTask.appendClasspath(stubOutputDir) javaTask.appendClasspath(stubOutputDir)
addGeneratedSourcesOutputToCompilerArgs(javaTask, aptOutputDir) addGeneratedSourcesOutputToCompilerArgs(javaTask, aptOutputDir)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+3
View File
@@ -158,6 +158,8 @@ class Kotlin2JvmSourceSetProcessor(
subpluginEnvironment.addSubpluginArguments(project, kotlinTask) subpluginEnvironment.addSubpluginArguments(project, kotlinTask)
if (aptConfiguration.dependencies.size > 1 && javaTask is JavaCompile) { if (aptConfiguration.dependencies.size > 1 && javaTask is JavaCompile) {
javaTask.dependsOn(aptConfiguration.buildDependencies)
val (aptOutputDir, aptWorkingDir) = project.getAptDirsForSourceSet(sourceSetName) val (aptOutputDir, aptWorkingDir) = project.getAptDirsForSourceSet(sourceSetName)
val kaptManager = AnnotationProcessingManager(kotlinTask, javaTask, sourceSetName, val kaptManager = AnnotationProcessingManager(kotlinTask, javaTask, sourceSetName,
@@ -392,6 +394,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
val aptConfiguration = aptConfigurations[(provider as AndroidSourceSet).name] val aptConfiguration = aptConfigurations[(provider as AndroidSourceSet).name]
// Ignore if there's only an annotation processor wrapper in dependencies (added by default) // Ignore if there's only an annotation processor wrapper in dependencies (added by default)
if (aptConfiguration != null && aptConfiguration.dependencies.size > 1) { if (aptConfiguration != null && aptConfiguration.dependencies.size > 1) {
javaTask.dependsOn(aptConfiguration.buildDependencies)
aptFiles.addAll(aptConfiguration.resolve()) aptFiles.addAll(aptConfiguration.resolve())
} }
} }