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

Fix infinite loop during continuous Gradle build including JS DCE

Browse Source 
It's basically a workaround fox bug in Gradle.
See https://github.com/gradle/gradle/issues/2651
This commit is contained in:
Alexey Andreev
2017-08-04 13:09:46 +03:00
parent 71878b2218
commit a4551fb0fb
1 changed files with 14 additions and 7 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/KotlinJsDcePlugin.kt
+14 -7
View File
@@ -49,7 +49,8 @@ class KotlinJsDcePlugin : Plugin<Project> {
val outputDir = File(kotlinTask.outputFile).parentFile
val dependenciesDir = File(outputDir, "dependencies")
copyDependencies(project, sourceSet, dependenciesDir, dceTask)
val dependenciesTemporaryDir = File(outputDir, "dependencies-tmp")
copyDependencies(project, sourceSet, dependenciesDir, dependenciesTemporaryDir, dceTask)
val dceInputTrees = listOf(project.fileTree(kotlinTask.outputFile), project.fileTree(dependenciesDir))
val dceInputFiles = UnionFileTree("dce-input", dceInputTrees)
@@ -62,28 +63,34 @@ class KotlinJsDcePlugin : Plugin<Project> {
}
}
private fun copyDependencies(project: Project, sourceSet: SourceSet, outputDir: File, dceTask: Task) {
private fun copyDependencies(project: Project, sourceSet: SourceSet, outputDir: File, tmpDir: File, dceTask: Task) {
val configuration = project.configurations.findByName(sourceSet.compileConfigurationName) ?: return
val files = UnionFileCollection(configuration.map { project.zipTree(it) })
val zippedFiles = UnionFileCollection(configuration.map { project.zipTree(it) })
val files = project.fileTree(tmpDir)
.filter { it.path.endsWith(".js") }
.filter { File(it.path.removeSuffix(".js") + ".meta.js").exists() }
// This intermediate task is needed due to bug in Gradle that causes infinite loops in continuous build mode
val unpackName = sourceSet.getTaskName(UNPACK_DEPENDENCIES_TASK_PREFIX, TASK_SUFFIX)
val unpackTask = project.tasks.create(unpackName, Copy::class.java).apply {
from(zippedFiles)
into(tmpDir)
}
val name = sourceSet.getTaskName(DEPENDENCIES_TASK_PREFIX, TASK_SUFFIX)
with(project.tasks.create(name, Copy::class.java)) {
from(files)
into(outputDir)
includeEmptyDirs = true
include {
it.path.let { it.endsWith(".js") && !it.endsWith(".meta.js") }
}
dceTask.dependsOn(this)
dependsOn(unpackTask)
}
}
companion object {
private const val TASK_SUFFIX = "kotlinJs"
private const val UNPACK_DEPENDENCIES_TASK_PREFIX = "unpackDependencies"
private const val DEPENDENCIES_TASK_PREFIX = "copyDependencies"
private const val DCE_TASK_PREFIX = "runDce"
}