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

[Gradle][KPM] Minor: Reuse logic in common toModuleIdentifier function

Browse Source
This commit is contained in:
sebastian.sellmair
2021-12-02 15:46:46 +01:00
committed by Space
parent 66521de4e2
commit ea698838dd
1 changed files with 5 additions and 7 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/plugin/mpp/pm20/DependencyResolution.kt
+5 -7
View File
@@ -157,19 +157,17 @@ internal fun ComponentIdentifier.matchesModule(module: KotlinModule): Boolean =
internal fun ResolvedComponentResult.toModuleIdentifiers(): List<KotlinModuleIdentifier> { internal fun ResolvedComponentResult.toModuleIdentifiers(): List<KotlinModuleIdentifier> {
val classifiers = moduleClassifiersFromCapabilities(variants.flatMap { it.capabilities }) val classifiers = moduleClassifiersFromCapabilities(variants.flatMap { it.capabilities })
return classifiers.map { moduleClassifier -> return classifiers.map { moduleClassifier -> toModuleIdentifier(moduleClassifier) }
when (val id = id) {
is ProjectComponentIdentifier -> LocalModuleIdentifier(id.build.name, id.projectPath, moduleClassifier)
is ModuleComponentIdentifier -> id.toSingleModuleIdentifier()
else -> MavenModuleIdentifier(moduleVersion?.group.orEmpty(), moduleVersion?.name.orEmpty(), moduleClassifier)
}
}
} }
// FIXME this mapping doesn't have enough information to choose auxiliary modules // FIXME this mapping doesn't have enough information to choose auxiliary modules
internal fun ResolvedComponentResult.toSingleModuleIdentifier(): KotlinModuleIdentifier { internal fun ResolvedComponentResult.toSingleModuleIdentifier(): KotlinModuleIdentifier {
val classifiers = moduleClassifiersFromCapabilities(variants.flatMap { it.capabilities }) val classifiers = moduleClassifiersFromCapabilities(variants.flatMap { it.capabilities })
val moduleClassifier = classifiers.single() // FIXME handle multiple capabilities val moduleClassifier = classifiers.single() // FIXME handle multiple capabilities
return toModuleIdentifier(moduleClassifier)
}
private fun ResolvedComponentResult.toModuleIdentifier(moduleClassifier: String?): KotlinModuleIdentifier {
return when (val id = id) { return when (val id = id) {
is ProjectComponentIdentifier -> LocalModuleIdentifier(id.build.name, id.projectPath, moduleClassifier) is ProjectComponentIdentifier -> LocalModuleIdentifier(id.build.name, id.projectPath, moduleClassifier)
is ModuleComponentIdentifier -> id.toSingleModuleIdentifier() is ModuleComponentIdentifier -> id.toSingleModuleIdentifier()