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

Gradle, ProcessedFilesCache: don't report on clashes with for targets with removed source

Browse Source
This commit is contained in:
Sergey Rostov
2019-08-12 09:00:40 +03:00
parent 84971d2003
commit 6b5739bd6a
1 changed files with 15 additions and 2 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/internal/ProcessedFilesCache.kt
+15 -2
View File
@@ -153,6 +153,14 @@ internal open class ProcessedFilesCache(
byTarget[target] = element byTarget[target] = element
} }
} }
fun remove(element: Element) {
if (element.target != null) {
byTarget.remove(element.target)
}
byHash.values.removeIf { it == element }
}
} }
class Element( class Element(
@@ -199,8 +207,13 @@ internal open class ProcessedFilesCache(
val key = compute()?.relativeTo(targetDir)?.toString() val key = compute()?.relativeTo(targetDir)?.toString()
val existedTarget = state.byTarget[key] val existedTarget = state.byTarget[key]
if (key != null && existedTarget != null) { if (key != null && existedTarget != null) {
if (existedTarget.src != file.canonicalPath) { if (File(existedTarget.src).exists()) {
reportTargetClash(key, file, File(existedTarget.src)) if (existedTarget.src != file.canonicalPath) {
reportTargetClash(key, file, File(existedTarget.src))
}
} else {
project.logger.warn("Removing cache for removed source `${existedTarget.src}`")
state.remove(existedTarget)
} }
} }
state[hash] = Element(file.canonicalPath, key) state[hash] = Element(file.canonicalPath, key)