From 432b08e15827387173d694d0e64dcf73b7dd3a7a Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Tue, 3 Jan 2023 22:05:05 +0100
Subject: [PATCH] [Gradle] Convert taskOutputsBackupExcludes into `SetProperty`

#KT-49785 In Progress
---
 .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt     | 14 ++------------
 .../configuration/AbstractKotlinCompileConfig.kt   |  3 +++
 .../tasks/configuration/KotlinCompileConfig.kt     |  7 +++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 37aed10d092..281b59c308d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -386,14 +386,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
 
     /** Task outputs that we don't want to include in [TaskOutputsBackup] (see [TaskOutputsBackup.outputsToRestore] for more info). */
     @get:Internal
-    protected open val taskOutputsBackupExcludes: List<File>
-        get() {
-            val list = mutableListOf<File>()
-            if (preciseCompilationResultsBackup.get()) {
-                list.add(destinationDirectory.get().asFile)
-            }
-            return list
-        }
+    internal abstract val taskOutputsBackupExcludes: SetProperty<File>
 
     @TaskAction
     fun execute(inputChanges: InputChanges) {
@@ -420,7 +413,7 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
                             fileSystemOperations,
                             layout.buildDirectory,
                             layout.buildDirectory.dir("snapshot/kotlin/$name"),
-                            outputsToRestore = allOutputFiles() - taskOutputsBackupExcludes,
+                            outputsToRestore = allOutputFiles() - taskOutputsBackupExcludes.get(),
                             logger
                         ).also {
                             it.createSnapshot()
@@ -639,9 +632,6 @@ abstract class KotlinCompile @Inject constructor(
             classpathSnapshotProperties.classpathSnapshot
         )
 
-    override val taskOutputsBackupExcludes: List<File>
-        get() = (classpathSnapshotProperties.classpathSnapshotDir.orNull?.asFile?.let { listOf(it) } ?: emptyList()) + super.taskOutputsBackupExcludes
-
     @get:Internal
     final override val defaultKotlinJavaToolchain: Provider<DefaultKotlinJavaToolchain> = objectFactory
         .propertyWithNewInstance({ this })
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
index 5a248ac5005..81c103660a4 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/AbstractKotlinCompileConfig.kt
@@ -80,6 +80,9 @@ internal abstract class AbstractKotlinCompileConfig<TASK : AbstractKotlinCompile
             task.preciseCompilationResultsBackup
                 .convention(propertiesProvider.preciseCompilationResultsBackup)
                 .finalizeValueOnRead()
+            task.taskOutputsBackupExcludes.addAll(task.preciseCompilationResultsBackup.map {
+                if (it) listOf(task.destinationDirectory.get().asFile, task.taskBuildLocalStateDirectory.get().asFile) else emptyList()
+            })
 
             task.incremental = false
             task.useModuleDetection.convention(false)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt
index d553489ebbd..05ad6156da6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/configuration/KotlinCompileConfig.kt
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder
 import org.jetbrains.kotlin.gradle.plugin.tcsOrNull
 import org.jetbrains.kotlin.gradle.report.BuildMetricsService
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.utils.providerWithLazyConvention
 import org.jetbrains.kotlin.project.model.LanguageSettings
 
 internal typealias KotlinCompileConfig = BaseKotlinCompileConfig<KotlinCompile>
@@ -57,6 +58,12 @@ internal open class BaseKotlinCompileConfig<TASK : KotlinCompile> : AbstractKotl
                 } else {
                     task.classpathSnapshotProperties.classpath.from(task.project.provider { task.libraries }).disallowChanges()
                 }
+                task.taskOutputsBackupExcludes.addAll(
+                    task.classpathSnapshotProperties.classpathSnapshotDir.asFile.flatMap {
+                        // it looks weird, but it's required to work around this issue: https://github.com/gradle/gradle/issues/17704
+                        objectFactory.providerWithLazyConvention { listOf(it) }
+                    }.orElse(emptyList())
+                )
             }
         }
     }