From 1af804c89772c71096300e02721103e326b95517 Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Thu, 16 Jun 2022 14:11:45 +0200
Subject: [PATCH] [Gradle] Evaluate rootCacheDirectory on demand

To avoid failures in Gradle Configuration Cache due to illegal cacheKind
---
 .../gradle/targets/native/tasks/KotlinNativeTasks.kt     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
index 04980ace821..8a256a21834 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt
@@ -878,14 +878,18 @@ internal class CacheBuilder(
         val runnerSettings: KotlinNativeCompilerRunner.Settings,
         val konanCacheKind: NativeCacheKind,
         val libraries: FileCollection,
-        rootCacheDirectoryProvider: () -> File,
         val gradleUserHomeDir: File,
         val binary: NativeBinary,
         val konanTarget: KonanTarget,
         val kotlinOptions: KotlinCommonToolOptions,
         val externalDependenciesArgs: List<String>
     ) {
-        val rootCacheDirectory by UnserializableLazy(rootCacheDirectoryProvider)
+        val rootCacheDirectory get() = getRootCacheDirectory(
+            File(runnerSettings.parent.konanHome),
+            konanTarget,
+            binary.debuggable,
+            konanCacheKind
+        )
 
         companion object {
             operator fun invoke(
@@ -900,7 +904,6 @@ internal class CacheBuilder(
                     runnerSettings = KotlinNativeCompilerRunner.Settings(project),
                     konanCacheKind = konanCacheKind,
                     libraries = binary.compilation.compileDependencyFiles.filterOutPublishableInteropLibs(project),
-                    rootCacheDirectoryProvider = { getRootCacheDirectory(File(project.konanHome), konanTarget, binary.debuggable, konanCacheKind) },
                     gradleUserHomeDir = project.gradle.gradleUserHomeDir,
                     binary, konanTarget, kotlinOptions, externalDependenciesArgs
                 )