From 48616cc57dace88500b4ead9655ebb6f4f381537 Mon Sep 17 00:00:00 2001 From: meil Date: Fri, 26 Jun 2020 00:20:39 +0900 Subject: [PATCH] fix for gradle 6.0 --- .../internal/artifacts/DependencyGraphLoader.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/internal/artifacts/DependencyGraphLoader.kt b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/internal/artifacts/DependencyGraphLoader.kt index 7376606..2fa1ff6 100644 --- a/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/internal/artifacts/DependencyGraphLoader.kt +++ b/plugin-core/src/main/kotlin/net/meilcli/librarian/plugin/internal/artifacts/DependencyGraphLoader.kt @@ -7,7 +7,7 @@ import net.meilcli.librarian.plugin.entities.DependencyGraph import net.meilcli.librarian.plugin.internal.ILoader import org.gradle.api.Project import org.gradle.api.artifacts.Configuration -import org.gradle.api.artifacts.ResolvedArtifact +import org.gradle.api.artifacts.ModuleVersionIdentifier import org.gradle.api.artifacts.ResolvedDependency import org.slf4j.LoggerFactory @@ -30,11 +30,11 @@ class DependencyGraphLoader( return projects.contains(project) } - fun addArtifact(project: Project, configuration: Configuration, resolvedArtifact: ResolvedArtifact) { + fun addArtifact(project: Project, configuration: Configuration, moduleVersionIdentifier: ModuleVersionIdentifier) { val artifact = Artifact( - resolvedArtifact.moduleVersion.id.group, - resolvedArtifact.moduleVersion.id.name, - resolvedArtifact.moduleVersion.id.version + moduleVersionIdentifier.group, + moduleVersionIdentifier.name, + moduleVersionIdentifier.version ) if (ignoreArtifacts.any { artifact.artifact.startsWith(it) }) { @@ -143,8 +143,11 @@ class DependencyGraphLoader( LibrarianDepth.FirstLevel -> resolvedDependency.moduleArtifacts LibrarianDepth.AllLevel -> resolvedDependency.allModuleArtifacts } + + // in Gradle 6.0, some artifact is skipped resolvedArtifacts, so add resolvedDependency + context.addArtifact(project, configuration, resolvedDependency.module.id) for (resolvedArtifact in resolvedArtifacts) { - context.addArtifact(project, configuration, resolvedArtifact) + context.addArtifact(project, configuration, resolvedArtifact.moduleVersion.id) } } }