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

Fix UnsupportedOperationException caused by mutation of FileCollection

Browse Source
This commit is contained in:
Sergey Igushkin
2017-05-29 20:23:10 +03:00
committed by Alexey Tsvetkov
parent a68f7d79f5
commit dce6a4f869
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt
+10 -8
View File
@@ -38,15 +38,17 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools
kotlinTask: KotlinCompile,
kotlinAfterJavaTask: KotlinCompile?) {
val preJavaKotlinOutput = project.files().builtBy(kotlinTask)
if (kotlinAfterJavaTask == null) {
preJavaKotlinOutput.add(project.files(kotlinTask.destinationDir))
}
if (Kapt3GradleSubplugin.isEnabled(project)) {
// Add Kapt3 output as well, since there's no SyncOutputTask with the new API
val kaptClasssesDir = Kapt3KotlinGradleSubplugin.getKaptClasssesDir(project, getVariantName(variantData))
preJavaKotlinOutput.add(project.files(kaptClasssesDir))
val preJavaKotlinOutputFiles = mutableListOf<File>().apply {
if (kotlinAfterJavaTask == null) {
add(kotlinTask.destinationDir)
}
if (Kapt3GradleSubplugin.isEnabled(project)) {
// Add Kapt3 output as well, since there's no SyncOutputTask with the new API
val kaptClasssesDir = Kapt3KotlinGradleSubplugin.getKaptClasssesDir(project, getVariantName(variantData))
add(kaptClasssesDir)
}
}
val preJavaKotlinOutput = project.files(*preJavaKotlinOutputFiles.toTypedArray()).builtBy(kotlinTask)
val preJavaClasspathKey = variantData.registerPreJavacGeneratedBytecode(preJavaKotlinOutput)
kotlinTask.dependsOn(variantData.getSourceFolders(SourceKind.JAVA))