sbl/gradle2nix
1
0
Fork 0
mirror of https://github.com/tadfisher/gradle2nix.git synced 2026-01-11 23:40:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependency resolution for plugins in buildSrc

Browse Source
This commit is contained in:
Tad Fisher
2020-04-27 17:42:58 -07:00
parent 23cb225ccf
commit dd5d60e835
16 changed files with 761 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/main/kotlin/org/nixos/gradle2nix/ConfigurationResolver.kt
View File

@@ -52,12 +52,12 @@ internal class ConfigurationResolver(
private val ivy = Ivy.newInstance(ivySettings)
fun resolve(configuration: Configuration): List<DefaultArtifact> {
val resolved = configuration.resolvedConfiguration
val resolved = configuration.resolvedConfiguration.lenientConfiguration
val topLevelMetadata = resolved.firstLevelModuleDependencies
.flatMap { resolveMetadata(it.moduleGroup, it.moduleName, it.moduleVersion) }
val allArtifacts = resolved.resolvedArtifacts
val allArtifacts = resolved.artifacts
.filter { it.id.componentIdentifier is ModuleComponentIdentifier }
.flatMap(::resolve)
@@ -205,7 +205,7 @@ internal class ConfigurationResolver(
val seen = mutableSetOf<ComponentArtifactIdentifier>()
return generateSequence(listOf(this)) { descs ->
val parents = descs.flatMap { it.parentDescriptors(seen) }
seen.addAll(parents.map(ResolvedArtifactResult::id))
seen.addAll(parents.map(ResolvedArtifactResult::getId))
parents.takeUnless { it.isEmpty() }
}.flatten().distinct().toList()
}

5
plugin/src/main/kotlin/org/nixos/gradle2nix/PluginResolver.kt
View File

@@ -10,8 +10,9 @@ internal open class PluginResolver @Inject constructor(
) {
private val configurations = pluginDependencyResolutionServices.configurationContainer
private val resolver = ConfigurationResolverFactory(pluginDependencyResolutionServices.resolveRepositoryHandler)
.create(pluginDependencyResolutionServices.dependencyHandler)
private val resolver = ConfigurationResolverFactory(
pluginDependencyResolutionServices.resolveRepositoryHandler
).create(pluginDependencyResolutionServices.dependencyHandler)
fun resolve(pluginRequests: List<PluginRequest>): List<DefaultArtifact> {
val markerDependencies = pluginRequests.map {