From 546a26a4cd9d07ba2efc406c5b7cefa0ab2e35fb Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Tue, 23 May 2017 15:47:31 +0300 Subject: [PATCH] Fix Kapt task depending on compileKotlin because of incorrect filtering of compileJava dependencies (cherry picked from commit 9a2c3b0) --- .../kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt index ca07717a63c..4c1dc15d741 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt @@ -118,7 +118,7 @@ internal class LegacyAndroidAndroidProjectHandler(kotlinConfigurationTools: Kotl AndroidGradleWrapper.getAnnotationProcessorOptionsFromAndroidVariant(variantData) override fun wireKaptTask(project: Project, task: KaptTask, kotlinTask: KotlinCompile, javaTask: AbstractCompile) { - task.dependsOn(*(javaTask.dependsOn.filter { it !== kotlinTask }.toTypedArray())) + task.dependsOn(*(javaTask.dependsOn.filter { it !== kotlinTask && it != kotlinTask.name }.toTypedArray())) javaTask.source(task.destinationDir) } }