From 50a7164efe908021b5812c0bafe23b6069561653 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 12 Jan 2017 01:08:24 +0900
Subject: [PATCH] Kapt3, Gradle: Fix kapt execution in tests. Check filtered
 dependencies list properly (KT-15459)

---
 .../kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt
index 53df48388ba..fb068f02f32 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt
@@ -97,7 +97,11 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin<KotlinCompile> {
 
         fun handleSourceSet(sourceSetName: String) {
             val kaptConfiguration = project.findKaptConfiguration(sourceSetName)
-            if (kaptConfiguration != null && kaptConfiguration.dependencies.size > 1) {
+            val filteredDependencies = kaptConfiguration?.dependencies?.filter {
+                it.group != getGroupName() || it.name != getArtifactName()
+            } ?: emptyList()
+
+            if (kaptConfiguration != null && filteredDependencies.isNotEmpty()) {
                 javaCompile.dependsOn(kaptConfiguration.buildDependencies)
                 kaptClasspath.addAll(kaptConfiguration.resolve())
             }