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

kapt: Generate stub source file just after Kotlin compile

Browse Source
This commit is contained in:
Yan Zhulanow
2015-06-11 22:41:14 +03:00
parent 37d52501c8
commit 3ea4306eb9
2 changed files with 6 additions and 4 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
+2 -4
View File
@@ -57,8 +57,6 @@ public class AnnotationProcessingManager(
project.getLogger().warn("Please do not use `$ANDROID_APT_PLUGIN_ID` with kapt.") project.getLogger().warn("Please do not use `$ANDROID_APT_PLUGIN_ID` with kapt.")
} }
generateJavaHackFile(aptWorkingDir, javaTask)
val annotationProcessorFqNames = lookupAnnotationProcessors(aptFiles) val annotationProcessorFqNames = lookupAnnotationProcessors(aptFiles)
val stubOutputDir = File(aptWorkingDir, WRAPPERS_DIRECTORY) val stubOutputDir = File(aptWorkingDir, WRAPPERS_DIRECTORY)
@@ -80,8 +78,8 @@ public class AnnotationProcessingManager(
} }
} }
private fun generateJavaHackFile(aptDir: File, javaTask: JavaCompile) { fun generateJavaHackFile() {
val javaAptSourceDir = File(aptDir, "java_src") val javaAptSourceDir = File(aptWorkingDir, "java_src")
val javaHackPackageDir = File(javaAptSourceDir, GEN_ANNOTATION) val javaHackPackageDir = File(javaAptSourceDir, GEN_ANNOTATION)
javaHackPackageDir.mkdirs() javaHackPackageDir.mkdirs()
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+4
View File
@@ -608,6 +608,10 @@ private fun Project.initKapt(
kotlinTask.getLogger().kotlinDebug("kapt: Class file stubs are not used") kotlinTask.getLogger().kotlinDebug("kapt: Class file stubs are not used")
} }
kotlinTask.doFirst {
kaptManager.generateJavaHackFile()
}
javaTask.doFirst { javaTask.doFirst {
kaptManager.setupKapt() kaptManager.setupKapt()
kotlinAfterJavaTask?.setClasspath(files(kotlinTask.getClasspath(), javaTask.getDestinationDir())) kotlinAfterJavaTask?.setClasspath(files(kotlinTask.getClasspath(), javaTask.getDestinationDir()))