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

[Commonizer] Use original K/N distribution libraries for leaf targets

Browse Source 
^KT-46716
This commit is contained in:
Pavel Kirpichenkov
2021-05-27 16:35:09 +03:00
committed by Space
parent c33608e009
commit 5f7576e546
1 changed files with 15 additions and 22 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/HierarchicalKotlinNativePlatformDependencies.kt
+15 -22
View File
@@ -35,31 +35,24 @@ private fun Project.getDependenciesFor(target: CommonizerTarget): FileCollection
} }
/* Target does not participate in any commonization. Try finding relevant platform libraries */ /* Target does not participate in any commonization. Try finding relevant platform libraries */
val konanTarget = target.konanTargets.singleOrNull() ?: return project.files() return if (target is LeafCommonizerTarget) getOriginalPlatformLibrariesFor(target) else project.files()
return project.filesProvider { konanDistribution.platformLibsDir.resolve(konanTarget.name).listFiles().orEmpty().toSet() } }
private fun Project.getOriginalPlatformLibrariesFor(target: LeafCommonizerTarget): FileCollection {
return project.filesProvider { konanDistribution.platformLibsDir.resolve(target.konanTarget.name).listFiles().orEmpty().toSet() }
}
private fun HierarchicalNativeDistributionCommonizerTask.getCommonizedPlatformLibrariesFor(target: SharedCommonizerTarget): FileCollection {
val rootTarget = rootCommonizerTargets.firstOrNull { rootTarget -> rootTarget.isEqualOrAncestorOf(target) } ?: return project.files()
val targetOutputDirectory = HierarchicalCommonizerOutputLayout.getTargetDirectory(getRootOutputDirectory(rootTarget), target)
return project.filesProvider { targetOutputDirectory.listFiles().orEmpty().toList() }.builtBy(this)
} }
private fun HierarchicalNativeDistributionCommonizerTask.getCommonizedDependenciesFor(target: CommonizerTarget): FileCollection { private fun HierarchicalNativeDistributionCommonizerTask.getCommonizedDependenciesFor(target: CommonizerTarget): FileCollection {
val rootTarget = rootCommonizerTargets.firstOrNull { rootTarget -> rootTarget.isEqualOrAncestorOf(target) } ?: return project.files() return when (target) {
val targetOutputDirectory = HierarchicalCommonizerOutputLayout.getTargetDirectory(getRootOutputDirectory(rootTarget), target) is LeafCommonizerTarget -> project.getOriginalPlatformLibrariesFor(target)
val targetDependencies = project.filesProvider { targetOutputDirectory.listFiles().orEmpty().toList() }.builtBy(this) is SharedCommonizerTarget -> getCommonizedPlatformLibrariesFor(target)
}
/*
LeafCommonizerTargets will still analyze against 'new' 'commonized' platform dependencies.
This means, that some parts of the API might get lifted to the direct parent dependency.
*/
val necessaryParentTargetDependencies: FileCollection = rootTarget.takeIf { target is LeafCommonizerTarget }
?.findParentOf(target)
?.let { parentTarget -> getCommonizedDependenciesFor(parentTarget) }
?: project.files()
return targetDependencies + necessaryParentTargetDependencies
}
private fun CommonizerTarget.findParentOf(target: CommonizerTarget): CommonizerTarget? {
return withAllAncestors()
.filterIsInstance<SharedCommonizerTarget>()
.firstOrNull { target in it.targets }
} }
private fun Project.addDependencies(sourceSet: KotlinSourceSet, libraries: FileCollection) { private fun Project.addDependencies(sourceSet: KotlinSourceSet, libraries: FileCollection) {