Include artifact classifier in name

Author: stringbean

src/main/scala/software/purpledragon/sbt/lock/DependencyUtils.scala

@@ -16,12 +16,11 @@
 
 package software.purpledragon.sbt.lock
 
-import java.time.Instant
-
 import sbt._
 import software.purpledragon.sbt.lock.model.{DependencyLockFile, DependencyRef, ResolvedArtifact, ResolvedDependency}
 
-import scala.collection.{immutable, mutable, SortedSet}
+import java.time.Instant
+import scala.collection.{SortedSet, immutable, mutable}
 
 object DependencyUtils {
   def resolve(updateReport: UpdateReport, configs: Seq[ConfigRef]): DependencyLockFile = {
@@ -64,16 +63,7 @@ object DependencyUtils {
       module: ModuleReport,
       checksumCache: mutable.Map[File, String]): ResolvedDependency = {
 
-    val artifacts: immutable.Seq[ResolvedArtifact] = module.artifacts map { case (artifact, file) =>
-      val hash = checksumCache.getOrElseUpdate(file, hashFile(file))
-
-      val qualifier = artifact.`type` match {
-        case "jar" | "bundle" => ""
-        case q => s"-$q"
-      }
-
-      ResolvedArtifact(s"${artifact.name}$qualifier.${artifact.extension}", hash)
-    }
+    val artifacts = module.artifacts.map(ResolvedArtifact.apply(_, checksumCache))
 
     ResolvedDependency(
       module.module.organization,
@@ -82,6 +72,4 @@ object DependencyUtils {
       artifacts.to[SortedSet],
       SortedSet.empty)
   }
-
-  private def hashFile(file: File): String = s"sha1:${Hash.toHex(Hash(file))}"
 }

src/main/scala/software/purpledragon/sbt/lock/model/ResolvedArtifact.scala

@@ -16,10 +16,34 @@
 
 package software.purpledragon.sbt.lock.model
 
+import java.io.File
+
+import sbt.{File, Hash}
+import sbt.librarymanagement.Artifact
+import software.purpledragon.sbt.lock.DependencyUtils.hashFile
+
+import scala.collection.mutable
 import scala.math.Ordered.orderingToOrdered
 
 final case class ResolvedArtifact(name: String, hash: String) extends Ordered[ResolvedArtifact] {
   override def compare(that: ResolvedArtifact): Int = {
     (name, hash) compare (that.name, that.hash)
   }
 }
+
+object ResolvedArtifact {
+  def apply(art: (Artifact, File), checksumCache: mutable.Map[File, String]): ResolvedArtifact = {
+    val (artifact, file) = art
+    val hash = checksumCache.getOrElseUpdate(file, hashFile(file))
+
+    val classifier = artifact.classifier.map(c => s"-$c").getOrElse("")
+    val qualifier = artifact.`type` match {
+      case "jar" | "bundle" => ""
+      case q => s"-$q"
+    }
+
+    ResolvedArtifact(s"${artifact.name}$classifier$qualifier.${artifact.extension}", hash)
+  }
+
+  private def hashFile(file: File): String = s"sha1:${Hash.toHex(Hash(file))}"
+}