From e529592d15db5eb3b4b8c9dcb117a97694eaea84 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 26 May 2017 21:43:55 +0300 Subject: [PATCH] Pass task object instead of task name to dependsOn This simplifies filtering out dependsOn later --- .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.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/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 7d93f8dfd3c..dbdabf6d910 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -553,7 +553,7 @@ internal fun configureJavaTask(kotlinTask: KotlinCompile, javaTask: AbstractComp // Also, use kapt1 annotations file for up-to-date check since annotation processing is done with javac kotlinTask.kaptOptions.annotationsFile?.let { javaTask.inputs.file(it) } - javaTask.dependsOn(kotlinTask.name) + javaTask.dependsOn(kotlinTask) /* * It's important to modify javaTask.classpath only in doFirst, * because Android plugin uses ConventionMapping to modify it too (see JavaCompileConfigAction.execute),