Changes in artifact definition

core/src/main/scala/coursier/core/Definitions.scala

@@ -101,29 +101,12 @@ object Versions {
 
 case class Artifact(
   url: String,
-  extra: Map[String, String],
+  checksumUrls: Map[String, String],
+  extra: Map[String, Artifact],
   attributes: Attributes
 )
 
 object Artifact {
-  val md5 = "md5"
-  val sha1 = "sha1"
-  val sig = "pgp"
-  val sigMd5 = "md5-pgp"
-  val sigSha1 = "sha1-pgp"
-  val sources = "src"
-  val sourcesMd5 = "md5-src"
-  val sourcesSha1 = "sha1-src"
-  val sourcesSig = "src-pgp"
-  val sourcesSigMd5 = "md5-src-pgp"
-  val sourcesSigSha1 = "sha1-src-pgp"
-  val javadoc = "javadoc"
-  val javadocMd5 = "md5-javadoc"
-  val javadocSha1 = "sha1-javadoc"
-  val javadocSig = "javadoc-pgp"
-  val javadocSigMd5 = "md5-javadoc-pgp"
-  val javadocSigSha1 = "sha1-javadoc-pgp"
-
   trait Source {
     def artifacts(dependency: Dependency, project: Project): Seq[Artifact]
   }

core/src/main/scala/coursier/core/Repository.scala

@@ -75,31 +75,25 @@ object Repository {
 
   implicit class ArtifactExtensions(val underlying: Artifact) extends AnyVal {
     def withDefaultChecksums: Artifact =
-      underlying.copy(extra = underlying.extra ++ Seq(
-        Artifact.md5 -> (underlying.url + ".md5"),
-        Artifact.sha1 -> (underlying.url + ".sha1")
+      underlying.copy(checksumUrls = underlying.checksumUrls ++ Seq(
+        "md5" -> (underlying.url + ".md5"),
+        "sha1" -> (underlying.url + ".sha1")
       ))
     def withDefaultSignature: Artifact =
       underlying.copy(extra = underlying.extra ++ Seq(
-        Artifact.sigMd5 -> (underlying.url + ".asc.md5"),
-        Artifact.sigSha1 -> (underlying.url + ".asc.sha1"),
-        Artifact.sig -> (underlying.url + ".asc")
+        "sig" ->
+          Artifact(underlying.url + ".asc", Map.empty, Map.empty, Attributes("asc", ""))
+            .withDefaultChecksums
       ))
     def withJavadocSources: Artifact = {
       val base = underlying.url.stripSuffix(".jar")
       underlying.copy(extra = underlying.extra ++ Seq(
-        Artifact.sourcesMd5 -> (base + "-sources.jar.md5"),
-        Artifact.sourcesSha1 -> (base + "-sources.jar.sha1"),
-        Artifact.sources -> (base + "-sources.jar"),
-        Artifact.sourcesSigMd5 -> (base + "-sources.jar.asc.md5"),
-        Artifact.sourcesSigSha1 -> (base + "-sources.jar.asc.sha1"),
-        Artifact.sourcesSig -> (base + "-sources.jar.asc"),
-        Artifact.javadocMd5 -> (base + "-javadoc.jar.md5"),
-        Artifact.javadocSha1 -> (base + "-javadoc.jar.sha1"),
-        Artifact.javadoc -> (base + "-javadoc.jar"),
-        Artifact.javadocSigMd5 -> (base + "-javadoc.jar.asc.md5"),
-        Artifact.javadocSigSha1 -> (base + "-javadoc.jar.asc.sha1"),
-        Artifact.javadocSig -> (base + "-javadoc.jar.asc")
+        "sources" -> Artifact(base + "-sources.jar", Map.empty, Map.empty, Attributes("jar", "src")) // Are these the right attributes?
+          .withDefaultChecksums
+          .withDefaultSignature,
+        "javadoc" -> Artifact(base + "-javadoc.jar", Map.empty, Map.empty, Attributes("jar", "javadoc")) // Same comment as above
+          .withDefaultChecksums
+          .withDefaultSignature
       ))
     }
   }
@@ -137,6 +131,7 @@ case class MavenSource(root: String, ivyLike: Boolean) extends Artifact.Source {
       Artifact(
         root + path.mkString("/"),
         Map.empty,
+        Map.empty,
         dependency.attributes
       )
       .withDefaultChecksums
@@ -150,19 +145,14 @@ case class MavenSource(root: String, ivyLike: Boolean) extends Artifact.Source {
           val javadocPath = root + ivyLikePath0("docs", "-javadoc", "jar").mkString("/")
 
           artifact
-            .copy(extra = artifact.extra ++ Map(
-              Artifact.sourcesMd5 -> (srcPath + ".md5"),
-              Artifact.sourcesSha1 -> (srcPath + ".sha1"),
-              Artifact.sources -> srcPath,
-              Artifact.sourcesSigMd5 -> (srcPath + ".asc.md5"),
-              Artifact.sourcesSigSha1 -> (srcPath + ".asc.sha1"),
-              Artifact.sourcesSig -> (srcPath + ".asc"),
-              Artifact.javadocMd5 -> (javadocPath + ".md5"),
-              Artifact.javadocSha1 -> (javadocPath + ".sha1"),
-              Artifact.javadoc -> javadocPath,
-              Artifact.javadocSigMd5 -> (javadocPath + ".asc.md5"),
-              Artifact.javadocSigSha1 -> (javadocPath + ".asc.sha1"),
-              Artifact.javadocSig -> (javadocPath + ".asc")
+            .copy(
+              extra = artifact.extra ++ Map(
+                "sources" -> Artifact(srcPath, Map.empty, Map.empty, Attributes("jar", "src")) // Are these the right attributes?
+                  .withDefaultChecksums
+                  .withDefaultSignature,
+                "javadoc" -> Artifact(javadocPath, Map.empty, Map.empty, Attributes("jar", "javadoc")) // Same comment as above
+                  .withDefaultChecksums
+                  .withDefaultSignature
             ))
         } else
           artifact
@@ -223,10 +213,8 @@ abstract class BaseMavenRepository(
 
     Artifact(
       path.mkString("/"),
-      Map(
-        Artifact.md5 -> "",
-        Artifact.sha1 -> ""
-      ),
+      Map.empty,
+      Map.empty,
       Attributes("pom", "")
     )
     .withDefaultSignature
@@ -246,6 +234,7 @@ abstract class BaseMavenRepository(
         Artifact(
           path.mkString("/"),
           Map.empty,
+          Map.empty,
           Attributes("pom", "")
         )
         .withDefaultChecksums