Skip to content
This repository was archived by the owner on Jul 7, 2022. It is now read-only.

Commit 4a62578

Browse files
committed
Fix formatting of pacakge url
For dependencies with some classifiers
1 parent eb32fda commit 4a62578

File tree

19 files changed

+72
-7
lines changed

19 files changed

+72
-7
lines changed

src/main/scala/ch/epfl/scala/GithubDependencyGraphPlugin.scala

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,8 @@ object GithubDependencyGraphPlugin extends AutoPlugin {
128128
val resolved =
129129
for ((moduleReport, configRef) <- moduleReports)
130130
yield {
131-
val module = moduleReport.module
132-
val moduleRef = getReference(module)
133-
val artifacts = moduleReport.artifacts.map { case (a, _) => a }
134-
val classifiers = artifacts.flatMap(_.classifier).filter(_ != "default")
135-
val packaging = if (classifiers.nonEmpty) "?" + classifiers.map(c => s"packaging=$c") else ""
136-
val packageUrl = s"pkg:maven/${module.organization}/${module.name}@${module.revision}$packaging"
131+
val moduleRef = getReference(moduleReport.module)
132+
val packageUrl = formatPackageUrl(moduleReport)
137133
val dependencies = allDependenciesMap.getOrElse(moduleRef, Vector.empty)
138134
val relationship =
139135
if (allDirectDependenciesRefs.contains(moduleRef)) DependencyRelationship.direct
@@ -153,6 +149,14 @@ object GithubDependencyGraphPlugin extends AutoPlugin {
153149
githubapi.Manifest(projectModuleRef, file, metadata, resolved.toMap)
154150
}
155151

152+
private def formatPackageUrl(moduleReport: ModuleReport): String = {
153+
val module = moduleReport.module
154+
val artifacts = moduleReport.artifacts.map { case (a, _) => a }
155+
val classifiers = artifacts.flatMap(_.classifier).filter(_ != "default")
156+
val packaging = if (classifiers.nonEmpty) "?" + classifiers.map(c => s"packaging=$c").mkString("&") else ""
157+
s"pkg:maven/${module.organization}/${module.name}@${module.revision}$packaging"
158+
}
159+
156160
private def isRuntime(config: ConfigRef): Boolean = runtimeConfigs.contains(config)
157161

158162
private def githubCIEnv(name: String): String =

0 commit comments

Comments
 (0)