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

[Gradle] Rename HierarchicalNativeDistributionCommonizerTask to NativeDistributionCommonizerTask

Browse Source 
^KT-47301
This commit is contained in:
sebastian.sellmair
2021-06-17 16:46:48 +02:00
committed by Space
parent 91259569d7
commit 97ea9c2c16
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/CommonizerTasks.kt
+1 -1
View File
@@ -79,7 +79,7 @@ internal val Project.copyCommonizeCInteropForIdeTask: TaskProvider<CopyCommonize
return null return null
} }
internal val Project.commonizeNativeDistributionTask: TaskProvider<HierarchicalNativeDistributionCommonizerTask>? internal val Project.commonizeNativeDistributionTask: TaskProvider<NativeDistributionCommonizerTask>?
get() { get() {
if (!isAllowCommonizer()) return null if (!isAllowCommonizer()) return null
return rootProject.locateOrRegisterTask( return rootProject.locateOrRegisterTask(
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/KotlinNativePlatformDependencies.kt
+1 -1
View File
@@ -47,7 +47,7 @@ private fun Project.getOriginalPlatformLibrariesFor(target: LeafCommonizerTarget
konanDistribution.platformLibsDir.resolve(target.konanTarget.name).listLibraryFiles().toSet() 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) val targetOutputDirectory = CommonizerOutputFileLayout.resolveCommonizedDirectory(getRootOutputDirectory(), target)
return project.filesProvider { targetOutputDirectory.listLibraryFiles() }.builtBy(this) return project.filesProvider { targetOutputDirectory.listLibraryFiles() }.builtBy(this)
} }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/HierarchicalNativeDistributionCommonizerTask.kt → libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/internal/NativeDistributionCommonizerTask.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.konan.library.KONAN_DISTRIBUTION_PLATFORM_LIBS_DIR
import java.io.File import java.io.File
import java.net.URLEncoder import java.net.URLEncoder
internal open class HierarchicalNativeDistributionCommonizerTask : DefaultTask() { internal open class NativeDistributionCommonizerTask : DefaultTask() {
private val konanHome = project.file(project.konanHome) private val konanHome = project.file(project.konanHome)