Upgrade to Scala 2.13.6, sbt 1.5.2

Author: smarter

project/Build.scala

@@ -104,8 +104,8 @@ object Build {
    *  scala-library.
    */
   def stdlibVersion(implicit mode: Mode): String = mode match {
-    case NonBootstrapped => "2.13.5"
-    case Bootstrapped => "2.13.5"
+    case NonBootstrapped => "2.13.6"
+    case Bootstrapped => "2.13.6"
   }
 
   val dottyOrganization = "org.scala-lang"
@@ -1387,6 +1387,7 @@ object Build {
       scriptedLaunchOpts ++= Seq(
         "-Dplugin.version=" + version.value,
         "-Dplugin.scalaVersion=" + dottyVersion,
+        "-Dplugin.scala2Version=" + stdlibVersion(Bootstrapped),
         "-Dplugin.scalaJSVersion=" + scalaJSVersion,
         "-Dsbt.boot.directory=" + ((ThisBuild / baseDirectory).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
       ),

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.0
+sbt.version=1.5.2

sbt-test/scala2-compat/erasure-scalajs/build.sbt

@@ -1,7 +1,7 @@
 lazy val scala2Lib = project.in(file("scala2Lib"))
   .enablePlugins(ScalaJSPlugin)
   .settings(
-    scalaVersion := "2.13.5"
+    scalaVersion := sys.props("plugin.scala2Version")
   )
 
 lazy val dottyApp = project.in(file("dottyApp"))

sbt-test/scala2-compat/erasure/build.sbt

@@ -1,6 +1,6 @@
 lazy val scala2Lib = project.in(file("scala2Lib"))
   .settings(
-    scalaVersion := "2.13.5"
+    scalaVersion := sys.props("plugin.scala2Version")
   )
 
 lazy val dottyApp = project.in(file("dottyApp"))

sbt-test/scala2-compat/i11173/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = project.in(file("lib"))
   .settings(

sbt-test/scala2-compat/i12109/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = project.in(file("lib"))
   .settings(

sbt-test/scala2-compat/i8001/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

sbt-test/scala2-compat/i8847/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val `i8847-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

sbt-test/scala2-compat/i9916a/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val `i9916a-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

sbt-test/scala2-compat/i9916b/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val `i9916b-lib` = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

sbt-test/scala2-compat/longnames/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)

sbt-test/scala2-compat/structural/build.sbt

@@ -1,5 +1,5 @@
 val scala3Version = sys.props("plugin.scalaVersion")
-val scala2Version = "2.13.5"
+val scala2Version = sys.props("plugin.scala2Version")
 
 lazy val lib = (project in file ("lib"))
   .settings(scalaVersion := scala2Version)