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

[Gradle][KPM] Minor: FragmentGranularMetadataResolver rename 'metadataExtractor'

Browse Source 
This renaming shall disambiguate the projectStructureMetadataExtractor
from the 'metadataProvider'
This commit is contained in:
sebastian.sellmair
2021-12-02 15:22:24 +01:00
committed by Space
parent 7475d26902
commit 66521de4e2
1 changed files with 6 additions and 6 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/FragmentGranularMetadataResolver.kt
+6 -6
View File
@@ -89,7 +89,7 @@ internal class FragmentGranularMetadataResolver(
We can safely assume that a metadata extractor can be created, because the project structure metadata already We can safely assume that a metadata extractor can be created, because the project structure metadata already
had to be read in order to create the Kotlin module and infer fragment visibility. had to be read in order to create the Kotlin module and infer fragment visibility.
*/ */
val metadataExtractor = MppDependencyProjectStructureMetadataExtractor.create( val projectStructureMetadataExtractor = MppDependencyProjectStructureMetadataExtractor.create(
project, resolvedComponentResult, configurationToResolve, true project, resolvedComponentResult, configurationToResolve, true
) ?: error( ) ?: error(
"Failed to create 'MppDependencyProjectStructureMetadataExtractor' for ${resolvedComponentResult.id} despite " + "Failed to create 'MppDependencyProjectStructureMetadataExtractor' for ${resolvedComponentResult.id} despite " +
@@ -97,19 +97,19 @@ internal class FragmentGranularMetadataResolver(
) )
val projectStructureMetadata = (dependencyModule as? ExternalImportedKotlinModule)?.projectStructureMetadata val projectStructureMetadata = (dependencyModule as? ExternalImportedKotlinModule)?.projectStructureMetadata
?: checkNotNull(metadataExtractor.getProjectStructureMetadata()) ?: checkNotNull(projectStructureMetadataExtractor.getProjectStructureMetadata())
val metadataProvider = when (metadataExtractor) { val metadataProvider = when (projectStructureMetadataExtractor) {
is ProjectMppDependencyProjectStructureMetadataExtractor -> ProjectMetadataProvider( is ProjectMppDependencyProjectStructureMetadataExtractor -> ProjectMetadataProvider(
dependencyProject = metadataExtractor.dependencyProject, dependencyProject = projectStructureMetadataExtractor.dependencyProject,
moduleIdentifier = metadataExtractor.moduleIdentifier moduleIdentifier = projectStructureMetadataExtractor.moduleIdentifier
) )
is JarMppDependencyProjectStructureMetadataExtractor -> CompositeMetadataJar( is JarMppDependencyProjectStructureMetadataExtractor -> CompositeMetadataJar(
moduleIdentifier = ModuleIds.fromComponent(project, metadataSourceComponent).toString(), moduleIdentifier = ModuleIds.fromComponent(project, metadataSourceComponent).toString(),
projectStructureMetadata = projectStructureMetadata, projectStructureMetadata = projectStructureMetadata,
primaryArtifactFile = metadataExtractor.primaryArtifactFile, primaryArtifactFile = projectStructureMetadataExtractor.primaryArtifactFile,
hostSpecificArtifactsBySourceSet = if ( hostSpecificArtifactsBySourceSet = if (
dependencyModule is ExternalImportedKotlinModule && chosenFragments != null dependencyModule is ExternalImportedKotlinModule && chosenFragments != null
) resolveHostSpecificMetadataArtifacts(dependencyModule, chosenFragments) else emptyMap(), ) resolveHostSpecificMetadataArtifacts(dependencyModule, chosenFragments) else emptyMap(),