From 196f14823ed7f9583d589c477b9af2500105a39a Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Thu, 19 Oct 2023 12:49:05 +0200
Subject: [PATCH] [Gradle] Re-use existing nativeDistribution dir

Having a dedicated konan data dir is not working well on Windows
machine. Since invocation of kotlin compiler would make JVM
to load native-specific dlls and it would not be possible to clean them
up until they are unloaded.

^KT-61359 Verification Pending
---
 .../jetbrains/kotlin/gradle/ConfigurationCacheIT.kt   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
index 3fab495d11f..9ea4a5fbd9b 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
@@ -86,21 +86,22 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
         additionalVersions = [TestVersions.Gradle.G_7_6],
     )
     @GradleTest
-    fun testCommonizer(gradleVersion: GradleVersion, @TempDir konanHome: Path) {
+    fun testCommonizer(gradleVersion: GradleVersion) {
         project("native-configuration-cache", gradleVersion) {
-            val buildOptions = defaultBuildOptions.copy(konanDataDir = konanHome)
-            build(":lib:compileCommonMainKotlinMetadata", buildOptions = buildOptions) {
+            build(":cleanNativeDistributionCommonization")
+
+            build(":lib:compileCommonMainKotlinMetadata") {
                 assertTasksExecuted(":commonizeNativeDistribution")
                 assertTasksExecuted(":lib:compileCommonMainKotlinMetadata")
                 assertConfigurationCacheStored()
             }
 
-            build("clean", ":cleanNativeDistributionCommonization", buildOptions = buildOptions) {
+            build("clean", ":cleanNativeDistributionCommonization") {
                 assertTasksExecuted(":cleanNativeDistributionCommonization")
                 assertConfigurationCacheStored()
             }
 
-            build(":lib:compileCommonMainKotlinMetadata", buildOptions = buildOptions) {
+            build(":lib:compileCommonMainKotlinMetadata") {
                 assertTasksExecuted(":commonizeNativeDistribution")
                 assertTasksExecuted(":lib:compileCommonMainKotlinMetadata")
                 assertConfigurationCacheReused()