Merge pull request #929 from eed3si9n/wip/bumputil

Upgrade to Util 1.4.0

build.sbt

@@ -53,6 +53,7 @@ ThisBuild / version := {
       else old
   }
 }
+ThisBuild / versionScheme := Some("early-semver")
 ThisBuild / organization := "org.scala-sbt"
 ThisBuild / licenses := List(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")))
 ThisBuild / scalafmtOnCompile := !(Global / insideCI).value

internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala

@@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets
 import java.util.logging.Level
 
 import sbt.internal.util.{ ConsoleAppender, MainAppender, ManagedLogger }
-import sbt.util.LogExchange
+import sbt.util.LoggerContext
 import sbt.util.{ Level => SbtLevel }
 import xsbti.{ Position, Reporter, ReporterConfig }
 
@@ -91,13 +91,11 @@ object ReporterManager {
     val printWriterToAppender = MainAppender.defaultBacked(config.useColor())
     val appender = printWriterToAppender(toOutput)
     val freshName = generateZincReporterId(config.loggerName())
-    val logger = LogExchange.logger(freshName)
+    val logger = LoggerContext.globalContext.logger(freshName, None, None)
     val loggerName = logger.name
-
-    LogExchange.unbindLoggerAppenders(loggerName)
+    LoggerContext.globalContext.clearAppenders(loggerName)
     val sbtLogLevel = fromJavaLogLevel(config.logLevel())
-    val toAppend = List(appender -> sbtLogLevel)
-    LogExchange.bindLoggerAppenders(loggerName, toAppend)
+    LoggerContext.globalContext.addAppender(loggerName, appender -> sbtLogLevel)
     getReporter(logger, config)
   }
 

internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala

@@ -29,7 +29,7 @@ import xsbti.compile.{
   JavaTools => XJavaTools
 }
 import sbt.io.IO
-import sbt.util.LogExchange
+import sbt.util.LoggerContext
 import org.scalatest.matchers._
 import org.scalatest.diagrams.Diagrams
 
@@ -243,7 +243,7 @@ class JavaCompilerSpec extends UnitSpec with Diagrams {
       output: Path,
       incToolOptions: IncToolOptions = IncToolOptionsUtil.defaultIncToolOptions()
   ): (Boolean, Array[Problem]) = {
-    val log = LogExchange.logger("JavaCompilerSpec")
+    val log = LoggerContext.globalContext.logger("JavaCompilerSpec", None, None)
     val reporter = new ManagedLoggedReporter(10, log)
     val result = c.javac.run(
       sources.map(x => PlainVirtualFile(x)).toArray,
@@ -263,7 +263,7 @@ class JavaCompilerSpec extends UnitSpec with Diagrams {
       output: Path,
       incToolOptions: IncToolOptions = IncToolOptionsUtil.defaultIncToolOptions()
   ): (Boolean, Array[Problem]) = {
-    val log = LogExchange.logger("JavaCompilerSpec")
+    val log = LoggerContext.globalContext.logger("JavaCompilerSpec", None, None)
     val reporter = new ManagedLoggedReporter(10, log)
     val result = c.javadoc.run(
       sources.map(x => PlainVirtualFile(x)).toArray,

internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala

@@ -805,8 +805,13 @@ case class ProjectStructure(
       val problems = getProblems().filter(_.severity == severity)
       problems.lift(index) match {
         case Some(problem) =>
-          val msg = s"'${problem.message}' doesn't contain '$expected'."
-          assert(problem.message.contains(expected), msg)
+          val problemMessage: String = problem.message
+          // See ScriptedTests.scala.
+          // val handlersAndStatements = parser.parse(file.toFile, true) doesn't correctly parse
+          val dropQuotes =
+            if (expected.startsWith("\"")) expected.drop(1).dropRight(1)
+            else expected
+          assert(problemMessage.contains(dropQuotes), s"'$problemMessage' doesn't contain '$dropQuotes'.")
         case None =>
           throw new TestFailed(
             s"Problem not found: $index (there are ${problems.length} problem with severity $severity)."

internal/zinc-scripted/src/test/scala/sbt/internal/inc/ScriptedTests.scala

@@ -21,7 +21,7 @@ import sbt.io.FileFilter._
 import sbt.internal.io.Resources
 import sbt.internal.util.BufferedAppender
 import sbt.internal.util.{ ConsoleAppender, ConsoleOut, ManagedLogger, TraceEvent }
-import sbt.util.{ Level, LogExchange }
+import sbt.util.{ Level, LoggerContext }
 
 final class ScriptedTests(
     resourceBaseDirectory: Path,
@@ -98,15 +98,15 @@ final class ScriptedTests(
     val writer = new BufferedWriter(new FileWriter(logFile.toFile), BufferSize)
     val fileOut = ConsoleOut.bufferedWriterOut(writer)
     val fileAppender = ConsoleAppender(name, fileOut, useFormat = false)
-    LogExchange.bindLoggerAppenders(name, List(fileAppender -> Level.Debug))
+    LoggerContext.globalContext.addAppender(name, fileAppender -> Level.Debug)
     logger
   }
 
   private def createBatchLogger(name: String): ScriptedLogger = {
-    val logger = LogExchange.logger(name)
+    val logger = LoggerContext.globalContext.logger(name, None, None)
     val outAppender = BufferedAppender(ConsoleAppender())
-    LogExchange.unbindLoggerAppenders(name)
-    LogExchange.bindLoggerAppenders(name, List(outAppender -> outLevel))
+    LoggerContext.globalContext.clearAppenders(name)
+    LoggerContext.globalContext.addAppender(name, outAppender -> outLevel)
     ScriptedLogger(logger, outAppender)
   }
 
@@ -215,7 +215,7 @@ final class ScriptedTests(
       .andFinally(buffer.stopBuffer())
       .apply {
         val parser = new TestScriptParser(handlers)
-        val handlersAndStatements = parser.parse(file.toFile)
+        val handlersAndStatements = parser.parse(file.toFile, false)
         runner.run(handlersAndStatements, states)
 
         // Handle successful tests

internal/zinc-testing/src/main/scala/sbt/internal/inc/UnitSpec.scala

@@ -15,7 +15,7 @@ package inc
 
 import org.scalatest.flatspec.AnyFlatSpec
 import org.scalatest.matchers.should.Matchers
-import sbt.util.{ LogExchange, Level }
+import sbt.util.{ LoggerContext, Level }
 import sbt.internal.util.{ ManagedLogger, ConsoleOut, MainAppender }
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -32,9 +32,9 @@ object UnitSpec {
   val generateId: AtomicInteger = new AtomicInteger
   def newLogger(level: Level.Value): ManagedLogger = {
     val loggerName = "test-" + generateId.incrementAndGet
-    val x = LogExchange.logger(loggerName)
-    LogExchange.unbindLoggerAppenders(loggerName)
-    LogExchange.bindLoggerAppenders(loggerName, (consoleAppender -> level) :: Nil)
+    val x = LoggerContext.globalContext.logger(loggerName, None, None)
+    LoggerContext.globalContext.clearAppenders(loggerName)
+    LoggerContext.globalContext.addAppender(loggerName, consoleAppender -> level)
     x
   }
 }

project/Dependencies.scala

@@ -12,8 +12,8 @@ object Dependencies {
   val allScalaVersions = Seq(defaultScalaVersion, scala210, scala211, scala213)
   val scala212_213 = Seq(defaultScalaVersion, scala213)
 
-  private val ioVersion = nightlyVersion.getOrElse("1.4.0-M3")
-  private val utilVersion = nightlyVersion.getOrElse("1.3.0")
+  private val ioVersion = nightlyVersion.getOrElse("1.4.0")
+  private val utilVersion = nightlyVersion.getOrElse("1.4.0")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion