From 890ecdc5568f16c3da8a6b2b5cda8683d7412c1c Mon Sep 17 00:00:00 2001 From: kijuky <40358+kijuky@users.noreply.github.com> Date: Tue, 19 Oct 2021 13:51:15 +0900 Subject: [PATCH] Overloaded without passing null. --- .../scala/sbt/plugins/DependencyTreeSettings.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala index 8bb53036b..2ffe91128 100644 --- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala +++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala @@ -81,7 +81,7 @@ object DependencyTreeSettings { }, dependencyTreeModuleGraphStore := (dependencyTreeModuleGraph0 storeAs dependencyTreeModuleGraphStore triggeredBy dependencyTreeModuleGraph0).value, ) ++ { - renderingTaskSettings(dependencyTree, null) :+ { + renderingTaskSettings(dependencyTree) :+ { dependencyTree / asString := { rendering.AsciiTree.asciiTree(dependencyTreeModuleGraph0.value, asciiGraphWidth.value) } @@ -149,7 +149,7 @@ object DependencyTreeSettings { output }, ) ++ - renderingAlternatives.flatMap((renderingTaskSettings _).tupled) + renderingAlternatives.flatMap { case (key, renderer) => renderingTaskSettings(key, renderer) } def renderingAlternatives: Seq[(TaskKey[Unit], ModuleGraph => String)] = Seq( @@ -159,13 +159,17 @@ object DependencyTreeSettings { ) 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( key := { val s = streams.value val str = (key / asString).value s.log.info(str) }, - key / asString := renderer(dependencyTreeModuleGraph0.value), key / toFile := { val (targetFile, force) = targetFileAndForceParser.parsed writeToFile(key.key.label, (key / asString).value, targetFile, force, streams.value)