Overloaded without passing null.

This commit is contained in:
kijuky 2021-10-19 13:51:15 +09:00
parent 76c1b68516
commit 890ecdc556
1 changed files with 7 additions and 3 deletions

View File

@ -81,7 +81,7 @@ object DependencyTreeSettings {
}, },
dependencyTreeModuleGraphStore := (dependencyTreeModuleGraph0 storeAs dependencyTreeModuleGraphStore triggeredBy dependencyTreeModuleGraph0).value, dependencyTreeModuleGraphStore := (dependencyTreeModuleGraph0 storeAs dependencyTreeModuleGraphStore triggeredBy dependencyTreeModuleGraph0).value,
) ++ { ) ++ {
renderingTaskSettings(dependencyTree, null) :+ { renderingTaskSettings(dependencyTree) :+ {
dependencyTree / asString := { dependencyTree / asString := {
rendering.AsciiTree.asciiTree(dependencyTreeModuleGraph0.value, asciiGraphWidth.value) rendering.AsciiTree.asciiTree(dependencyTreeModuleGraph0.value, asciiGraphWidth.value)
} }
@ -149,7 +149,7 @@ object DependencyTreeSettings {
output output
}, },
) ++ ) ++
renderingAlternatives.flatMap((renderingTaskSettings _).tupled) renderingAlternatives.flatMap { case (key, renderer) => renderingTaskSettings(key, renderer) }
def renderingAlternatives: Seq[(TaskKey[Unit], ModuleGraph => String)] = def renderingAlternatives: Seq[(TaskKey[Unit], ModuleGraph => String)] =
Seq( Seq(
@ -159,13 +159,17 @@ object DependencyTreeSettings {
) )
def renderingTaskSettings(key: TaskKey[Unit], renderer: ModuleGraph => String): Seq[Setting[_]] = def renderingTaskSettings(key: TaskKey[Unit], renderer: ModuleGraph => String): Seq[Setting[_]] =
renderingTaskSettings(key) :+ {
key / asString := renderer(dependencyTreeModuleGraph0.value)
}
def renderingTaskSettings(key: TaskKey[Unit]): Seq[Setting[_]] =
Seq( Seq(
key := { key := {
val s = streams.value val s = streams.value
val str = (key / asString).value val str = (key / asString).value
s.log.info(str) s.log.info(str)
}, },
key / asString := renderer(dependencyTreeModuleGraph0.value),
key / toFile := { key / toFile := {
val (targetFile, force) = targetFileAndForceParser.parsed val (targetFile, force) = targetFileAndForceParser.parsed
writeToFile(key.key.label, (key / asString).value, targetFile, force, streams.value) writeToFile(key.key.label, (key / asString).value, targetFile, force, streams.value)