luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor refacto

This commit is contained in:
Alexandre Archambault 2017-02-02 02:06:38 +01:00
parent a6b9c845c2
commit 5559c5ce01
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/shared/src/main/scala/coursier/maven/MavenRepository.scala
View File

@ -90,20 +90,29 @@ final case class MavenRepository(
val root0 = if (root.endsWith("/")) root else root + "/" val root0 = if (root.endsWith("/")) root else root + "/"
val source = MavenSource(root0, changing, sbtAttrStub, authentication) val source = MavenSource(root0, changing, sbtAttrStub, authentication)
private def modulePath(
module: Module,
version: String
): Seq[String] =
module.organization.split('.').toSeq ++ Seq(
dirModuleName(module, sbtAttrStub),
version
)
private def urlFor(path: Seq[String]): String =
root0 + path.map(encodeURIComponent).mkString("/")
def projectArtifact( def projectArtifact(
module: Module, module: Module,
version: String, version: String,
versioningValue: Option[String] versioningValue: Option[String]
): Artifact = { ): Artifact = {
val path = module.organization.split('.').toSeq ++ Seq( val path = modulePath(module, version) :+
dirModuleName(module, sbtAttrStub),
version,
s"${module.name}-${versioningValue getOrElse version}.pom" s"${module.name}-${versioningValue getOrElse version}.pom"
)
Artifact( Artifact(
root0 + path.map(encodeURIComponent).mkString("/"), urlFor(path),
Map.empty, Map.empty,
Map.empty, Map.empty,
Attributes("pom", ""), Attributes("pom", ""),
@ -123,7 +132,7 @@ final case class MavenRepository(
val artifact = val artifact =
Artifact( Artifact(
root0 + path.map(encodeURIComponent).mkString("/"), urlFor(path),
Map.empty, Map.empty,
Map.empty, Map.empty,
Attributes("pom", ""), Attributes("pom", ""),
@ -141,15 +150,11 @@ final case class MavenRepository(
version: String version: String
): Option[Artifact] = { ): Option[Artifact] = {
val path = module.organization.split('.').toSeq ++ Seq( val path = modulePath(module, version) :+ "maven-metadata.xml"
dirModuleName(module, sbtAttrStub),
version,
"maven-metadata.xml"
)
val artifact = val artifact =
Artifact( Artifact(
root0 + path.map(encodeURIComponent).mkString("/"), urlFor(path),
Map.empty, Map.empty,
Map.empty, Map.empty,
Attributes("pom", ""), Attributes("pom", ""),