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

[Gradle] Refactor ResolvedDependencyGraph to instantiate via secondary constructor

Browse Source
This commit is contained in:
Anton Lakotka
2022-06-17 15:55:57 +02:00
committed by Space
parent 3260c33c16
commit 54024ccb09
2 changed files with 10 additions and 9 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/targets/native/tasks/KotlinNativeTasks.kt
+2 -2
View File
@@ -561,7 +561,7 @@ constructor(
val exportLibraries: FileCollection get() = exportLibrariesResolvedGraph?.files ?: objectFactory.fileCollection() val exportLibraries: FileCollection get() = exportLibrariesResolvedGraph?.files ?: objectFactory.fileCollection()
private val exportLibrariesResolvedGraph = if (binary is AbstractNativeLibrary) { private val exportLibrariesResolvedGraph = if (binary is AbstractNativeLibrary) {
ResolvedDependencyGraph.fromConfiguration(project.configurations.getByName(binary.exportConfigurationName)) ResolvedDependencyGraph(project.configurations.getByName(binary.exportConfigurationName))
} else { } else {
null null
} }
@@ -640,7 +640,7 @@ constructor(
@get:Internal @get:Internal
internal abstract val konanPropertiesService: Property<KonanPropertiesBuildService> internal abstract val konanPropertiesService: Property<KonanPropertiesBuildService>
private val resolvedDependencyGraph = ResolvedDependencyGraph.fromConfiguration( private val resolvedDependencyGraph = ResolvedDependencyGraph(
project.configurations.getByName(compilation.compileDependencyConfigurationName) project.configurations.getByName(compilation.compileDependencyConfigurationName)
) )
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/configurations.kt
+8 -7
View File
@@ -31,6 +31,14 @@ private constructor(
private val resolvedComponentsRootProvider: Lazy<ResolvedComponentResult>, private val resolvedComponentsRootProvider: Lazy<ResolvedComponentResult>,
private val artifactCollection: ArtifactCollection private val artifactCollection: ArtifactCollection
) { ) {
constructor(configuration: Configuration) : this(
// Calling resolutionResult doesn't actually trigger resolution. But accessing its root ResolvedComponentResult
// via ResolutionResult::root does. ResolutionResult can't be serialised for Configuration Cache
// but ResolvedComponentResult can. Wrapping it in `lazy` makes it resolve upon serialisation.
resolvedComponentsRootProvider = configuration.incoming.resolutionResult.let { rr -> lazy { rr.root } },
artifactCollection = configuration.incoming.artifacts // lazy ArtifactCollection
)
val root get() = resolvedComponentsRootProvider.value val root get() = resolvedComponentsRootProvider.value
val files: FileCollection get() = artifactCollection.artifactFiles val files: FileCollection get() = artifactCollection.artifactFiles
val artifacts get() = artifactCollection.artifacts val artifacts get() = artifactCollection.artifacts
@@ -52,11 +60,4 @@ private constructor(
val componentId = dependency.selected.id val componentId = dependency.selected.id
return artifactsByComponentId[componentId] ?: emptyList() return artifactsByComponentId[componentId] ?: emptyList()
} }
companion object {
fun fromConfiguration(configuration: Configuration) = ResolvedDependencyGraph(
resolvedComponentsRootProvider = configuration.incoming.resolutionResult.let { rr -> lazy { rr.root } },
artifactCollection = configuration.incoming.artifacts
)
}
} }