From a25d9e71146ffaafb25d80c2ac647866c8fb35eb Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 6 Feb 2021 22:58:12 -0500
Subject: [PATCH] dependency-graph fixes

---
 main/src/main/scala/sbt/internal/graph/rendering/DOT.scala  | 6 +++---
 .../dependency-graph/testDotFileGeneration/build.sbt        | 6 +++---
 .../dependency-graph/toFileSubTask/expected/licenses.txt    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
index 2c7c428fa..b7e347d63 100644
--- a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
+++ b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
@@ -29,7 +29,7 @@ object DOT {
           style
         )
       }
-    }.mkString("\n")
+    }.sorted.mkString("\n")
 
     def originWasEvicted(edge: Edge): Boolean = graph.module(edge._1).isEvicted
     def targetWasEvicted(edge: Edge): Boolean = graph.module(edge._2).isEvicted
@@ -63,9 +63,9 @@ object DOT {
           else ""
         """    "%s" -> "%s"%s""".format(e._1.idString, e._2.idString, extra)
       }
-    }.mkString("\n")
+    }.sorted.mkString("\n")
 
-    "%s\n%s\n%s\n}".format(dotHead, nodes, edges)
+    s"$dotHead\n$nodes\n$edges\n}"
   }
 
   sealed trait HTMLLabelRendering {
diff --git a/sbt/src/sbt-test/dependency-graph/testDotFileGeneration/build.sbt b/sbt/src/sbt-test/dependency-graph/testDotFileGeneration/build.sbt
index 313bcc9d7..fc61f4b22 100644
--- a/sbt/src/sbt-test/dependency-graph/testDotFileGeneration/build.sbt
+++ b/sbt/src/sbt-test/dependency-graph/testDotFileGeneration/build.sbt
@@ -21,13 +21,13 @@ lazy val test_project = project
             |    edge [
             |        arrowtail="none"
             |    ]
-            |    "test_project:test_project_2.9.2:0.1-SNAPSHOT"[label=<test_project<BR/><B>test_project_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
+            |    "justadependencyproject:justadependencyproject_2.9.2:0.1-SNAPSHOT"[label=<justadependencyproject<BR/><B>justadependencyproject_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
             |    "justatransitivedependencyproject:justatransitivedependencyproject_2.9.2:0.1-SNAPSHOT"[label=<justatransitivedependencyproject<BR/><B>justatransitivedependencyproject_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
             |    "justatransivitedependencyendpointproject:justatransivitedependencyendpointproject_2.9.2:0.1-SNAPSHOT"[label=<justatransivitedependencyendpointproject<BR/><B>justatransivitedependencyendpointproject_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
-            |    "justadependencyproject:justadependencyproject_2.9.2:0.1-SNAPSHOT"[label=<justadependencyproject<BR/><B>justadependencyproject_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
-            |    "test_project:test_project_2.9.2:0.1-SNAPSHOT" -> "justatransitivedependencyproject:justatransitivedependencyproject_2.9.2:0.1-SNAPSHOT"
+            |    "test_project:test_project_2.9.2:0.1-SNAPSHOT"[label=<test_project<BR/><B>test_project_2.9.2</B><BR/>0.1-SNAPSHOT> style=""]
             |    "justatransitivedependencyproject:justatransitivedependencyproject_2.9.2:0.1-SNAPSHOT" -> "justatransivitedependencyendpointproject:justatransivitedependencyendpointproject_2.9.2:0.1-SNAPSHOT"
             |    "test_project:test_project_2.9.2:0.1-SNAPSHOT" -> "justadependencyproject:justadependencyproject_2.9.2:0.1-SNAPSHOT"
+            |    "test_project:test_project_2.9.2:0.1-SNAPSHOT" -> "justatransitivedependencyproject:justatransitivedependencyproject_2.9.2:0.1-SNAPSHOT"
             |}
           """.stripMargin
 
diff --git a/sbt/src/sbt-test/dependency-graph/toFileSubTask/expected/licenses.txt b/sbt/src/sbt-test/dependency-graph/toFileSubTask/expected/licenses.txt
index 012b770f5..87c4c5e6c 100644
--- a/sbt/src/sbt-test/dependency-graph/toFileSubTask/expected/licenses.txt
+++ b/sbt/src/sbt-test/dependency-graph/toFileSubTask/expected/licenses.txt
@@ -5,5 +5,5 @@ Apache-2.0
 	 org.typelevel:cats-effect_2.12:2.2.0
 
 MIT
-	 org.typelevel:cats-kernel_2.12:2.2.0
-	 org.typelevel:cats-core_2.12:2.2.0
\ No newline at end of file
+	 org.typelevel:cats-core_2.12:2.2.0
+	 org.typelevel:cats-kernel_2.12:2.2.0
\ No newline at end of file