From b26ce819ca37d6b4b5a6678353750c52a44ba292 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 5 Aug 2019 13:06:57 -0700 Subject: [PATCH] Bump default scala version to 2.12.9 I automatically generated with: git grep "2.12.8" | \ cut -d ':' -f1 | uniq | xargs perl -p -i -e "s/2.12.8/2.12.9/" --- main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 2 +- project/plugins.sbt | 2 +- sbt/src/sbt-test/actions/cross-multi-parser/build.sbt | 2 +- sbt/src/sbt-test/actions/cross-multi-parser/test | 4 ++-- sbt/src/sbt-test/actions/cross-multiproject/build.sbt | 2 +- sbt/src/sbt-test/actions/cross-multiproject/test | 4 ++-- .../sbt-test/actions/cross-strict-aggregation/build.sbt | 2 +- sbt/src/sbt-test/actions/doc-file-options/build.sbt | 2 +- sbt/src/sbt-test/actions/generator/build.sbt | 2 +- sbt/src/sbt-test/actions/multi-command/build.sbt | 2 +- sbt/src/sbt-test/actions/multi-command/test | 2 +- .../classloader-cache/akka-actor-system/build.sbt | 2 +- sbt/src/sbt-test/classloader-cache/jni/build.sbt | 2 +- .../sbt-test/classloader-cache/library-mismatch/build.sbt | 2 +- .../foo/ivy/sbt/foo-lib_2.12/0.1.0/foo-lib_2.12-0.1.0.pom | 2 +- .../sbt-test/classloader-cache/runtime-layers/build.sbt | 2 +- sbt/src/sbt-test/classloader-cache/snapshot/build.sbt | 2 +- .../0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom | 2 +- .../0.1.0-SNAPSHOT/foo-lib_2.12-0.1.0-SNAPSHOT.pom | 2 +- sbt/src/sbt-test/classloader-cache/spark/build.sbt | 2 +- sbt/src/sbt-test/classloader-cache/utest/build.sbt | 2 +- .../compiler-project/error-in-invalidated/build.sbt | 2 +- .../separate-analysis-per-scala/build.sbt | 2 +- .../dependency-management/cache-classifiers/multi.sbt | 2 +- .../cached-resolution-interproj/multi.sbt | 2 +- .../compiler-bridge-binary/build.sbt | 2 +- .../dependency-management/global-plugins/build.sbt | 2 +- .../dependency-management/snapshot-local/build.sbt | 2 +- .../dependency-management/snapshot-resolution/build.sbt | 2 +- sbt/src/sbt-test/dependency-management/sources/build.sbt | 8 ++++---- sbt/src/sbt-test/plugins/hydra/build.sbt | 2 +- sbt/src/sbt-test/plugins/sbt-native-packager/build.sbt | 2 +- sbt/src/sbt-test/project/aggregate/projA/build.sbt | 2 +- sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt | 4 ++-- sbt/src/sbt-test/project/flatten/build.sbt | 2 +- sbt/src/sbt-test/project/internal-tracking/build.sbt | 2 +- sbt/src/sbt-test/project/semanticdb/build.sbt | 2 +- sbt/src/sbt-test/run/fork-loader/build.sbt | 2 +- sbt/src/sbt-test/source-dependencies/binary/build.sbt | 2 +- sbt/src/sbt-test/source-dependencies/cross-source/test | 2 +- .../source-dependencies/macro-annotation/build.sbt | 2 +- .../source-dependencies/macro-arg-dep-nested/build.sbt | 2 +- .../macro-arg-dep-stackoverflow/build.sbt | 2 +- .../sbt-test/source-dependencies/macro-arg-dep/build.sbt | 2 +- sbt/src/sbt-test/source-dependencies/macro/build.sbt | 2 +- sbt/src/sbt-test/tests/arguments/build.sbt | 2 +- sbt/src/sbt-test/tests/do-not-discover/build.sbt | 2 +- sbt/src/sbt-test/tests/done/build.sbt | 2 +- sbt/src/sbt-test/tests/fork-async/build.sbt | 2 +- sbt/src/sbt-test/tests/fork-parallel/build.sbt | 2 +- sbt/src/sbt-test/tests/fork-test-group-parallel/build.sbt | 2 +- sbt/src/sbt-test/tests/fork-uncaught2/build.sbt | 2 +- sbt/src/sbt-test/tests/fork/build.sbt | 2 +- sbt/src/sbt-test/tests/fork2/build.sbt | 2 +- sbt/src/sbt-test/tests/it/build.sbt | 2 +- sbt/src/sbt-test/tests/junit-xml-report/build.sbt | 2 +- sbt/src/sbt-test/tests/nested-inproc-par/build.sbt | 2 +- sbt/src/sbt-test/tests/nested-inproc-seq/build.sbt | 2 +- sbt/src/sbt-test/tests/nested-subproc/build.sbt | 2 +- sbt/src/sbt-test/tests/nested-tests/build.sbt | 2 +- .../sbt-test/tests/one-class-multi-framework/build.sbt | 2 +- sbt/src/sbt-test/tests/order/build.sbt | 2 +- sbt/src/sbt-test/tests/resources/build.sbt | 2 +- .../sbt-test/tests/scala-instance-classloader/build.sbt | 4 ++-- sbt/src/sbt-test/tests/serial/build.sbt | 2 +- sbt/src/sbt-test/tests/setup-cleanup/base.sbt | 2 +- sbt/src/sbt-test/tests/single-runner/build.sbt | 2 +- sbt/src/sbt-test/tests/specs-run/build.sbt | 2 +- sbt/src/sbt-test/tests/t543/build.sbt | 2 +- sbt/src/sbt-test/tests/task/build.sbt | 2 +- sbt/src/sbt-test/tests/test-exclude/build.sbt | 2 +- sbt/src/sbt-test/tests/test-quick/build.sbt | 2 +- sbt/src/sbt-test/watch/commands/build.sbt | 2 +- sbt/src/server-test/handshake/build.sbt | 2 +- 75 files changed, 82 insertions(+), 82 deletions(-) diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index e0c95b2c8..bd1102780 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.9" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 0d80c1b12..e5576512f 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.9" lazy val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 def nightlyVersion: Option[String] = sys.props.get("sbt.build.version") diff --git a/project/plugins.sbt b/project/plugins.sbt index 4e8ef9422..450e24888 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.8" +scalaVersion := "2.12.9" scalacOptions ++= Seq("-feature", "-language:postfixOps") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9") 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..99ac54716 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.9") diff --git a/sbt/src/sbt-test/actions/cross-multi-parser/test b/sbt/src/sbt-test/actions/cross-multi-parser/test index df8b309d2..ee5b03ff8 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.9 ; compile; -> ++ 2.12.8 ; compile +> ++ 2.12.9 ; 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..ee80c2fbd 100644 --- a/sbt/src/sbt-test/actions/cross-multiproject/build.sbt +++ b/sbt/src/sbt-test/actions/cross-multiproject/build.sbt @@ -1,4 +1,4 @@ -lazy val scala212 = "2.12.8" +lazy val scala212 = "2.12.9" 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..85f8eb7b2 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.9 -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.9 > +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..9b7a49062 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.9" 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..ad4420a49 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.9" lazy val root = (project in file(".")) .settings( diff --git a/sbt/src/sbt-test/actions/generator/build.sbt b/sbt/src/sbt-test/actions/generator/build.sbt index 5672ed807..e838a7585 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.9" 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..1a39f99d2 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.9" :: Nil diff --git a/sbt/src/sbt-test/actions/multi-command/test b/sbt/src/sbt-test/actions/multi-command/test index 99a77cee8..eb46d2fe7 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.9 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..abc0ea3d7 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.9", 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..c85ba6a0e 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.9", 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..5e06b9ffc 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.9", 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/resources/libraries/foo/ivy/sbt/foo-lib_2.12/0.1.0/foo-lib_2.12-0.1.0.pom b/sbt/src/sbt-test/classloader-cache/resources/libraries/foo/ivy/sbt/foo-lib_2.12/0.1.0/foo-lib_2.12-0.1.0.pom index a340da7e4..0276aa57a 100644 --- a/sbt/src/sbt-test/classloader-cache/resources/libraries/foo/ivy/sbt/foo-lib_2.12/0.1.0/foo-lib_2.12-0.1.0.pom +++ b/sbt/src/sbt-test/classloader-cache/resources/libraries/foo/ivy/sbt/foo-lib_2.12/0.1.0/foo-lib_2.12-0.1.0.pom @@ -14,7 +14,7 @@ org.scala-lang scala-library - 2.12.8 + 2.12.9 \ No newline at end of file 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..a81bb012f 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.9", 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..be11e6722 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.9", 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..2491d2210 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.9 \ 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..2491d2210 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.9 \ 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..aae3310a1 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.9" 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..4a2538b21 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.9", 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..024c76d1e 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.9" 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..025f5d7c3 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.9" 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..b14509f5f 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.9" // 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..ce884ecbd 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.9" 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..69e800c91 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,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.8" +ThisBuild / scalaVersion := "2.12.9" lazy val check = taskKey[Unit]("") 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..ce6ddf7dd 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.9" 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..f7a53953d 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.9" 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..430e6ea90 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.9" // 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..9c9bef3fc 100644 --- a/sbt/src/sbt-test/dependency-management/sources/build.sbt +++ b/sbt/src/sbt-test/dependency-management/sources/build.sbt @@ -1,5 +1,5 @@ // ThisBuild / useCoursier := false -ThisBuild / scalaVersion := "2.12.8" +ThisBuild / scalaVersion := "2.12.9" lazy val root = (project in file(".")) .settings( @@ -14,13 +14,13 @@ def checkSources(report: UpdateReport): Unit = { 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 + // scala-library-2.12.9-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 + // scala-compiler-2.12.9-sources.jar + // scala-reflect-2.12.9-sources.jar // jline-2.14.6-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..9c450159d 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.9" 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..bbefdc343 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.9" 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..660cdc407 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.9" 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..f0d0eea5c 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.9") +scalaVersion in ThisBuild := "2.12.9" 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..ec51a8eae 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.9" 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..7974a8d3a 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.9" 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..1f666a470 100644 --- a/sbt/src/sbt-test/project/semanticdb/build.sbt +++ b/sbt/src/sbt-test/project/semanticdb/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.8" +ThisBuild / scalaVersion := "2.12.9" 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..ff13bd7b3 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.9" 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..2163039c5 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.9" 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..df7ecf443 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.9! > 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..b4cdf1825 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/macro-annotation/build.sbt @@ -1,4 +1,4 @@ -ThisBuild / scalaVersion := "2.12.8" +ThisBuild / scalaVersion := "2.12.9" val paradiseVersion = "2.1.1" val commonSettings = Seq( 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..47d1efcf4 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.9" 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..47d1efcf4 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.9" 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..47d1efcf4 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.9" 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..47d1efcf4 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.9" 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..9e255573b 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.9" 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..072d46809 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.9" 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..072d46809 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.9" 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..b624495d8 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.9" 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..12461913e 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.9" 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..2d336c190 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.9" 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..16ce6695b 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.9" 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..148217794 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.9" 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..f0bb6f58c 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.9" 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..49255f5d7 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.9" 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..4738db126 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.9" 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..d95a4cf75 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.9" 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..22528c983 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.9" 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..5589ec5ab 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.9" 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..4175399a0 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.9" 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..b2d757473 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.9" 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..c8ab55b32 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.9" 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..3094f2075 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.9" 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..fb146bf16 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.9" 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.9", "") 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..597a14d77 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.9" 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..4c7f6eb1e 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.9" 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..5c9c4a43e 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.9" 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..401c1943b 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.9" 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..95ec2207f 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.9" 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..5c9c4a43e 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.9" 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..40b0994ec 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.9" 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..9ad20f5d3 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.9" 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 bf3d80a7c..789d111d8 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.9") diff --git a/sbt/src/server-test/handshake/build.sbt b/sbt/src/server-test/handshake/build.sbt index 2f9222364..5420e723e 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.9" lazy val root = (project in file(".")) .settings(