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

[Gradle] Support multiple variants of a module resolved when determining visible common source sets

Browse Source 
With capabilities in variants it is possible to depend on multiple variants of
an artifact in the same target compilation. These variants can implement
different common source sets which all should be visible from that target.

Instead of intersecting single variant source sets visible from different
targets, first union source sets from all target variant dependencies
and only then intersect these union results from different targets.
This commit is contained in:
Ilya Gorbunov
2023-10-19 05:08:44 +02:00
committed by Space Team
parent 251fdb21c9
commit 943c11d239
1 changed files with 36 additions and 25 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/plugin/mpp/SourceSetVisibilityProvider.kt
+36 -25
View File
@@ -87,44 +87,55 @@ internal class SourceSetVisibilityProvider(
val platformCompilationsByResolvedVariantName = mutableMapOf<String, PlatformCompilationData>()
val visiblePlatformVariantNames: Set<String?> = platformCompilations
val visiblePlatformVariantNames: List<Set<String>> = platformCompilations
.filter { visibleFromSourceSet in it.allSourceSets }
.map { platformCompilationData ->
val resolvedPlatformDependency = platformCompilationData
.mapNotNull { platformCompilationData ->
val resolvedPlatformDependencies = platformCompilationData
.resolvedDependenciesConfiguration
.allResolvedDependencies
.find { it.selected.id == resolvedRootMppDependencyId }
/*
Returning null if we can't find the given dependency in a certain platform compilations dependencies.
This is not expected, since this means the dependency does not support the given targets which will
lead to a dependency resolution error.
.filter { it.selected.id == resolvedRootMppDependencyId }
/*
Returning null if we can't find the given dependency in a certain platform compilations dependencies.
This is not expected, since this means the dependency does not support the given targets which will
lead to a dependency resolution error.
Esoteric cases can still get into this branch: e.g. broken publications (or broken .m2 and mavenLocal()).
In this case we just return null, effectively ignoring this situation for this algorithm.
Esoteric cases can still get into this branch: e.g. broken publications (or broken .m2 and mavenLocal()).
In this case we just return null, effectively ignoring this situation for this algorithm.
Ignoring this will still lead to a more graceful behaviour in the IDE.
A broken publication will potentially lead to 'too many' source sets being visible, which is
more desirable than having none.
*/ ?: return@map null
Ignoring this will still lead to a more graceful behaviour in the IDE.
A broken publication will potentially lead to 'too many' source sets being visible, which is
more desirable than having none.
*/
.ifEmpty { return@mapNotNull null }
val resolvedVariant = kotlinVariantNameFromPublishedVariantName(
resolvedPlatformDependency.resolvedVariant.displayName
)
resolvedPlatformDependencies.map { resolvedPlatformDependency ->
val resolvedVariant = kotlinVariantNameFromPublishedVariantName(
resolvedPlatformDependency.resolvedVariant.displayName
)
if (resolvedVariant !in platformCompilationsByResolvedVariantName) {
platformCompilationsByResolvedVariantName[resolvedVariant] = platformCompilationData
}
if (resolvedVariant !in platformCompilationsByResolvedVariantName) {
platformCompilationsByResolvedVariantName[resolvedVariant] = platformCompilationData
}
resolvedVariant
}.toSet()
resolvedVariant
}.toSet()
}
if (visiblePlatformVariantNames.isEmpty()) {
return SourceSetVisibilityResult(emptySet(), emptyMap())
}
val visibleSourceSetNames = dependencyProjectStructureMetadata.sourceSetNamesByVariantName
.filterKeys { it in visiblePlatformVariantNames }
.values.let { if (it.isEmpty()) emptySet() else it.reduce { acc, item -> acc intersect item } }
val visibleSourceSetNames = visiblePlatformVariantNames
.mapNotNull { platformVariants ->
platformVariants
.map { dependencyProjectStructureMetadata.sourceSetNamesByVariantName[it].orEmpty() }
// join together visible source sets from multiple variants of the same platform
.fold(emptySet<String>()) { acc, item -> acc union item }
.ifEmpty { null }
}
// intersect visible variants from different platforms
.ifEmpty { listOf(emptySet()) } // to avoid calling reduce on an empty list
.reduce { acc, item -> acc intersect item }
val hostSpecificArtifactBySourceSet: Map<String, File> =
if (resolvedToOtherProject) {