Merge pull request #6688 from xuwei-k/ignoreScalaLibrary-test

re-enable `dependency-graph` scripted tests
This commit is contained in:
eugene yokota 2021-10-11 12:05:50 -04:00 committed by GitHub
commit 7b899f035e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 3 deletions

View File

@ -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
)
}

View File

@ -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")
}

View File

@ -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)