[Gradle][Minor] LazyResolvedConfiguration: Make allResolvedDependencies lazy member

KT-49933
This commit is contained in:
Sebastian Sellmair
2023-01-18 11:36:06 +01:00
committed by Space Team
parent e8f671e824
commit bf078caef6
4 changed files with 16 additions and 14 deletions
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.MetadataDependencyResolution.ChooseVisibleSourceSets.MetadataProvider.ArtifactMetadataProvider
import org.jetbrains.kotlin.gradle.plugin.sources.internal
import org.jetbrains.kotlin.gradle.utils.LazyResolvedConfiguration
import org.jetbrains.kotlin.gradle.utils.allResolvedDependencies
import org.jetbrains.kotlin.gradle.utils.mergeWith
import java.util.*
@@ -65,14 +65,19 @@ open class MetadataDependencyTransformationTask
}
}
private val participatingSourceSets: Set<KotlinSourceSet> get() = participatingSourceSetsLazy?.value
?: error("`participatingSourceSets` is null. " +
"Probably it is accessed it during Task Execution with state loaded from Configuration Cache")
private val participatingSourceSets: Set<KotlinSourceSet>
get() = participatingSourceSetsLazy?.value
?: error(
"`participatingSourceSets` is null. " +
"Probably it is accessed it during Task Execution with state loaded from Configuration Cache"
)
private val parentTransformationTasks: List<TaskProvider<MetadataDependencyTransformationTask>> get() =
parentTransformationTasksLazy?.value
?: error("`parentTransformationTasks` is null. " +
"Probably it is accessed it during Task Execution with state loaded from Configuration Cache")
private val parentTransformationTasks: List<TaskProvider<MetadataDependencyTransformationTask>>
get() = parentTransformationTasksLazy?.value
?: error(
"`parentTransformationTasks` is null. " +
"Probably it is accessed it during Task Execution with state loaded from Configuration Cache"
)
@Suppress("unused") // Gradle input
@get:Input
@@ -7,11 +7,9 @@ package org.jetbrains.kotlin.gradle.plugin.mpp
import org.gradle.api.Project
import org.gradle.api.artifacts.result.ResolvedDependencyResult
import org.gradle.api.attributes.Usage
import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull
import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.utils.LazyResolvedConfiguration
import org.jetbrains.kotlin.gradle.utils.allResolvedDependencies
import org.jetbrains.kotlin.gradle.utils.dependencyArtifactsOrNull
import java.io.File
@@ -50,6 +50,10 @@ internal class LazyResolvedConfiguration private constructor(
}
}
internal val allResolvedDependencies: Set<ResolvedDependencyResult> by TransientLazy {
allDependencies.filterIsInstance<ResolvedDependencyResult>().toSet()
}
fun getArtifacts(dependency: ResolvedDependencyResult): List<ResolvedArtifactResult> {
val componentId = dependency.resolvedVariant.lastExternalVariantOrSelf().owner
return artifactsByComponentId[componentId] ?: emptyList()
@@ -67,10 +71,6 @@ internal class LazyResolvedConfiguration private constructor(
override fun toString(): String = "LazyResolvedConfiguration(configuration='$configurationName')"
}
internal val LazyResolvedConfiguration.allResolvedDependencies: Set<ResolvedDependencyResult>
get() = allDependencies
.filterIsInstance<ResolvedDependencyResult>()
.toSet()
/**
* Same as [LazyResolvedConfiguration.getArtifacts] except it returns null for cases when dependency is resolved