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

dependency-graph fixes

This commit is contained in:
Eugene Yokota 2021-02-06 22:58:12 -05:00
parent 51c123b506
commit a25d9e7114
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/scala/sbt/internal/graph/rendering/DOT.scala
View File

@ -29,7 +29,7 @@ object DOT {
style style
) )
} }
}.mkString("\n") }.sorted.mkString("\n")
def originWasEvicted(edge: Edge): Boolean = graph.module(edge._1).isEvicted def originWasEvicted(edge: Edge): Boolean = graph.module(edge._1).isEvicted
def targetWasEvicted(edge: Edge): Boolean = graph.module(edge._2).isEvicted def targetWasEvicted(edge: Edge): Boolean = graph.module(edge._2).isEvicted
@ -63,9 +63,9 @@ object DOT {
else "" else ""
""" "%s" -> "%s"%s""".format(e._1.idString, e._2.idString, extra) """ "%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 { sealed trait HTMLLabelRendering {

6
sbt/src/sbt-test/dependency-graph/testDotFileGeneration/build.sbt
View File

@ -21,13 +21,13 @@ lazy val test_project = project
| edge [ | edge [
| arrowtail="none" | 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=""] | "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=""] | "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"[label=<test_project<BR/><B>test_project_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"
| "justatransitivedependencyproject:justatransitivedependencyproject_2.9.2:0.1-SNAPSHOT" -> "justatransivitedependencyendpointproject:justatransivitedependencyendpointproject_2.9.2:0.1-SNAPSHOT" | "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" -> "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 """.stripMargin

4
sbt/src/sbt-test/dependency-graph/toFileSubTask/expected/licenses.txt
View File

@ -5,5 +5,5 @@ Apache-2.0
org.typelevel:cats-effect_2.12:2.2.0 org.typelevel:cats-effect_2.12:2.2.0
MIT MIT
org.typelevel:cats-kernel_2.12:2.2.0 org.typelevel:cats-core_2.12:2.2.0
org.typelevel:cats-core_2.12:2.2.0 org.typelevel:cats-kernel_2.12:2.2.0