azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Change rootOutputDirectoryProperty to be DirectoryProperty

Browse Source 
^KT-61359 Verification Pending
This commit is contained in:
Anton Lakotka
2023-10-17 16:54:47 +02:00
committed by Space Team
parent d74a1133e9
commit d090791e40
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
+4 -4
View File
@@ -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)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
+4
View File
@@ -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?