From 251f52586e6ef8468761c3ffa69eb5479432f82c Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Mon, 16 Oct 2023 14:04:01 +0200
Subject: [PATCH] [Gradle] Add fileProperty(initialValue: File) utility
 function

^KT-61359 Verification Pending
---
 .../internal/NativeDistributionCommonizerTask.kt | 16 +++++++---------
 .../kotlin/gradle/utils/providerApiUtils.kt      |  3 +++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
index fc1fe6aebfe..b5e92b8ff21 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
@@ -35,6 +35,7 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 import org.jetbrains.kotlin.gradle.report.GradleBuildMetricsReporter
 import org.jetbrains.kotlin.gradle.report.UsesBuildMetricsService
 import org.jetbrains.kotlin.gradle.utils.chainedFinalizeValueOnRead
+import org.jetbrains.kotlin.gradle.utils.fileProperty
 import org.jetbrains.kotlin.gradle.utils.listProperty
 import org.jetbrains.kotlin.gradle.utils.property
 import org.jetbrains.kotlin.konan.library.KONAN_DISTRIBUTION_COMMONIZED_LIBS_DIR
@@ -89,15 +90,12 @@ internal abstract class NativeDistributionCommonizerTask
 
     @get:OutputDirectory
     internal val rootOutputDirectoryProperty: RegularFileProperty = objectFactory
-        .fileProperty()
-        .apply {
-            set(
-                project.file(project.konanHome)
-                    .resolve(KONAN_DISTRIBUTION_KLIB_DIR)
-                    .resolve(KONAN_DISTRIBUTION_COMMONIZED_LIBS_DIR)
-                    .resolve(URLEncoder.encode(project.getKotlinPluginVersion(), Charsets.UTF_8.name()))
-            )
-        }
+        .fileProperty(
+            project.file(project.konanHome)
+                .resolve(KONAN_DISTRIBUTION_KLIB_DIR)
+                .resolve(KONAN_DISTRIBUTION_COMMONIZED_LIBS_DIR)
+                .resolve(URLEncoder.encode(project.getKotlinPluginVersion(), Charsets.UTF_8.name()))
+        )
 
     private val isCachingEnabled = project.kotlinPropertiesProvider.enableNativeDistributionCommonizationCache
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
index 7bf17401484..f06fac6083b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
@@ -108,6 +108,9 @@ internal fun Project.newFileProperty(initialize: (() -> File)? = null): RegularF
     }
 }
 
+internal fun ObjectFactory.fileProperty(initialValue: File): RegularFileProperty = fileProperty()
+    .apply { set(initialValue) }
+
 internal fun Project.filesProvider(
     vararg buildDependencies: Any,
     provider: () -> Any?