Merge pull request #6711 from xuwei-k/fix-scala-2-13-warn

fix Scala 2.13 warnings

main/src/test/scala/ParseKey.scala

@@ -173,7 +173,7 @@ object ParseKey extends Properties {
         .log(s"Key: ${Scope.displayPedantic(key.scope, key.key.label)}")
         .log(s"Mask: $mask")
         .log(s"Key string: '$s'")
-        .log(s"Parsed: ${parsed.right.map(displayFull)}")
+        .log(s"Parsed: ${parsed.map(displayFull)}")
         .log(s"Structure: $structure")
       )
   }

main/src/test/scala/sbt/internal/InstallSbtnSpec.scala

@@ -41,7 +41,7 @@ class InstallSbtnSpec extends AnyFlatSpec {
         val tmpDir = Files.createTempDirectory("sbtn-test").toRealPath()
         Files.createDirectories(tmpDir.resolve("project"))
         val foo = tmpDir.resolve("foo")
-        val fooPath = foo.toString.replaceAllLiterally("\\", "\\\\")
+        val fooPath = foo.toString.replace("\\", "\\\\")
         val build = s"""TaskKey[Unit]("foo") := IO.write(file("$fooPath"), "foo")"""
         IO.write(tmpDir.resolve("build.sbt").toFile, build)
         IO.write(

main/src/test/scala/sbt/internal/StressGCMonitor.scala

@@ -19,7 +19,7 @@ object StressGCMonitor {
     new GCMonitor(ConsoleLogger())
     val deadline = Deadline.now + 10.seconds
     while (!deadline.isOverdue()) {
-      println(deadline.timeLeft.toSeconds + " seconds left...")
+      println(s"${deadline.timeLeft.toSeconds} seconds left...")
       list = List.fill(1000 * 1000 * 100)(Random.nextInt(100))
       System.gc()
       Thread.sleep(10)

main/src/test/scala/sbt/internal/TestBuild.scala

@@ -51,7 +51,7 @@ abstract class TestBuild {
   def tGen = genTasks(kebabIdGen, MaxDepsGen, MaxTasksGen)
 
   class TestKeys(val env: Env, val scopes: Seq[Scope]) {
-    override def toString = env + "\n" + scopes.mkString("Scopes:\n\t", "\n\t", "")
+    override def toString = env.toString + "\n" + scopes.mkString("Scopes:\n\t", "\n\t", "")
     lazy val delegated = scopes map env.delegates
   }