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

Pass task object instead of task name to dependsOn

Browse Source 
This simplifies filtering out dependsOn later
This commit is contained in:
Alexey Tsvetkov
2017-05-26 21:43:55 +03:00
parent c8d05f8485
commit e529592d15
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/KotlinPlugin.kt
+1 -1
View File
@@ -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 // 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) } 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, * It's important to modify javaTask.classpath only in doFirst,
* because Android plugin uses ConventionMapping to modify it too (see JavaCompileConfigAction.execute), * because Android plugin uses ConventionMapping to modify it too (see JavaCompileConfigAction.execute),