Make artifacts sorted sets

Author: stringbean

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

@@ -80,7 +80,7 @@ object DependencyUtils {
       module.module.organization,
       module.module.name,
       module.module.revision,
-      artifacts,
+      artifacts.to[SortedSet],
       SortedSet.empty)
   }
 

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

@@ -16,15 +16,17 @@
 
 package software.purpledragon.sbt.lock.model
 
+import scala.collection.SortedSet
+
 final case class ChangedDependency(
     org: String,
     name: String,
     oldVersion: String,
     newVersion: String,
-    oldArtifacts: Seq[ResolvedArtifact],
-    newArtifacts: Seq[ResolvedArtifact],
-    oldConfigurations: Set[String],
-    newConfigurations: Set[String]) {
+    oldArtifacts: SortedSet[ResolvedArtifact],
+    newArtifacts: SortedSet[ResolvedArtifact],
+    oldConfigurations: SortedSet[String],
+    newConfigurations: SortedSet[String]) {
 
   def versionChanged: Boolean = oldVersion != newVersion
   def configurationsChanged: Boolean = oldConfigurations != newConfigurations

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

@@ -82,8 +82,8 @@ final case class DependencyLockFile(
             otherDep.version,
             ourDep.artifacts,
             otherDep.artifacts,
-            ourDep.configurations.toSet,
-            otherDep.configurations.toSet)
+            ourDep.configurations,
+            otherDep.configurations)
         } else {
           changes
         }

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

@@ -16,4 +16,10 @@
 
 package software.purpledragon.sbt.lock.model
 
-final case class ResolvedArtifact(name: String, hash: String)
+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)
+  }
+}

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

@@ -23,7 +23,7 @@ final case class ResolvedDependency(
     org: String,
     name: String,
     version: String,
-    artifacts: Seq[ResolvedArtifact],
+    artifacts: SortedSet[ResolvedArtifact],
     configurations: SortedSet[String])
     extends Ordered[ResolvedDependency] {
 

src/test/scala/software/purpledragon/sbt/lock/model/DependencyLockFileSpec.scala

@@ -34,9 +34,9 @@ class DependencyLockFileSpec extends AnyFlatSpec with Matchers {
         "com.example",
         "package-1",
         "1.0.0",
-        Seq(ResolvedArtifact("package-1.jar", "hash-1")),
+        SortedSet(ResolvedArtifact("package-1.jar", "hash-1")),
         SortedSet("test-1")),
-      ResolvedDependency("com.example", "package-2", "1.2.0", Nil, SortedSet("test-2"))
+      ResolvedDependency("com.example", "package-2", "1.2.0", SortedSet.empty, SortedSet("test-2"))
     )
   )
 
@@ -82,7 +82,7 @@ class DependencyLockFileSpec extends AnyFlatSpec with Matchers {
       "com.example",
       "package-3",
       "3.0",
-      Seq(ResolvedArtifact("package-3.jar", "hash-3")),
+      SortedSet(ResolvedArtifact("package-3.jar", "hash-3")),
       SortedSet("test-1"))
 
     val left = TestLockFile
@@ -105,7 +105,7 @@ class DependencyLockFileSpec extends AnyFlatSpec with Matchers {
         "com.example",
         "package-1",
         "2.0.0",
-        Seq(ResolvedArtifact("package-1.jar", "hash-1a")),
+        SortedSet(ResolvedArtifact("package-1.jar", "hash-1a")),
         SortedSet("test-1", "test-2"))
     )
 
@@ -120,10 +120,10 @@ class DependencyLockFileSpec extends AnyFlatSpec with Matchers {
           "package-1",
           "1.0.0",
           "2.0.0",
-          Seq(ResolvedArtifact("package-1.jar", "hash-1")),
-          Seq(ResolvedArtifact("package-1.jar", "hash-1a")),
-          Set("test-1"),
-          Set("test-1", "test-2")
+          SortedSet(ResolvedArtifact("package-1.jar", "hash-1")),
+          SortedSet(ResolvedArtifact("package-1.jar", "hash-1a")),
+          SortedSet("test-1"),
+          SortedSet("test-1", "test-2")
         ))
     )
   }

src/test/scala/software/purpledragon/sbt/lock/model/LockFileStatusSpec.scala

@@ -165,7 +165,7 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
       .withDependencyChanges(
         Nil,
         Nil,
-        Seq(testChangedDependency(newVersion = "1.0", newConfigurations = Set("compile"))))
+        Seq(testChangedDependency(newVersion = "1.0", newConfigurations = SortedSet("compile"))))
       .toLongReport shouldBe expected
   }
 
@@ -176,7 +176,7 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
         |    com.example:artifact:[1.0]->[2.0] (compile,test)->(compile)""".stripMargin
 
     LockFileMatches
-      .withDependencyChanges(Nil, Nil, Seq(testChangedDependency(newConfigurations = Set("compile"))))
+      .withDependencyChanges(Nil, Nil, Seq(testChangedDependency(newConfigurations = SortedSet("compile"))))
       .toLongReport shouldBe expected
   }
 
@@ -206,14 +206,14 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
           testChangedDependency(
             org = "org.example",
             name = "version",
-            oldConfigurations = Set("compile"),
-            newConfigurations = Set("compile")),
+            oldConfigurations = SortedSet("compile"),
+            newConfigurations = SortedSet("compile")),
           testChangedDependency(
             org = "org.example",
             name = "configs",
             newVersion = "1.0",
-            newConfigurations = Set("compile")),
-          testChangedDependency(org = "org.example", name = "both", oldConfigurations = Set("compile"))
+            newConfigurations = SortedSet("compile")),
+          testChangedDependency(org = "org.example", name = "both", oldConfigurations = SortedSet("compile"))
         )
       )
       .toLongReport
@@ -226,17 +226,25 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
       name: String = "artifact",
       version: String = "1.0",
       configs: SortedSet[String] = SortedSet("compile", "test")): ResolvedDependency = {
-    ResolvedDependency(org, name, version, Nil, configs)
+    ResolvedDependency(org, name, version, SortedSet.empty, configs)
   }
 
   private def testChangedDependency(
       org: String = "com.example",
       name: String = "artifact",
       oldVersion: String = "1.0",
       newVersion: String = "2.0",
-      oldConfigurations: Set[String] = Set("compile", "test"),
-      newConfigurations: Set[String] = Set("compile", "test")): ChangedDependency = {
-
-    ChangedDependency(org, name, oldVersion, newVersion, Nil, Nil, oldConfigurations, newConfigurations)
+      oldConfigurations: SortedSet[String] = SortedSet("compile", "test"),
+      newConfigurations: SortedSet[String] = SortedSet("compile", "test")): ChangedDependency = {
+
+    ChangedDependency(
+      org,
+      name,
+      oldVersion,
+      newVersion,
+      SortedSet.empty,
+      SortedSet.empty,
+      oldConfigurations,
+      newConfigurations)
   }
 }