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

Fix Kapt task depending on compileKotlin because of incorrect filtering

Browse Source 
of compileJava dependencies

(cherry picked from commit 9a2c3b0)
This commit is contained in:
Sergey Igushkin
2017-05-23 15:47:31 +03:00
committed by Alexey Tsvetkov
parent 95d3d3057a
commit 546a26a4cd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt
+1 -1
View File
@@ -118,7 +118,7 @@ internal class LegacyAndroidAndroidProjectHandler(kotlinConfigurationTools: Kotl
AndroidGradleWrapper.getAnnotationProcessorOptionsFromAndroidVariant(variantData) AndroidGradleWrapper.getAnnotationProcessorOptionsFromAndroidVariant(variantData)
override fun wireKaptTask(project: Project, task: KaptTask, kotlinTask: KotlinCompile, javaTask: AbstractCompile) { 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) javaTask.source(task.destinationDir)
} }
} }