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

[Gradle] Collect project structure metadata for current build separately

Browse Source 
^KT-49933
This commit is contained in:
Anton Lakotka
2023-01-19 17:57:54 +01:00
committed by Space Team
parent 244f742610
commit 3a02090ff3
2 changed files with 22 additions and 13 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/KotlinProjectStructureMetadata.kt
+1 -1
View File
@@ -420,7 +420,7 @@ internal object GlobalProjectStructureMetadataStorage {
)
}
fun getAllProjectStructureMetadata(project: Project): Map<ProjectPathWithBuildName, Lazy<KotlinProjectStructureMetadata?>> {
fun getProjectStructureMetadataProvidersFromAllGradleBuilds(project: Project): Map<ProjectPathWithBuildName, Lazy<KotlinProjectStructureMetadata?>> {
return project.compositeBuildRoot.extensions.extraProperties.properties
.filterKeys { it.startsWith(propertyPrefix) }
.entries
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractorFactory.kt
+21 -12
View File
@@ -8,7 +8,6 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.gradle.api.artifacts.result.ResolvedArtifactResult
import org.gradle.api.provider.Provider
import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull
import org.jetbrains.kotlin.gradle.plugin.extraProperties
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.toSingleKpmModuleIdentifier
@@ -24,7 +23,8 @@ internal data class ProjectPathWithBuildName(
internal class MppDependencyProjectStructureMetadataExtractorFactory
private constructor(
private val allProjectStructureMetadataProviders: Lazy<Map<ProjectPathWithBuildName, Lazy<KotlinProjectStructureMetadata?>>>
private val includedBuildsProjectStructureMetadataProviders: Lazy<Map<ProjectPathWithBuildName, Lazy<KotlinProjectStructureMetadata?>>>,
private val currentBuildProjectStructureMetadataProviders: Map<String, Lazy<KotlinProjectStructureMetadata?>>
) {
fun create(
metadataArtifact: ResolvedArtifactResult
@@ -32,17 +32,20 @@ private constructor(
val moduleId = metadataArtifact.variant.owner
return if (moduleId is ProjectComponentIdentifier) {
val key = ProjectPathWithBuildName(moduleId.projectPath, moduleId.build.name)
val projectStructureMetadataProvider = allProjectStructureMetadataProviders.value[key]
?: error("Project structure metadata not found for project $key")
if (moduleId.build.isCurrentBuild) {
val projectStructureMetadataProvider = currentBuildProjectStructureMetadataProviders[moduleId.projectPath]
?: error("Project structure metadata not found for project '${moduleId.projectPath}'")
ProjectMppDependencyProjectStructureMetadataExtractor(
moduleIdentifier = metadataArtifact.variant.toSingleKpmModuleIdentifier(),
projectPath = moduleId.projectPath,
projectStructureMetadataProvider = projectStructureMetadataProvider::value
)
} else {
val key = ProjectPathWithBuildName(moduleId.projectPath, moduleId.build.name)
val projectStructureMetadataProvider = includedBuildsProjectStructureMetadataProviders.value[key]
?: error("Project structure metadata not found for project $key")
IncludedBuildMppDependencyProjectStructureMetadataExtractor(
componentId = moduleId,
primaryArtifact = metadataArtifact.file,
@@ -58,12 +61,18 @@ private constructor(
private val extensionName = MppDependencyProjectStructureMetadataExtractorFactory::class.java.simpleName
fun getOrCreate(project: Project): MppDependencyProjectStructureMetadataExtractorFactory =
project.extraProperties.getOrPut(extensionName) {
val allProjectStructureMetadataProviders = lazy {
GlobalProjectStructureMetadataStorage
.getAllProjectStructureMetadata(project)
}
MppDependencyProjectStructureMetadataExtractorFactory(allProjectStructureMetadataProviders)
MppDependencyProjectStructureMetadataExtractorFactory(
lazy { GlobalProjectStructureMetadataStorage.getProjectStructureMetadataProvidersFromAllGradleBuilds(project) },
collectAllProjectStructureMetadataInCurrentBuild(project)
)
}
private fun collectAllProjectStructureMetadataInCurrentBuild(project: Project): Map<String, Lazy<KotlinProjectStructureMetadata?>> {
return project
.rootProject
.allprojects
.associateBy { it.path }
.mapValues { (_, subProject) -> lazy { subProject.multiplatformExtensionOrNull?.kotlinProjectStructureMetadata } }
}
}
}