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

kapt: Fix ConcurrentModificationException in Gradle

Browse Source
This commit is contained in:
Yan Zhulanow
2015-06-18 18:48:42 +03:00
parent d9ac8c9d22
commit 5f85a028ae
1 changed files with 6 additions and 5 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
+6 -5
View File
@@ -633,14 +633,15 @@ private fun Project.createKotlinAfterJavaTask(
setProperty("kotlinDestinationDir", kotlinOutputDir) setProperty("kotlinDestinationDir", kotlinOutputDir)
setDestinationDir(javaTask.getDestinationDir()) setDestinationDir(javaTask.getDestinationDir())
setClasspath(javaTask.getClasspath()) setClasspath(javaTask.getClasspath())
dependsOn(javaTask.getDependsOn(), javaTask)
this this
} }
val dependsOnJava = getTasks().filter { javaTask in it.getDependsOn() && it != kotlinAfterJavaTask } getAllTasks(false)
for (task in dependsOnJava) { .flatMap { it.getValue() }
task.dependsOn(kotlinAfterJavaTask) .filter { javaTask in it.getTaskDependencies().getDependencies(it) }
} .forEach { it.dependsOn(kotlinAfterJavaTask) }
kotlinAfterJavaTask.dependsOn(javaTask)
return kotlinAfterJavaTask return kotlinAfterJavaTask
} }