From 6392adcfc923f6230e5b9addb8b7275217b4aed3 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 3 Jul 2018 19:44:33 +0300
Subject: [PATCH] Kapt: Ensure we collect .java files from the unique
 directories (#KT-24963)

---
 .../src/org/jetbrains/kotlin/kapt3/base/KaptPaths.kt   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptPaths.kt b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptPaths.kt
index f480661c412..ecccf99775d 100644
--- a/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptPaths.kt
+++ b/plugins/kapt3/kapt3-base/src/org/jetbrains/kotlin/kapt3/base/KaptPaths.kt
@@ -22,11 +22,13 @@ class KaptPaths(
     val annotationProcessingClasspath = annotationProcessingClasspath.distinct()
 
     fun collectJavaSourceFiles(): List<File> {
-        return (javaSourceRoots + stubsOutputDir).flatMap { root ->
-            root.walk().filter { it.isFile && it.extension == "java" }.toList()
-        }
+        return (javaSourceRoots + stubsOutputDir)
+            .map { it.canonicalFile }
+            .distinct()
+            .flatMap { root ->
+                root.walk().filter { it.isFile && it.extension == "java" }.toList()
+            }
     }
-
 }
 
 fun KaptPaths.log(logger: KaptLogger) {