From d86afb5745f5aba4e01ed8fd59cf7946fa10b388 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 8 Aug 2019 11:09:29 -0700 Subject: [PATCH] Revert "Merge pull request #4930 from eatkins/2.12.9" This reverts commit 053b72005d57c8c90d0c7d71e6dc25c413315ad8, reversing changes made to d6b8e0388c015e4f61934de94f54dcf07efca3aa. --- main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 2 +- project/plugins.sbt | 2 +- .../actions/cross-multi-parser/build.sbt | 2 +- .../sbt-test/actions/cross-multi-parser/test | 4 ++-- .../actions/cross-multiproject/build.sbt | 2 +- .../sbt-test/actions/cross-multiproject/test | 4 ++-- .../cross-strict-aggregation/build.sbt | 2 +- .../actions/doc-file-options/build.sbt | 2 +- .../sbt-test/actions/external-doc/build.sbt | 2 +- sbt/src/sbt-test/actions/generator/build.sbt | 2 +- .../sbt-test/actions/multi-command/build.sbt | 2 +- sbt/src/sbt-test/actions/multi-command/test | 2 +- .../akka-actor-system/build.sbt | 2 +- .../sbt-test/classloader-cache/jni/build.sbt | 2 +- .../library-mismatch/build.sbt | 2 +- .../0.1.0/foo-lib_2.12-0.1.0-javadoc.jar | Bin 1131501 -> 1131501 bytes .../0.1.0/foo-lib_2.12-0.1.0-javadoc.jar.md5 | 2 +- .../0.1.0/foo-lib_2.12-0.1.0-javadoc.jar.sha1 | 2 +- .../0.1.0/foo-lib_2.12-0.1.0-sources.jar | Bin 765 -> 765 bytes .../0.1.0/foo-lib_2.12-0.1.0-sources.jar.md5 | 2 +- .../0.1.0/foo-lib_2.12-0.1.0-sources.jar.sha1 | 2 +- .../foo-lib_2.12/0.1.0/foo-lib_2.12-0.1.0.jar | Bin 2820 -> 2820 bytes .../0.1.0/foo-lib_2.12-0.1.0.jar.md5 | 2 +- .../0.1.0/foo-lib_2.12-0.1.0.jar.sha1 | 2 +- .../runtime-layers/build.sbt | 2 +- .../classloader-cache/snapshot/build.sbt | 2 +- .../foo-lib_2.12-0.1.0-SNAPSHOT.pom | 2 +- .../foo-lib_2.12-0.1.0-SNAPSHOT.pom | 2 +- .../classloader-cache/spark/build.sbt | 2 +- .../classloader-cache/utest/build.sbt | 2 +- .../error-in-invalidated/build.sbt | 2 +- .../separate-analysis-per-scala/build.sbt | 2 +- .../cache-classifiers/multi.sbt | 2 +- .../cached-resolution-interproj/multi.sbt | 2 +- .../compiler-bridge-binary/build.sbt | 2 +- .../global-plugins/build.sbt | 2 +- .../snapshot-local/build.sbt | 2 +- .../snapshot-resolution/build.sbt | 2 +- .../dependency-management/sources/build.sbt | 11 +++++------ sbt/src/sbt-test/plugins/hydra/build.sbt | 2 +- .../plugins/sbt-native-packager/build.sbt | 2 +- .../project/aggregate/projA/build.sbt | 2 +- .../project/cross-plugins-defaults/build.sbt | 4 ++-- sbt/src/sbt-test/project/flatten/build.sbt | 2 +- .../project/internal-tracking/build.sbt | 2 +- sbt/src/sbt-test/run/fork-loader/build.sbt | 2 +- .../source-dependencies/binary/build.sbt | 2 +- .../source-dependencies/cross-source/test | 2 +- .../macro-arg-dep-nested/build.sbt | 2 +- .../macro-arg-dep-stackoverflow/build.sbt | 2 +- .../macro-arg-dep/build.sbt | 2 +- .../source-dependencies/macro/build.sbt | 2 +- sbt/src/sbt-test/tests/arguments/build.sbt | 2 +- .../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-test/tests/fork-parallel/build.sbt | 2 +- .../tests/fork-test-group-parallel/build.sbt | 2 +- .../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-test/tests/junit-xml-report/build.sbt | 2 +- .../tests/nested-inproc-par/build.sbt | 2 +- .../tests/nested-inproc-seq/build.sbt | 2 +- .../sbt-test/tests/nested-subproc/build.sbt | 2 +- sbt/src/sbt-test/tests/nested-tests/build.sbt | 2 +- .../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 +- .../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-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 +- 82 files changed, 87 insertions(+), 88 deletions(-) diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index bd1102780..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.9" + 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 e5576512f..0d80c1b12 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.9" + val scala212 = "2.12.8" 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 450e24888..4e8ef9422 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.9" +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/actions/cross-multi-parser/build.sbt b/sbt/src/sbt-test/actions/cross-multi-parser/build.sbt index 99ac54716..1d47987b5 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.9") +crossScalaVersions := Seq[String]("2.11.12", "2.12.8") diff --git a/sbt/src/sbt-test/actions/cross-multi-parser/test b/sbt/src/sbt-test/actions/cross-multi-parser/test index ee5b03ff8..df8b309d2 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.9 ; compile; +> ++ 2.12.8 ; compile; -> ++ 2.12.9 ; compile +> ++ 2.12.8 ; compile diff --git a/sbt/src/sbt-test/actions/cross-multiproject/build.sbt b/sbt/src/sbt-test/actions/cross-multiproject/build.sbt index ee80c2fbd..c39cdf83a 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.9" +lazy val scala212 = "2.12.8" 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 85f8eb7b2..ba4263197 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.9 -v compile +> ++ 2.12.8 -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.9 +> ++2.12.8 > +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 9b7a49062..98a883e0b 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.9" +lazy val scala212 = "2.12.8" 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 ad4420a49..2c56831c1 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 fe2d502d8..834ad7004 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"https://www.scala-lang.org/api/$v/") +def scalaLibraryBase(v: String) = url(s"http://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 e838a7585..5672ed807 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 1a39f99d2..6b673176b 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.9" :: Nil +crossScalaVersions := "2.11.12" :: "2.12.8" :: Nil diff --git a/sbt/src/sbt-test/actions/multi-command/test b/sbt/src/sbt-test/actions/multi-command/test index eb46d2fe7..99a77cee8 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.9 compile; setStringValue foo; checkStringValue foo +> ++2.12.8 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 abc0ea3d7..7d5b0fbd5 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.9", + scalaVersion := "2.12.8", 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 c85ba6a0e..63e0131ab 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.9", + scalaVersion := "2.12.8", 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 5e06b9ffc..460c9f175 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.9", + scalaVersion := "2.12.8", 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-javadoc.jar 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-javadoc.jar index bfe12e7c57ef982790a41093e257d5fbc0c4ec76..276995bb9d063b317df4362dd06a1da867d04af9 100644 GIT binary patch delta 1464 zcmYjRTS!z<6xF%+=AA}oW~*gZYK?&+Cf2;)uf|8x6h`)tNGQq5ULO%!_6{>D8cYxN z5kw!MhA2iSDnTQ#KKkfEkd6%@%_UFhsUiH}CB&7FOMJ@^I z>3F=1#>*174kNX0msm_&jhgqB>X{zcta;ghu=s9LXIOv;k zX#+Fti%XR&u!z#o;^v{q3_27^I(r>8DkqcTsR*MfGB>pnkL`bGB62)Q$Jyfq7ya>}Plh#S7XNgtRYjI@%AyyAIpFq)TXW3 zur?W^-wI$J8%atrT+^sgGO!dvhy*hfA+nmmjHuoWK14lcz;A$v7Vu-N)B@#*E?9sq z$p;HWFji!RFrs}{h$0%c0~R2of~400F3kAm;JN`P;73Ioom}IA6YR(nT^#vc+{-Z+&wc9RPEBs!(Ka_%>vVIq zk8UW#dS(x=x68wG?|3+G(!+TrUMR(km=~5IdhUfFqHG`FK9G$*!2bbq)dvB*{p{m& z$@g>KRzI)Y?`Lyq4{!s~0DqO|16=k+fXn6vdAXV(tVD_azp?K@aA2%3#OpPNctbZs WyxoZqf4!D4Z=)d$7R>DngXa%AVJy!8 delta 1464 zcmYjRTS!z<6t%hc=AA}oW~*gZYK?&+Cf2;)uSP9N!^j>I2_?Nu>mx$T-eE>XgV~`z zg6KnfAd1lmO3(-&$;upBlfi;W?Wt+ z$yq6?s;0P`m72J5oy?ytdH9SM@Fywr8>ja_$VtVwYfjldkgw+ZWfv2jZI`kJ>S7lp z9z2|=q>0KYn?^8obF*AVyUeNa6%-wWg0&8Ae&S6)gvV`8bE@wAlmzO!p zq?SLHtGq@VgxOd~e_E7IJL(UtRx&d=B&=-_>2rgg-rJ`1ZpA8XPnFABmBLZwqLHU2 z*Fj%@RMu*S0|}*e85Us!E$A4IO{K%J)RWh-N9{yvA_L1+r>nwL4X85#MZRWjrOneI$YYdFY@|C^yh*O^9jo$1BeV%U|7O~o8$zL;K$8gqZ6AvVF= zIKr!sP4Dqm(lgIZ<6dN2v&|vEbqyAouV^-t>*|`jM5d&~oYsh$J#q7HZ6Hgx`PLz1 z$Frdqd(*BwSe1tCw_=#Btt7n+uIV^S1{XmDkz|EZM0P7!5j9yMfT-6BwRixs4T8v3 z*kB2wGd9pJ$$J~bFt5}OQH<`gLp5?EcJL#oI$$ZHI)|ut&H+`(eRRMIR0N&iMsBZ@ zIY^!jdE^w`3S7)V@+&4gT;RiKp9?&QzPVUmt_ZmSKPuAZW<9v#z8jnvl|2FlJ;KW& zkI+8x2&Wb=n}}<-cty9%UeWD?7b-Do^@)1TKB2ws6L}Lpmd9O{`=J6AaX&0Z?wKFL zi1Gq}_kpYn0R9hQWO+6=*_6o%!l-6421`xe H#N-VC%ZwJD delta 66 zcmey%`j?e2z?+#xgn@&DgTW$?)qf&i4-1%{r_Aytm(_pc(Huswz+_VYZ2oM@MdNaVc_84U?{5HYZ2oM@MdNaVc_84V6e<%^`FSMj0H^ZPzKW*?`N@r8Jm6CmokA_lfQ8~K^Qh% O#t=p^7gS^?mp1@{-xfCj 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.jar.md5 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.jar.md5 index 5bf137fb6..7acfc2da3 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.jar.md5 +++ 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.jar.md5 @@ -1 +1 @@ -a47aa278478d014cbbc716e271a47eda \ No newline at end of file +6de1cfe8548a007ac08763ab5f051e08 \ No newline at end of file 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.jar.sha1 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.jar.sha1 index e1dfa7267..e60d8daff 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.jar.sha1 +++ 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.jar.sha1 @@ -1 +1 @@ -df349758a22fc5fc291e902239dbcd6b2d0b9c69 \ No newline at end of file +f25267dfe760e734ea4f8a00b8dc6ace477589d6 \ 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 a81bb012f..36e333515 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.9", + scalaVersion := "2.12.8", 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 be11e6722..28eeb6222 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.9", + scalaVersion := "2.12.8", 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 2491d2210..42de5d5d5 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.9 + 2.12.8 \ 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 2491d2210..42de5d5d5 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.9 + 2.12.8 \ 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 aae3310a1..33fdcaa77 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.9" +scalaVersion := "2.12.8" 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 4a2538b21..c64105efb 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.9", + scalaVersion := "2.12.8", 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 024c76d1e..f49a6898e 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 025f5d7c3..908667853 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.9" +lazy val scala212 = "2.12.8" 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 b14509f5f..5c155cb2e 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.9" +ThisBuild / scalaVersion := "2.12.8" // 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 ce884ecbd..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.9" +ThisBuild / scalaVersion := "2.12.8" 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 69e800c91..391353a8e 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 ce6ddf7dd..5642f168f 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.9" +scalaVersion := "2.12.8" 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 f7a53953d..d87463465 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 430e6ea90..be1d08d66 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.9" +ThisBuild / scalaVersion := "2.12.8" // 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 2a6bb695f..ebe207024 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.9" +ThisBuild / scalaVersion := "2.12.8" lazy val root = (project in file(".")) .settings( @@ -13,15 +13,14 @@ 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 != 9 || !srcs.exists(_ == "akka-actor_2.12-2.5.22-sources.jar")) { - // scala-library-2.12.9-sources.jar - // scala-java8-compat_2.12-0.8.0-sources.jar + 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.9-sources.jar - // scala-reflect-2.12.9-sources.jar + // scala-compiler-2.12.8-sources.jar + // scala-reflect-2.12.8-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 9c450159d..92141d09c 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 bbefdc343..4c3343012 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 660cdc407..e7bb6bff5 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.9" +scalaVersion := "2.12.8" 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 f0d0eea5c..c1c2eef6d 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.9") -scalaVersion in ThisBuild := "2.12.9" +val buildCrossList = List("2.10.7", "2.11.12", "2.12.8") +scalaVersion in ThisBuild := "2.12.8" 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 ec51a8eae..bab2c5efd 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.9" +ThisBuild / scalaVersion := "2.12.8" 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 7974a8d3a..8374bcaef 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.9" +ThisBuild / scalaVersion := "2.12.8" ThisBuild / trackInternalDependencies := TrackLevel.NoTracking lazy val root = (project in file(".")) diff --git a/sbt/src/sbt-test/run/fork-loader/build.sbt b/sbt/src/sbt-test/run/fork-loader/build.sbt index ff13bd7b3..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.9" +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 2163039c5..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.9" +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 df7ecf443..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.9! +> ++2.12.8! > compile 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 47d1efcf4..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.9" +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 47d1efcf4..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.9" +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 47d1efcf4..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.9" +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 47d1efcf4..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.9" +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 9e255573b..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.9" +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 072d46809..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.9" +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 072d46809..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.9" +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 b624495d8..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.9" +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 12461913e..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.9" +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 2d336c190..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.9" +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 16ce6695b..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.9" +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 148217794..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.9" +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 f0bb6f58c..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.9" +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 49255f5d7..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.9" +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 4738db126..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.9" +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 d95a4cf75..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.9" +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 22528c983..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.9" +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 5589ec5ab..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.9" +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 4175399a0..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.9" +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 b2d757473..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.9" +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 c8ab55b32..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.9" +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 3094f2075..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.9" +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 fb146bf16..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.9" +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.9", "") + 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 597a14d77..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.9" +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 4c7f6eb1e..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.9" +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 5c9c4a43e..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.9" +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 401c1943b..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.9" +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 95ec2207f..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.9" +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 5c9c4a43e..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.9" +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 40b0994ec..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.9" +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 9ad20f5d3..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.9" +ThisBuild / scalaVersion := "2.12.8" 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 789d111d8..bf3d80a7c 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.9") +crossScalaVersions := Seq("2.11.12", "2.12.8") diff --git a/sbt/src/server-test/handshake/build.sbt b/sbt/src/server-test/handshake/build.sbt index 5420e723e..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.9" +ThisBuild / scalaVersion := "2.12.8" lazy val root = (project in file(".")) .settings(