From 541d4047e65c3b291b43bde7aec3e81535f21a55 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 8 Jan 2019 11:01:40 -0800 Subject: [PATCH] Bump scala version 2.12.8 I ran a zsh one liner to generate this: git grep "2.12.7" | cut -d ':' -f1 | sort | uniq | xargs perl -p -i -e "s/2.12.7/2.12.8/" --- main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 2 +- project/plugins.sbt | 2 +- .../cached-resolution-interproj/multi.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 +- .../sbt-test/source-dependencies/macro-annotation/build.sbt | 2 +- .../source-dependencies/macro-arg-dep-nested/build.sbt | 2 +- .../source-dependencies/macro-arg-dep-stackoverflow/build.sbt | 2 +- sbt/src/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/src/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/src/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/server-test/handshake/build.sbt | 2 +- 41 files changed, 42 insertions(+), 42 deletions(-) diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 1172e1db0..e0c95b2c8 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.7" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.8" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 97136b95a..d5bc04079 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.7" + val scala212 = "2.12.8" lazy val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up") val baseScalaVersion = scala212 diff --git a/project/plugins.sbt b/project/plugins.sbt index c323f502c..17584c663 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.7" +scalaVersion := "2.12.8" scalacOptions ++= Seq("-feature", "-language:postfixOps") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9") 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 bfdadea9a..e9e973aa4 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.7" +ThisBuild / scalaVersion := "2.12.8" def commonSettings: Seq[Def.Setting[_]] = Seq( diff --git a/sbt/src/sbt-test/project/semanticdb/build.sbt b/sbt/src/sbt-test/project/semanticdb/build.sbt index 0df9504f9..3be99bedc 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.7" +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 6dddbe9ec..28db01e98 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 293ebae2a..2dae08fe8 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 63450f1a3..202d7ee61 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.7! +> ++2.12.8! > 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 b56711b96..4a0236324 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 a27e93eab..0b82f66c8 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 a27e93eab..0b82f66c8 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 a27e93eab..0b82f66c8 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 a27e93eab..0b82f66c8 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 87fe357f8..4ad9c4608 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 0f7475f10..4cf97982b 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 0f7475f10..4cf97982b 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 874ece230..3f1f1ffa4 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 86de36835..03a697592 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 496658d48..4bf333dab 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 bef8cff4b..b7c27d745 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 56e972825..0d8633b8e 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 c52a432ed..3f5a581d6 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 d207ede26..4f818c0db 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 d07114d0b..175b830f2 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 444e1a0c3..a391c46a2 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 ec66daefa..35bee89b5 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 7073b0e16..31c0ecdea 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 be9f855e4..6a89dcc70 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 e228eabc8..d74f4ddf8 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 c79d85fd3..1d125aee0 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 426a0eb79..00e8f01fc 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 3de42341b..6c9fd94cb 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.7" +ThisBuild / scalaVersion := "2.12.8" 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.7", "") + name.replaceAll("\\-2.12.8", "") 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 0590da98d..0e59c0bd3 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 cbd451549..caecf9564 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 6d47ccec9..9f28d03dd 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 597f082a6..1fe69dacb 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.7" +ThisBuild / scalaVersion := "2.12.8" libraryDependencies += specs % Test diff --git a/sbt/src/sbt-test/tests/t543/build.sbt b/sbt/src/sbt-test/tests/t543/build.sbt index b276006e1..7dbdcc3dd 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 6d47ccec9..9f28d03dd 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 fea325e11..21212d63e 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.7" +ThisBuild / scalaVersion := "2.12.8" 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 cfa01bd02..9f33708b3 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.7" +ThisBuild / scalaVersion := "2.12.8" lazy val root = (project in file(".")) .settings( diff --git a/sbt/src/server-test/handshake/build.sbt b/sbt/src/server-test/handshake/build.sbt index 98058040d..2f9222364 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.7" +ThisBuild / scalaVersion := "2.12.8" lazy val root = (project in file(".")) .settings(