From ee56140f5c154677f5300b93b2c7e0e85af87277 Mon Sep 17 00:00:00 2001
From: Ethan Atkins <contact@ethanatkins.com>
Date: Sun, 17 Nov 2019 12:34:19 -0800
Subject: [PATCH] Use logger in scripted instead of println

---
 build.sbt                                                   | 6 ++++--
 project/Scripted.scala                                      | 6 +++++-
 .../src/main/scala/sbt/scriptedtest/ScriptedTests.scala     | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build.sbt b/build.sbt
index 933904c6c..a3e41ede7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1115,7 +1115,8 @@ def scriptedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
     scriptedBufferLog.value,
     Def.setting(Scripted.scriptedParser(scriptedSource.value)).parsed,
     scriptedPrescripted.value,
-    scriptedLaunchOpts.value
+    scriptedLaunchOpts.value,
+    streams.value.log
   )
 }
 
@@ -1128,7 +1129,8 @@ def scriptedUnpublishedTask: Def.Initialize[InputTask[Unit]] = Def.inputTask {
     scriptedBufferLog.value,
     Def.setting(Scripted.scriptedParser(scriptedSource.value)).parsed,
     scriptedPrescripted.value,
-    scriptedLaunchOpts.value
+    scriptedLaunchOpts.value,
+    streams.value.log
   )
 }
 
diff --git a/project/Scripted.scala b/project/Scripted.scala
index 7c7fb2607..04acff63e 100644
--- a/project/Scripted.scala
+++ b/project/Scripted.scala
@@ -5,6 +5,8 @@ import java.lang.reflect.InvocationTargetException
 import sbt._
 import sbt.internal.inc.ScalaInstance
 import sbt.internal.inc.classpath.{ ClasspathUtilities, FilteredLoader }
+import sbt.ScriptedPlugin.autoImport._
+import sbt.util.Level
 
 object LocalScriptedPlugin extends AutoPlugin {
   override def requires = plugins.JvmPlugin
@@ -99,8 +101,10 @@ object Scripted {
       args: Seq[String],
       prescripted: File => Unit,
       launchOpts: Seq[String],
+      logger: Logger
   ): Unit = {
-    System.err.println(s"About to run tests: ${args.mkString("\n * ", "\n * ", "\n")}")
+    logger.info(s"About to run tests: ${args.mkString("\n * ", "\n * ", "\n")}")
+    logger.info("")
 
     // Force Log4J to not use a thread context classloader otherwise it throws a CCE
     sys.props(org.apache.logging.log4j.util.LoaderUtil.IGNORE_TCCL_PROPERTY) = "true"
diff --git a/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala b/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
index db1041c44..a7e10b161 100644
--- a/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
+++ b/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
@@ -64,7 +64,7 @@ final class ScriptedTests(
       val n = nme.getName
       val label = s"$g / $n"
       () => {
-        println(s"Running $label")
+        log.info(s"Running $label")
         val result = testResources.readWriteResourceDirectory(g, n) { testDirectory =>
           val buffer = new BufferedLogger(new FullLogger(log))
           val singleTestRunner = () => {
@@ -326,7 +326,7 @@ final class ScriptedTests(
       groupedTests.map {
         case ((group, name), originalDir) =>
           val label = s"$group/$name"
-          println(s"Running $label")
+          log.info(s"Running $label")
           // Copy test's contents and reload the sbt instance to pick them up
           IO.copyDirectory(originalDir, tempTestDir)