From 2360d5f33076d36b192dbb5923c6ff3b34052dba Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Thu, 13 Apr 2017 17:47:40 +0300
Subject: [PATCH] Changed to prepending annotation processor path instead of
 appending it to classpath and existing annotation processors.

---
 .../kotlin/gradle/internal/AnnotationProcessingManager.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
index cc8c8a9e172..618963296f0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AnnotationProcessingManager.kt
@@ -157,7 +157,7 @@ class AnnotationProcessingManager(
             return kotlinGeneratedDir
         }
 
-    val kaptProcessorPath get() = javaTask.classpath + setOf(wrappersDirectory) + aptFiles
+    val kaptProcessorPath get() = setOf(wrappersDirectory) + aptFiles + javaTask.classpath
 
     fun setupKapt() {
         originalJavaCompilerArgs = javaTask.options.compilerArgs
@@ -281,7 +281,7 @@ class AnnotationProcessingManager(
             javaTask.addCompilerArgument("-processorpath") { prevValue ->
                 if (prevValue != null)
                     javaTask.logger.warn("Processor path was modified by kapt. Previous value = $prevValue")
-                path.joinToString(prefix = prevValue?.let { it + File.pathSeparator }.orEmpty(),
+                path.joinToString(postfix = prevValue?.let { File.pathSeparator + it }.orEmpty(),
                                   separator = File.pathSeparator)
             }
         }
@@ -297,7 +297,7 @@ class AnnotationProcessingManager(
         if (originalProcessorPath != null)
             javaTask.logger.warn("Processor path was modified by kapt. Previous value = $originalProcessorPath")
 
-        val newPath = javaTask.project.files(path + (originalProcessorPath ?: emptyList<File>()))
+        val newPath = javaTask.project.files(path + (originalProcessorPath ?: emptyList()))
         setPath(javaTask.options, newPath)
         true
     } catch (_: NoSuchMethodException) {