From 97ea9c2c16bd5481951ee61933443aca72d7b649 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Thu, 17 Jun 2021 16:46:48 +0200 Subject: [PATCH] [Gradle] Rename HierarchicalNativeDistributionCommonizerTask to NativeDistributionCommonizerTask ^KT-47301 --- .../kotlin/gradle/targets/native/internal/CommonizerTasks.kt | 2 +- .../targets/native/internal/KotlinNativePlatformDependencies.kt | 2 +- ...ionCommonizerTask.kt => NativeDistributionCommonizerTask.kt} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/{HierarchicalNativeDistributionCommonizerTask.kt => NativeDistributionCommonizerTask.kt} (98%) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTasks.kt index b5089170511..87280af57f7 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTasks.kt @@ -79,7 +79,7 @@ internal val Project.copyCommonizeCInteropForIdeTask: TaskProvider? +internal val Project.commonizeNativeDistributionTask: TaskProvider? get() { if (!isAllowCommonizer()) return null return rootProject.locateOrRegisterTask( diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt index 072d7bec28a..bf7b2449add 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt @@ -47,7 +47,7 @@ private fun Project.getOriginalPlatformLibrariesFor(target: LeafCommonizerTarget konanDistribution.platformLibsDir.resolve(target.konanTarget.name).listLibraryFiles().toSet() } -private fun HierarchicalNativeDistributionCommonizerTask.getCommonizedPlatformLibrariesFor(target: SharedCommonizerTarget): FileCollection { +private fun NativeDistributionCommonizerTask.getCommonizedPlatformLibrariesFor(target: SharedCommonizerTarget): FileCollection { val targetOutputDirectory = CommonizerOutputFileLayout.resolveCommonizedDirectory(getRootOutputDirectory(), target) return project.filesProvider { targetOutputDirectory.listLibraryFiles() }.builtBy(this) } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/HierarchicalNativeDistributionCommonizerTask.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt similarity index 98% rename from libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/HierarchicalNativeDistributionCommonizerTask.kt rename to libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt index 01596ef3329..bcc79c2f5fc 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/HierarchicalNativeDistributionCommonizerTask.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.konan.library.KONAN_DISTRIBUTION_PLATFORM_LIBS_DIR import java.io.File import java.net.URLEncoder -internal open class HierarchicalNativeDistributionCommonizerTask : DefaultTask() { +internal open class NativeDistributionCommonizerTask : DefaultTask() { private val konanHome = project.file(project.konanHome)