diff --git a/internal/util-collection/src/main/scala/sbt/internal/util/HList.scala b/internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
index 0eb4edd42..95e60cb05 100644
--- a/internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
+++ b/internal/util-collection/src/main/scala/sbt/internal/util/HList.scala
@@ -36,5 +36,5 @@ final case class HCons[H, T <: HList](head: H, tail: T) extends HList {
object HList {
// contains no type information: not even A
implicit def fromList[A](list: Traversable[A]): HList =
- ((HNil: HList) /: list)((hl, v) => HCons(v, hl))
+ list.foldLeft(HNil: HList)((hl, v) => HCons(v, hl))
}
diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala
index e0c95b2c8..16e2db2e6 100644
--- a/main/src/main/scala/sbt/PluginCross.scala
+++ b/main/src/main/scala/sbt/PluginCross.scala
@@ -96,7 +96,7 @@ private[sbt] object PluginCross {
VersionNumber(sv) match {
case VersionNumber(Seq(0, 12, _*), _, _) => "2.9.2"
case VersionNumber(Seq(0, 13, _*), _, _) => "2.10.7"
- case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.8"
+ case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.10"
case _ => sys.error(s"Unsupported sbt binary version: $sv")
}
}
diff --git a/main/src/main/scala/sbt/internal/KeyIndex.scala b/main/src/main/scala/sbt/internal/KeyIndex.scala
index b79d27bfb..eec1c5d4f 100644
--- a/main/src/main/scala/sbt/internal/KeyIndex.scala
+++ b/main/src/main/scala/sbt/internal/KeyIndex.scala
@@ -42,7 +42,7 @@ object KeyIndex {
Aggregation.aggregate(key, ScopeMask(), extra, reverse = true)
case _ => Nil
}
- (base(projects, configurations) /: toAggregate) {
+ toAggregate.foldLeft(base(projects, configurations)) {
case (index, Nil) => index
case (index, keys) => keys.foldLeft(index)(_ add _)
}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0a3aa0bc5..e8ed09edb 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies {
// WARNING: Please Scala update versions in PluginCross.scala too
- val scala212 = "2.12.8"
+ val scala212 = "2.12.10"
lazy val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
val baseScalaVersion = scala212
def nightlyVersion: Option[String] = sys.props.get("sbt.build.version")
@@ -112,7 +112,7 @@ object Dependencies {
def addSbtZincCompileCore(p: Project): Project =
addSbtModule(p, sbtZincPath, "zincCompileCore", zincCompileCore)
- val lmCoursierVersion = "2.0.0-RC3-3"
+ val lmCoursierVersion = "2.0.0-RC3-4"
val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % lmCoursierVersion
val sjsonNewScalaJson = Def.setting {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4e8ef9422..67659a3df 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,10 +1,10 @@
-scalaVersion := "2.12.8"
+scalaVersion := "2.12.10"
scalacOptions ++= Seq("-feature", "-language:postfixOps")
-addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2")
-addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
-addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
+addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.14")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
diff --git a/sbt/src/sbt-test/actions/cross-incremental/build.sbt b/sbt/src/sbt-test/actions/cross-incremental/build.sbt
index 39c22fb65..5d1ae791a 100644
--- a/sbt/src/sbt-test/actions/cross-incremental/build.sbt
+++ b/sbt/src/sbt-test/actions/cross-incremental/build.sbt
@@ -1,5 +1,5 @@
-scalaVersion := "2.12.8"
-crossScalaVersions := List("2.12.8", "2.13.0")
+scalaVersion := "2.12.10"
+crossScalaVersions := List("2.12.10", "2.13.0")
val setLastModified = taskKey[Unit]("Sets the last modified time for classfiles")
setLastModified := {
diff --git a/sbt/src/sbt-test/actions/cross-multi-parser/build.sbt b/sbt/src/sbt-test/actions/cross-multi-parser/build.sbt
index 1d47987b5..8391e41b1 100644
--- a/sbt/src/sbt-test/actions/cross-multi-parser/build.sbt
+++ b/sbt/src/sbt-test/actions/cross-multi-parser/build.sbt
@@ -1 +1 @@
-crossScalaVersions := Seq[String]("2.11.12", "2.12.8")
+crossScalaVersions := Seq[String]("2.11.12", "2.12.10")
diff --git a/sbt/src/sbt-test/actions/cross-multi-parser/test b/sbt/src/sbt-test/actions/cross-multi-parser/test
index df8b309d2..b86033c84 100644
--- a/sbt/src/sbt-test/actions/cross-multi-parser/test
+++ b/sbt/src/sbt-test/actions/cross-multi-parser/test
@@ -1,5 +1,5 @@
> ++2.11.12; compile
-> ++ 2.12.8 ; compile;
+> ++ 2.12.10 ; compile;
-> ++ 2.12.8 ; compile
+> ++ 2.12.10 ; compile
diff --git a/sbt/src/sbt-test/actions/cross-multiproject/build.sbt b/sbt/src/sbt-test/actions/cross-multiproject/build.sbt
index c39cdf83a..b03ecf9e0 100644
--- a/sbt/src/sbt-test/actions/cross-multiproject/build.sbt
+++ b/sbt/src/sbt-test/actions/cross-multiproject/build.sbt
@@ -1,4 +1,5 @@
-lazy val scala212 = "2.12.8"
+lazy val scala212 = "2.12.10"
+// keep this at M5 to test full version
lazy val scala213 = "2.13.0-M5"
ThisBuild / crossScalaVersions := Seq(scala212, scala213)
diff --git a/sbt/src/sbt-test/actions/cross-multiproject/test b/sbt/src/sbt-test/actions/cross-multiproject/test
index ba4263197..a2e08c9ae 100644
--- a/sbt/src/sbt-test/actions/cross-multiproject/test
+++ b/sbt/src/sbt-test/actions/cross-multiproject/test
@@ -13,7 +13,7 @@ $ exists lib/target/scala-2.13.0-M5
# test safe switching
> clean
-> ++ 2.12.8 -v compile
+> ++ 2.12.10 -v compile
$ exists lib/target/scala-2.12
-$ exists lib/target/scala-2.13.0-M5
$ exists sbt-foo/target/scala-2.12
@@ -29,7 +29,7 @@ $ exists sbt-foo/target/scala-2.12
# Test ++ leaves crossScalaVersions unchanged
> clean
-> ++2.12.8
+> ++2.12.10
> +extrasProj/compile
$ exists extras/target/scala-2.13.0-M5
$ exists extras/target/scala-2.12
diff --git a/sbt/src/sbt-test/actions/cross-strict-aggregation/build.sbt b/sbt/src/sbt-test/actions/cross-strict-aggregation/build.sbt
index 98a883e0b..84e4b5b9e 100644
--- a/sbt/src/sbt-test/actions/cross-strict-aggregation/build.sbt
+++ b/sbt/src/sbt-test/actions/cross-strict-aggregation/build.sbt
@@ -1,4 +1,4 @@
-lazy val scala212 = "2.12.8"
+lazy val scala212 = "2.12.10"
lazy val scala213 = "2.13.0-M5"
ThisBuild / scalaVersion := scala212
diff --git a/sbt/src/sbt-test/actions/doc-file-options/build.sbt b/sbt/src/sbt-test/actions/doc-file-options/build.sbt
index 2c56831c1..1b5f7006a 100644
--- a/sbt/src/sbt-test/actions/doc-file-options/build.sbt
+++ b/sbt/src/sbt-test/actions/doc-file-options/build.sbt
@@ -2,7 +2,7 @@ val newContents = "bbbbbbbbb"
val rootContentFile = "root.txt"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/actions/external-doc/build.sbt b/sbt/src/sbt-test/actions/external-doc/build.sbt
index 834ad7004..fe2d502d8 100644
--- a/sbt/src/sbt-test/actions/external-doc/build.sbt
+++ b/sbt/src/sbt-test/actions/external-doc/build.sbt
@@ -24,7 +24,7 @@ val bResolver = Def.setting {
val apiBaseSetting = apiURL := Some(apiBase(name.value))
def apiBase(projectName: String) = url(s"http://example.org/${projectName}")
-def scalaLibraryBase(v: String) = url(s"http://www.scala-lang.org/api/$v/")
+def scalaLibraryBase(v: String) = url(s"https://www.scala-lang.org/api/$v/")
def addDep(projectName: String) =
libraryDependencies += organization.value %% projectName % version.value
diff --git a/sbt/src/sbt-test/actions/generator/build.sbt b/sbt/src/sbt-test/actions/generator/build.sbt
index 5672ed807..4e6b3c66a 100644
--- a/sbt/src/sbt-test/actions/generator/build.sbt
+++ b/sbt/src/sbt-test/actions/generator/build.sbt
@@ -1,6 +1,6 @@
val buildInfo = taskKey[Seq[File]]("generates the build info")
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/actions/multi-command/build.sbt b/sbt/src/sbt-test/actions/multi-command/build.sbt
index 6b673176b..ba33d9a27 100644
--- a/sbt/src/sbt-test/actions/multi-command/build.sbt
+++ b/sbt/src/sbt-test/actions/multi-command/build.sbt
@@ -19,4 +19,4 @@ val dynamicTask = taskKey[Unit]("dynamic input task")
dynamicTask := { println("not yet et") }
-crossScalaVersions := "2.11.12" :: "2.12.8" :: Nil
+crossScalaVersions := "2.11.12" :: "2.12.10" :: Nil
diff --git a/sbt/src/sbt-test/actions/multi-command/test b/sbt/src/sbt-test/actions/multi-command/test
index 99a77cee8..adfdbab0f 100644
--- a/sbt/src/sbt-test/actions/multi-command/test
+++ b/sbt/src/sbt-test/actions/multi-command/test
@@ -37,4 +37,4 @@
> ++ 2.11.12 compile; setStringValue bar; checkStringValue bar
-> ++2.12.8 compile; setStringValue foo; checkStringValue foo
+> ++2.12.10 compile; setStringValue foo; checkStringValue foo
diff --git a/sbt/src/sbt-test/classloader-cache/akka-actor-system/build.sbt b/sbt/src/sbt-test/classloader-cache/akka-actor-system/build.sbt
index 7d5b0fbd5..dbdbfb735 100644
--- a/sbt/src/sbt-test/classloader-cache/akka-actor-system/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/akka-actor-system/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / turbo := true
val akkaTest = (project in file(".")).settings(
name := "akka-test",
- scalaVersion := "2.12.8",
+ scalaVersion := "2.12.10",
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-actor" % "2.5.16",
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
diff --git a/sbt/src/sbt-test/classloader-cache/jni/build.sbt b/sbt/src/sbt-test/classloader-cache/jni/build.sbt
index 63e0131ab..07d9ab530 100644
--- a/sbt/src/sbt-test/classloader-cache/jni/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/jni/build.sbt
@@ -13,7 +13,7 @@ def wrap(task: InputKey[Unit]): Def.Initialize[Task[Unit]] =
ThisBuild / turbo := true
val root = (project in file(".")).settings(
- scalaVersion := "2.12.8",
+ scalaVersion := "2.12.10",
javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-h",
sourceDirectory.value.toPath.resolve("main/native/include").toString),
libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.6" % "test",
diff --git a/sbt/src/sbt-test/classloader-cache/library-mismatch/build.sbt b/sbt/src/sbt-test/classloader-cache/library-mismatch/build.sbt
index 460c9f175..66a67155d 100644
--- a/sbt/src/sbt-test/classloader-cache/library-mismatch/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/library-mismatch/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / turbo := true
val snapshot = (project in file(".")).settings(
name := "mismatched-libraries",
- scalaVersion := "2.12.8",
+ scalaVersion := "2.12.10",
libraryDependencies ++= Seq("com.lihaoyi" %% "utest" % "0.6.6" % "test"),
testFrameworks := Seq(TestFramework("utest.runner.Framework")),
resolvers += "Local Maven" at file("libraries/ivy").toURI.toURL.toString,
diff --git a/sbt/src/sbt-test/classloader-cache/runtime-layers/build.sbt b/sbt/src/sbt-test/classloader-cache/runtime-layers/build.sbt
index 36e333515..582c2bd8b 100644
--- a/sbt/src/sbt-test/classloader-cache/runtime-layers/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/runtime-layers/build.sbt
@@ -1,6 +1,6 @@
val layeringStrategyTest = (project in file(".")).settings(
name := "layering-strategy-test",
- scalaVersion := "2.12.8",
+ scalaVersion := "2.12.10",
organization := "sbt",
libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.16",
)
diff --git a/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt b/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
index 28eeb6222..d0dc03a76 100644
--- a/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
@@ -9,7 +9,7 @@ ThisBuild / useCoursier := false
val snapshot = (project in file(".")).settings(
name := "akka-test",
- scalaVersion := "2.12.8",
+ scalaVersion := "2.12.10",
libraryDependencies ++= Seq(
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
),
diff --git a/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-1/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom b/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-1/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
index 42de5d5d5..3c2258a90 100644
--- a/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-1/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
+++ b/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-1/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
@@ -14,7 +14,7 @@
org.scala-lang
scala-library
- 2.12.8
+ 2.12.10
\ No newline at end of file
diff --git a/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-2/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom b/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-2/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
index 42de5d5d5..3c2258a90 100644
--- a/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-2/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
+++ b/sbt/src/sbt-test/classloader-cache/snapshot/libraries/library-2/ivy/sbt/foo-lib_2.12/0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom
@@ -14,7 +14,7 @@
org.scala-lang
scala-library
- 2.12.8
+ 2.12.10
\ No newline at end of file
diff --git a/sbt/src/sbt-test/classloader-cache/spark/build.sbt b/sbt/src/sbt-test/classloader-cache/spark/build.sbt
index 33fdcaa77..d64005ef4 100644
--- a/sbt/src/sbt-test/classloader-cache/spark/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/spark/build.sbt
@@ -2,6 +2,6 @@ name := "Simple Project"
version := "1.0"
-scalaVersion := "2.12.8"
+scalaVersion := "2.12.10"
libraryDependencies += "org.apache.spark" %% "spark-sql" % "2.4.3"
diff --git a/sbt/src/sbt-test/classloader-cache/utest/build.sbt b/sbt/src/sbt-test/classloader-cache/utest/build.sbt
index c64105efb..1222deb30 100644
--- a/sbt/src/sbt-test/classloader-cache/utest/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/utest/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / turbo := true
val utestTest = (project in file(".")).settings(
name := "utest-test",
- scalaVersion := "2.12.8",
+ scalaVersion := "2.12.10",
libraryDependencies ++= Seq(
"com.lihaoyi" %% "utest" % "0.6.6" % "test"
),
diff --git a/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt b/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt
index f49a6898e..84e555a55 100644
--- a/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt
+++ b/sbt/src/sbt-test/compiler-project/error-in-invalidated/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file(".")).
settings(
diff --git a/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt b/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt
index 908667853..7b5f37efa 100644
--- a/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt
+++ b/sbt/src/sbt-test/compiler-project/separate-analysis-per-scala/build.sbt
@@ -1,4 +1,4 @@
-lazy val scala212 = "2.12.8"
+lazy val scala212 = "2.12.10"
lazy val scala213 = "2.13.0-M5"
ThisBuild / scalaVersion := scala212
diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt b/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
index 5c155cb2e..554bf8854 100644
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
// TTL of Coursier is 24h
ThisBuild / useCoursier := false
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt
index e9e973aa4..ac16501b1 100644
--- a/sbt/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt
+++ b/sbt/src/sbt-test/dependency-management/cached-resolution-interproj/multi.sbt
@@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check")
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val junit = "junit" % "junit" % "4.11"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
def commonSettings: Seq[Def.Setting[_]] =
Seq(
diff --git a/sbt/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt b/sbt/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt
index 391353a8e..a8eb02074 100644
--- a/sbt/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/compiler-bridge-binary/build.sbt
@@ -1,9 +1,9 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val check = taskKey[Unit]("")
// We can't use "%%" here without breaking the "== bridgeModule" check below
-val bridgeModule = "org.scala-sbt" % s"compiler-bridge_2.12" % "1.3.0-M3"
+val bridgeModule = "org.scala-sbt" % "compiler-bridge_2.12" % "1.3.0"
libraryDependencies += bridgeModule % Configurations.ScalaTool
diff --git a/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt b/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt
index 4c49c2b30..5bea59e4d 100644
--- a/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/conflict-coursier/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies ++= List(
"org.webjars.npm" % "randomatic" % "1.1.7",
"org.webjars.npm" % "is-odd" % "2.0.0",
diff --git a/sbt/src/sbt-test/dependency-management/global-plugins/build.sbt b/sbt/src/sbt-test/dependency-management/global-plugins/build.sbt
index 5642f168f..04db26329 100644
--- a/sbt/src/sbt-test/dependency-management/global-plugins/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/global-plugins/build.sbt
@@ -1 +1 @@
-scalaVersion := "2.12.8"
+scalaVersion := "2.12.10"
diff --git a/sbt/src/sbt-test/dependency-management/snapshot-local/build.sbt b/sbt/src/sbt-test/dependency-management/snapshot-local/build.sbt
index d87463465..3141e1563 100644
--- a/sbt/src/sbt-test/dependency-management/snapshot-local/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/snapshot-local/build.sbt
@@ -1,5 +1,5 @@
ThisBuild / organization := "com.example"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
def customIvyPaths: Seq[Def.Setting[_]] = Seq(
ivyPaths := IvyPaths((baseDirectory in ThisBuild).value, Some((baseDirectory in ThisBuild).value / "ivy-cache"))
diff --git a/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt b/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
index be1d08d66..b48b7c5b9 100644
--- a/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
@@ -1,5 +1,5 @@
ThisBuild / organization := "com.example"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
// TTL is 24h so we can't detect the change
ThisBuild / useCoursier := false
diff --git a/sbt/src/sbt-test/dependency-management/sources/build.sbt b/sbt/src/sbt-test/dependency-management/sources/build.sbt
index ebe207024..1a6558e7c 100644
--- a/sbt/src/sbt-test/dependency-management/sources/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/sources/build.sbt
@@ -1,5 +1,4 @@
-// ThisBuild / useCoursier := false
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
@@ -13,15 +12,16 @@ def checkSources(report: UpdateReport): Unit = {
val srcs = getSources(report).map(_.getName)
if(srcs.isEmpty)
sys.error(s"No sources retrieved\n\n$report")
- else if (srcs.size != 8 || !srcs.exists(_ == "akka-actor_2.12-2.5.22-sources.jar")) {
- // scala-library-2.12.8-sources.jar
- // config-1.3.3-sources.jar
- // akka-actor_2.12-2.5.22-sources.jar
- // scala-java8-compat_2.12-0.8.0-sources.jar
- // scala-xml_2.12-1.0.6-sources.jar
- // scala-compiler-2.12.8-sources.jar
- // scala-reflect-2.12.8-sources.jar
- // jline-2.14.6-sources.jar
+ else if (srcs.size != 9 || !srcs.exists(_ == "akka-actor_2.12-2.5.22-sources.jar")) {
+// [info] [error] scala-java8-compat_2.12-0.8.0-sources.jar
+// [info] [error] scala-library-2.12.10-sources.jar
+// [info] [error] config-1.3.3-sources.jar
+// [info] [error] akka-actor_2.12-2.5.22-sources.jar
+// [info] [error] scala-compiler-2.12.10-sources.jar
+// [info] [error] jline-2.14.6-sources.jar
+// [info] [error] jansi-1.12-sources.jar
+// [info] [error] scala-xml_2.12-1.0.6-sources.jar
+// [info] [error] scala-reflect-2.12.10-sources.jar
sys.error("Incorrect sources retrieved:\n\t" + srcs.mkString("\n\t"))
} else ()
}
diff --git a/sbt/src/sbt-test/plugins/hydra/build.sbt b/sbt/src/sbt-test/plugins/hydra/build.sbt
index 92141d09c..80929b4f0 100644
--- a/sbt/src/sbt-test/plugins/hydra/build.sbt
+++ b/sbt/src/sbt-test/plugins/hydra/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val check = taskKey[Unit]("")
diff --git a/sbt/src/sbt-test/plugins/sbt-native-packager/build.sbt b/sbt/src/sbt-test/plugins/sbt-native-packager/build.sbt
index 4c3343012..4f5db7a68 100644
--- a/sbt/src/sbt-test/plugins/sbt-native-packager/build.sbt
+++ b/sbt/src/sbt-test/plugins/sbt-native-packager/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
name := "hello"
enablePlugins(JavaAppPackaging)
diff --git a/sbt/src/sbt-test/project/aggregate/projA/build.sbt b/sbt/src/sbt-test/project/aggregate/projA/build.sbt
index e7bb6bff5..a0d928ded 100644
--- a/sbt/src/sbt-test/project/aggregate/projA/build.sbt
+++ b/sbt/src/sbt-test/project/aggregate/projA/build.sbt
@@ -1,3 +1,3 @@
name := "projA"
-scalaVersion := "2.12.8"
+scalaVersion := "2.12.10"
diff --git a/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt b/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
index c1c2eef6d..0402c6651 100644
--- a/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
+++ b/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt
@@ -1,7 +1,7 @@
val baseSbt = "1."
-val buildCrossList = List("2.10.7", "2.11.12", "2.12.8")
-scalaVersion in ThisBuild := "2.12.8"
+val buildCrossList = List("2.10.7", "2.11.12", "2.12.10")
+scalaVersion in ThisBuild := "2.12.10"
crossScalaVersions in ThisBuild := buildCrossList
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
diff --git a/sbt/src/sbt-test/project/flatten/build.sbt b/sbt/src/sbt-test/project/flatten/build.sbt
index bab2c5efd..7b01d2c93 100644
--- a/sbt/src/sbt-test/project/flatten/build.sbt
+++ b/sbt/src/sbt-test/project/flatten/build.sbt
@@ -1,6 +1,6 @@
val unpackage = TaskKey[Unit]("unpackage")
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/project/internal-tracking/build.sbt b/sbt/src/sbt-test/project/internal-tracking/build.sbt
index 8374bcaef..f1a1d8382 100644
--- a/sbt/src/sbt-test/project/internal-tracking/build.sbt
+++ b/sbt/src/sbt-test/project/internal-tracking/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
ThisBuild / trackInternalDependencies := TrackLevel.NoTracking
lazy val root = (project in file("."))
diff --git a/sbt/src/sbt-test/project/semanticdb/build.sbt b/sbt/src/sbt-test/project/semanticdb/build.sbt
index 3be99bedc..f0c9f1bd5 100644
--- a/sbt/src/sbt-test/project/semanticdb/build.sbt
+++ b/sbt/src/sbt-test/project/semanticdb/build.sbt
@@ -1,3 +1,4 @@
+// TODO: bump to 2.12.10 once scalameta is available
ThisBuild / scalaVersion := "2.12.8"
ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbIncludeInJar := true
diff --git a/sbt/src/sbt-test/run/fork-loader/build.sbt b/sbt/src/sbt-test/run/fork-loader/build.sbt
index 28db01e98..9af6a1263 100644
--- a/sbt/src/sbt-test/run/fork-loader/build.sbt
+++ b/sbt/src/sbt-test/run/fork-loader/build.sbt
@@ -1,6 +1,6 @@
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/source-dependencies/binary/build.sbt b/sbt/src/sbt-test/source-dependencies/binary/build.sbt
index 2dae08fe8..d541b61ca 100644
--- a/sbt/src/sbt-test/source-dependencies/binary/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/binary/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val dep = project
diff --git a/sbt/src/sbt-test/source-dependencies/cross-source/test b/sbt/src/sbt-test/source-dependencies/cross-source/test
index 202d7ee61..85ed23b09 100644
--- a/sbt/src/sbt-test/source-dependencies/cross-source/test
+++ b/sbt/src/sbt-test/source-dependencies/cross-source/test
@@ -1,3 +1,3 @@
# A.scala needs B.scala, it would be in source list
-> ++2.12.8!
+> ++2.12.10!
> compile
diff --git a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt
index 4a0236324..585f80fef 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt
@@ -1,3 +1,4 @@
+// TODO: bump to 2.12.10 once macro paradise is available
ThisBuild / scalaVersion := "2.12.8"
val paradiseVersion = "2.1.1"
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
index 0b82f66c8..dba95a01a 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
index 0b82f66c8..dba95a01a 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-stackoverflow/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
index 0b82f66c8..dba95a01a 100644
--- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
diff --git a/sbt/src/sbt-test/source-dependencies/macro/build.sbt b/sbt/src/sbt-test/source-dependencies/macro/build.sbt
index 0b82f66c8..dba95a01a 100644
--- a/sbt/src/sbt-test/source-dependencies/macro/build.sbt
+++ b/sbt/src/sbt-test/source-dependencies/macro/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
val defaultSettings = Seq(
libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value
diff --git a/sbt/src/sbt-test/tests/arguments/build.sbt b/sbt/src/sbt-test/tests/arguments/build.sbt
index 4ad9c4608..4c441e7dd 100644
--- a/sbt/src/sbt-test/tests/arguments/build.sbt
+++ b/sbt/src/sbt-test/tests/arguments/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/do-not-discover/build.sbt b/sbt/src/sbt-test/tests/do-not-discover/build.sbt
index 4cf97982b..1c3d6acc5 100644
--- a/sbt/src/sbt-test/tests/do-not-discover/build.sbt
+++ b/sbt/src/sbt-test/tests/do-not-discover/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/done/build.sbt b/sbt/src/sbt-test/tests/done/build.sbt
index 4cf97982b..1c3d6acc5 100644
--- a/sbt/src/sbt-test/tests/done/build.sbt
+++ b/sbt/src/sbt-test/tests/done/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/fork-async/build.sbt b/sbt/src/sbt-test/tests/fork-async/build.sbt
index 3f1f1ffa4..356fbf3ba 100644
--- a/sbt/src/sbt-test/tests/fork-async/build.sbt
+++ b/sbt/src/sbt-test/tests/fork-async/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/fork-parallel/build.sbt b/sbt/src/sbt-test/tests/fork-parallel/build.sbt
index 03a697592..cf306f139 100644
--- a/sbt/src/sbt-test/tests/fork-parallel/build.sbt
+++ b/sbt/src/sbt-test/tests/fork-parallel/build.sbt
@@ -1,7 +1,7 @@
import Tests._
import Defaults._
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
val check = taskKey[Unit]("Check that tests are executed in parallel")
lazy val root = (project in file("."))
diff --git a/sbt/src/sbt-test/tests/fork-test-group-parallel/build.sbt b/sbt/src/sbt-test/tests/fork-test-group-parallel/build.sbt
index 4bf333dab..175d11c69 100644
--- a/sbt/src/sbt-test/tests/fork-test-group-parallel/build.sbt
+++ b/sbt/src/sbt-test/tests/fork-test-group-parallel/build.sbt
@@ -1,5 +1,5 @@
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
Global / concurrentRestrictions := Seq(Tags.limitAll(4))
libraryDependencies += specs % Test
diff --git a/sbt/src/sbt-test/tests/fork-uncaught2/build.sbt b/sbt/src/sbt-test/tests/fork-uncaught2/build.sbt
index b7c27d745..12e95f632 100644
--- a/sbt/src/sbt-test/tests/fork-uncaught2/build.sbt
+++ b/sbt/src/sbt-test/tests/fork-uncaught2/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += "org.scala-sbt" % "test-interface" % "1.0"
diff --git a/sbt/src/sbt-test/tests/fork/build.sbt b/sbt/src/sbt-test/tests/fork/build.sbt
index 0d8633b8e..0d5d515e4 100644
--- a/sbt/src/sbt-test/tests/fork/build.sbt
+++ b/sbt/src/sbt-test/tests/fork/build.sbt
@@ -11,7 +11,7 @@ val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
def groupId(idx: Int) = "group_" + (idx + 1)
def groupPrefix(idx: Int) = groupId(idx) + "_file_"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
ThisBuild / organization := "org.example"
lazy val root = (project in file("."))
diff --git a/sbt/src/sbt-test/tests/fork2/build.sbt b/sbt/src/sbt-test/tests/fork2/build.sbt
index 3f5a581d6..e485b06c3 100644
--- a/sbt/src/sbt-test/tests/fork2/build.sbt
+++ b/sbt/src/sbt-test/tests/fork2/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
fork := true
libraryDependencies += scalatest % Test
diff --git a/sbt/src/sbt-test/tests/it/build.sbt b/sbt/src/sbt-test/tests/it/build.sbt
index 4f818c0db..8d8bd5608 100644
--- a/sbt/src/sbt-test/tests/it/build.sbt
+++ b/sbt/src/sbt-test/tests/it/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
diff --git a/sbt/src/sbt-test/tests/junit-xml-report/build.sbt b/sbt/src/sbt-test/tests/junit-xml-report/build.sbt
index 175b830f2..661acf38d 100644
--- a/sbt/src/sbt-test/tests/junit-xml-report/build.sbt
+++ b/sbt/src/sbt-test/tests/junit-xml-report/build.sbt
@@ -14,7 +14,7 @@ val nestedSuitesReportFile = "target/test-reports/my.scalatest.MyNestedSuites.xm
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val junitinterface = "com.novocode" % "junit-interface" % "0.11"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file(".")).
settings(
diff --git a/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt b/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt
index a391c46a2..772e3ce76 100644
--- a/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt
+++ b/sbt/src/sbt-test/tests/nested-inproc-par/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt b/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt
index 35bee89b5..ab3229b17 100644
--- a/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt
+++ b/sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/nested-subproc/build.sbt b/sbt/src/sbt-test/tests/nested-subproc/build.sbt
index 31c0ecdea..fd1f4c406 100644
--- a/sbt/src/sbt-test/tests/nested-subproc/build.sbt
+++ b/sbt/src/sbt-test/tests/nested-subproc/build.sbt
@@ -1,7 +1,7 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/nested-tests/build.sbt b/sbt/src/sbt-test/tests/nested-tests/build.sbt
index 6a89dcc70..e66dff80d 100644
--- a/sbt/src/sbt-test/tests/nested-tests/build.sbt
+++ b/sbt/src/sbt-test/tests/nested-tests/build.sbt
@@ -1,6 +1,6 @@
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
ThisBuild / version := "0.0.1"
ThisBuild / organization := "org.catastrophe"
diff --git a/sbt/src/sbt-test/tests/one-class-multi-framework/build.sbt b/sbt/src/sbt-test/tests/one-class-multi-framework/build.sbt
index d74f4ddf8..613ee6870 100644
--- a/sbt/src/sbt-test/tests/one-class-multi-framework/build.sbt
+++ b/sbt/src/sbt-test/tests/one-class-multi-framework/build.sbt
@@ -1,5 +1,5 @@
val specsJunit = "org.specs2" %% "specs2-junit" % "4.3.4"
val junitinterface = "com.novocode" % "junit-interface" % "0.11"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += junitinterface % Test
libraryDependencies += specsJunit % Test
diff --git a/sbt/src/sbt-test/tests/order/build.sbt b/sbt/src/sbt-test/tests/order/build.sbt
index 1d125aee0..de59ece48 100644
--- a/sbt/src/sbt-test/tests/order/build.sbt
+++ b/sbt/src/sbt-test/tests/order/build.sbt
@@ -1,5 +1,5 @@
val scalcheck = "org.scalacheck" %% "scalacheck" % "1.14.0"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
Test / parallelExecution := false
libraryDependencies += scalcheck % Test
diff --git a/sbt/src/sbt-test/tests/resources/build.sbt b/sbt/src/sbt-test/tests/resources/build.sbt
index 00e8f01fc..5b23363c4 100644
--- a/sbt/src/sbt-test/tests/resources/build.sbt
+++ b/sbt/src/sbt-test/tests/resources/build.sbt
@@ -1,3 +1,3 @@
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += specs % Test
diff --git a/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt b/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt
index 6c9fd94cb..a3c45b060 100644
--- a/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt
+++ b/sbt/src/sbt-test/tests/scala-instance-classloader/build.sbt
@@ -3,7 +3,7 @@ import sbt.internal.inc.ScalaInstance
lazy val OtherScala = config("other-scala").hide
lazy val junitinterface = "com.novocode" % "junit-interface" % "0.11"
lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.17"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.configs(OtherScala)
@@ -18,7 +18,7 @@ lazy val root = (project in file("."))
val rawJars = (managedClasspath in OtherScala).value.map(_.data)
val scalaHome = (target.value / "scala-home")
def removeVersion(name: String): String =
- name.replaceAll("\\-2.12.8", "")
+ name.replaceAll("\\-2.12.10", "")
for(jar <- rawJars) {
val tjar = scalaHome / s"lib/${removeVersion(jar.getName)}"
IO.copyFile(jar, tjar)
diff --git a/sbt/src/sbt-test/tests/serial/build.sbt b/sbt/src/sbt-test/tests/serial/build.sbt
index 0e59c0bd3..07bb0d965 100644
--- a/sbt/src/sbt-test/tests/serial/build.sbt
+++ b/sbt/src/sbt-test/tests/serial/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
ThisBuild / organization := "com.example"
ThisBuild / version := "0.0.1-SNAPSHOT"
diff --git a/sbt/src/sbt-test/tests/setup-cleanup/base.sbt b/sbt/src/sbt-test/tests/setup-cleanup/base.sbt
index caecf9564..16ebaf5ed 100644
--- a/sbt/src/sbt-test/tests/setup-cleanup/base.sbt
+++ b/sbt/src/sbt-test/tests/setup-cleanup/base.sbt
@@ -1,3 +1,3 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += scalatest
diff --git a/sbt/src/sbt-test/tests/single-runner/build.sbt b/sbt/src/sbt-test/tests/single-runner/build.sbt
index 9f28d03dd..0cec3443a 100644
--- a/sbt/src/sbt-test/tests/single-runner/build.sbt
+++ b/sbt/src/sbt-test/tests/single-runner/build.sbt
@@ -1,4 +1,4 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += scalatest
Test / testOptions += Tests.Argument("-C", "custom.CustomReporter")
diff --git a/sbt/src/sbt-test/tests/specs-run/build.sbt b/sbt/src/sbt-test/tests/specs-run/build.sbt
index 1fe69dacb..e9315fae1 100644
--- a/sbt/src/sbt-test/tests/specs-run/build.sbt
+++ b/sbt/src/sbt-test/tests/specs-run/build.sbt
@@ -1,4 +1,4 @@
val specs = "org.specs2" %% "specs2-core" % "4.3.4"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += specs % Test
diff --git a/sbt/src/sbt-test/tests/t543/build.sbt b/sbt/src/sbt-test/tests/t543/build.sbt
index 7dbdcc3dd..632fda2a8 100644
--- a/sbt/src/sbt-test/tests/t543/build.sbt
+++ b/sbt/src/sbt-test/tests/t543/build.sbt
@@ -7,7 +7,7 @@ val check = TaskKey[Unit]("check", "Check correct error has been returned.")
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file(".")).
settings(
diff --git a/sbt/src/sbt-test/tests/task/build.sbt b/sbt/src/sbt-test/tests/task/build.sbt
index 9f28d03dd..0cec3443a 100644
--- a/sbt/src/sbt-test/tests/task/build.sbt
+++ b/sbt/src/sbt-test/tests/task/build.sbt
@@ -1,4 +1,4 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
libraryDependencies += scalatest
Test / testOptions += Tests.Argument("-C", "custom.CustomReporter")
diff --git a/sbt/src/sbt-test/tests/test-exclude/build.sbt b/sbt/src/sbt-test/tests/test-exclude/build.sbt
index 21212d63e..3b4bf6de0 100644
--- a/sbt/src/sbt-test/tests/test-exclude/build.sbt
+++ b/sbt/src/sbt-test/tests/test-exclude/build.sbt
@@ -1,5 +1,5 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/tests/test-quick/build.sbt b/sbt/src/sbt-test/tests/test-quick/build.sbt
index 9f33708b3..1308e092e 100644
--- a/sbt/src/sbt-test/tests/test-quick/build.sbt
+++ b/sbt/src/sbt-test/tests/test-quick/build.sbt
@@ -1,6 +1,6 @@
val scalatest = "org.scalatest" %% "scalatest" % "3.0.5"
val scalaxml = "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(
diff --git a/sbt/src/sbt-test/watch/commands/build.sbt b/sbt/src/sbt-test/watch/commands/build.sbt
index be6925842..1696cddce 100644
--- a/sbt/src/sbt-test/watch/commands/build.sbt
+++ b/sbt/src/sbt-test/watch/commands/build.sbt
@@ -53,4 +53,4 @@ expectFailure / watchOnFileInputEvent := { (_, e) =>
}
-crossScalaVersions := Seq("2.11.12", "2.12.8")
+crossScalaVersions := Seq("2.11.12", "2.12.10")
diff --git a/sbt/src/server-test/handshake/build.sbt b/sbt/src/server-test/handshake/build.sbt
index 2f9222364..554bb5c5e 100644
--- a/sbt/src/server-test/handshake/build.sbt
+++ b/sbt/src/server-test/handshake/build.sbt
@@ -1,6 +1,6 @@
import sbt.internal.server.{ ServerHandler, ServerIntent }
-ThisBuild / scalaVersion := "2.12.8"
+ThisBuild / scalaVersion := "2.12.10"
lazy val root = (project in file("."))
.settings(