From d090791e40695ca62e037366eac2da5c7eb78b49 Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Tue, 17 Oct 2023 16:54:47 +0200
Subject: [PATCH] [Gradle] Change rootOutputDirectoryProperty to be
 DirectoryProperty

^KT-61359 Verification Pending
---
 .../native/internal/NativeDistributionCommonizerTask.kt   | 8 ++++----
 .../org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt | 4 ++++
 2 files changed, 8 insertions(+), 4 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 b5e92b8ff21..969a799b2ff 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
@@ -8,8 +8,8 @@ package org.jetbrains.kotlin.gradle.targets.native.internal
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.ProjectLayout
-import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
@@ -35,7 +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.directoryProperty
 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,8 +89,8 @@ internal abstract class NativeDistributionCommonizerTask
     internal val rootOutputDirectory: File get() = rootOutputDirectoryProperty.asFile.get()
 
     @get:OutputDirectory
-    internal val rootOutputDirectoryProperty: RegularFileProperty = objectFactory
-        .fileProperty(
+    internal val rootOutputDirectoryProperty: DirectoryProperty = objectFactory
+        .directoryProperty(
             project.file(project.konanHome)
                 .resolve(KONAN_DISTRIBUTION_KLIB_DIR)
                 .resolve(KONAN_DISTRIBUTION_COMMONIZED_LIBS_DIR)
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 f06fac6083b..8dfd2623951 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
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.utils
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
@@ -111,6 +112,9 @@ internal fun Project.newFileProperty(initialize: (() -> File)? = null): RegularF
 internal fun ObjectFactory.fileProperty(initialValue: File): RegularFileProperty = fileProperty()
     .apply { set(initialValue) }
 
+internal fun ObjectFactory.directoryProperty(initialValue: File): DirectoryProperty = directoryProperty()
+    .apply { set(initialValue) }
+
 internal fun Project.filesProvider(
     vararg buildDependencies: Any,
     provider: () -> Any?