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

Kapt: Ensure we collect .java files from the unique directories (#KT-24963)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-07-03 19:44:33 +03:00
parent 20299f6224
commit 6392adcfc9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptPaths.kt
+6 -4
View File
@@ -22,11 +22,13 @@ class KaptPaths(
val annotationProcessingClasspath = annotationProcessingClasspath.distinct() val annotationProcessingClasspath = annotationProcessingClasspath.distinct()
fun collectJavaSourceFiles(): List<File> { fun collectJavaSourceFiles(): List<File> {
return (javaSourceRoots + stubsOutputDir).flatMap { root -> return (javaSourceRoots + stubsOutputDir)
root.walk().filter { it.isFile && it.extension == "java" }.toList() .map { it.canonicalFile }
} .distinct()
.flatMap { root ->
root.walk().filter { it.isFile && it.extension == "java" }.toList()
}
} }
} }
fun KaptPaths.log(logger: KaptLogger) { fun KaptPaths.log(logger: KaptLogger) {