From eeadc95bc1d0a449442401962116f57555b04bfe Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 29 Oct 2019 19:31:56 +0300 Subject: [PATCH] [Gradle, JS] Remove check on duplicated targets Useful (for KT-33828), if provider of artifact has changed, but remained only one #KT-33828 fixed --- .../kotlin/gradle/internal/ProcessedFilesCache.kt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/ProcessedFilesCache.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/ProcessedFilesCache.kt index 6dd4b70f1f8..f039f0d7f59 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/ProcessedFilesCache.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/ProcessedFilesCache.kt @@ -12,7 +12,6 @@ import com.google.gson.stream.JsonWriter import org.gradle.api.Project import org.gradle.api.internal.project.ProjectInternal import org.gradle.internal.hash.FileHasher -import org.jetbrains.kotlin.daemon.common.toHexString import java.io.File /** @@ -163,7 +162,7 @@ internal open class ProcessedFilesCache( } } - class Element( + data class Element( val src: String, val target: String? ) @@ -207,11 +206,7 @@ internal open class ProcessedFilesCache( val key = compute()?.relativeTo(targetDir)?.toString() val existedTarget = state.byTarget[key] if (key != null && existedTarget != null) { - if (File(existedTarget.src).exists()) { - if (existedTarget.src != file.canonicalPath) { - reportTargetClash(key, file, File(existedTarget.src)) - } - } else { + if (!File(existedTarget.src).exists()) { project.logger.warn("Removing cache for removed source `${existedTarget.src}`") state.remove(existedTarget) } @@ -221,14 +216,11 @@ internal open class ProcessedFilesCache( return key } - fun checkTarget(target: String?): Boolean { + private fun checkTarget(target: String?): Boolean { if (target == null) return true return targetDir.resolve(target).exists() } - protected open fun reportTargetClash(target: String, existedSrc: File, newSrc: File): Nothing = - error("Both `$existedSrc` and `$newSrc` produces `$target`") - override fun close() { stateFile.parentFile.mkdirs() gson.newJsonWriter(stateFile.writer()).use {