From a636f822d0f7ef51993cb8836765d318a29d52b5 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 5 Feb 2024 13:17:09 +0100 Subject: [PATCH] [Gradle] Fix warnings in NativeDistributionCommonizerTask ^KT-56904 In Progress --- .../native/internal/NativeDistributionCommonizerTask.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/internal/NativeDistributionCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt index f19de99f1f9..cfbb124c46f 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 @@ -9,7 +9,6 @@ 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.model.ObjectFactory import org.gradle.api.provider.ListProperty import org.gradle.api.provider.Property @@ -48,7 +47,6 @@ internal abstract class NativeDistributionCommonizerTask @Inject constructor( private val objectFactory: ObjectFactory, private val execOperations: ExecOperations, - private val projectLayout: ProjectLayout, ) : DefaultTask(), UsesBuildMetricsService, UsesKotlinNativeBundleBuildService { private val konanHome = project.file(project.konanHome) @@ -76,6 +74,7 @@ internal abstract class NativeDistributionCommonizerTask private val additionalSettings = project.additionalCommonizerSettings + @Suppress("unused") @get:Internal @Deprecated("Use lazy replacement", replaceWith = ReplaceWith("rootOutputDirectoryProperty.get().asFile")) internal val rootOutputDirectory: File get() = rootOutputDirectoryProperty.asFile.get() @@ -129,7 +128,11 @@ internal abstract class NativeDistributionCommonizerTask val commonizer = GradleCliCommonizer(commonizerRunner) /* Invoke commonizer with only 'to do' targets */ commonizer.commonizeNativeDistribution( - konanHome, rootOutputDirectory, todoOutputTargets, logLevel, additionalSettings + konanHome, + rootOutputDirectoryProperty.get().asFile, + todoOutputTargets, + logLevel, + additionalSettings, ) } }