From 9052c745b1be58ae6e1203bd61305e63618532cd Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 11 Oct 2021 19:27:25 +0900
Subject: [PATCH] re-enable `dependency-graph` tests

---
 .../src/main/scala/sbt/internal/graph/rendering/AsciiTree.scala | 2 +-
 .../main/scala/sbt/internal/graph/rendering/LicenseInfo.scala   | 2 +-
 .../src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt  | 2 +-
 .../dependency-graph/ignoreScalaLibrary/{pending => test}       | 0
 .../sbt-test/dependency-graph/toFileSubTask/{pending => test}   | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/{pending => test} (100%)
 rename sbt-app/src/sbt-test/dependency-graph/toFileSubTask/{pending => test} (100%)

diff --git a/main/src/main/scala/sbt/internal/graph/rendering/AsciiTree.scala b/main/src/main/scala/sbt/internal/graph/rendering/AsciiTree.scala
index 33f37513a..9fdf85cf7 100644
--- a/main/src/main/scala/sbt/internal/graph/rendering/AsciiTree.scala
+++ b/main/src/main/scala/sbt/internal/graph/rendering/AsciiTree.scala
@@ -36,7 +36,7 @@ object AsciiTree {
       module.id.idString +
         module.extraInfo +
         module.error.map(" (error: " + _ + ")").getOrElse("") +
-        module.evictedByVersion.map(_ formatted " (evicted by: %s)").getOrElse(""),
+        module.evictedByVersion.map(v => s" (evicted by: $v)").getOrElse(""),
       module.hadError
     )
 }
diff --git a/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala b/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala
index 27aa44708..d00209735 100644
--- a/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala
+++ b/main/src/main/scala/sbt/internal/graph/rendering/LicenseInfo.scala
@@ -20,7 +20,7 @@ object LicenseInfo {
       .map {
         case (license, modules) =>
           license.getOrElse("No license specified") + "\n" +
-            modules.map(_.id.idString formatted "\t %s").mkString("\n")
+            modules.map(m => s"\t ${m.id.idString}").mkString("\n")
       }
       .mkString("\n\n")
 }
diff --git a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt
index b2aec7b01..3e9fa7240 100644
--- a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/build.sbt
@@ -10,7 +10,7 @@ TaskKey[Unit]("check") := {
   val graph = (Test / dependencyTree / asString).value
   def sanitize(str: String): String = str.split('\n').drop(1).map(_.trim).mkString("\n")
   val expectedGraph =
-    """default:default-e95e05_2.9.2:0.1-SNAPSHOT [S]
+    """default:default-e95e05_2.12:0.1-SNAPSHOT [S]
       |  +-ch.qos.logback:logback-classic:1.0.7
       |  | +-ch.qos.logback:logback-core:1.0.7
       |  | +-org.slf4j:slf4j-api:1.6.6 (evicted by: 1.7.2)
diff --git a/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/pending b/sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/test
similarity index 100%
rename from sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/pending
rename to sbt-app/src/sbt-test/dependency-graph/ignoreScalaLibrary/test
diff --git a/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/pending b/sbt-app/src/sbt-test/dependency-graph/toFileSubTask/test
similarity index 100%
rename from sbt-app/src/sbt-test/dependency-graph/toFileSubTask/pending
rename to sbt-app/src/sbt-test/dependency-graph/toFileSubTask/test