From 4477a42b5af6273788ef9a386b93d3d967cfe4d9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 27 Apr 2018 19:07:08 +0200 Subject: [PATCH] upgrade Scala 2.12.4 -> 2.12.6 I have no specific user-visible benefit in mind other than fewer JARs to download for people who are on current versions of things --- CONTRIBUTING.md | 2 +- main/src/main/scala/sbt/PluginCross.scala | 2 +- project/Dependencies.scala | 2 +- project/plugins.sbt | 2 +- sbt/src/sbt-test/tests/fork-async/build.sbt | 2 +- sbt/src/test/scala/sbt/RunFromSourceMain.scala | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7dc91fcdd..f7356793c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -200,7 +200,7 @@ $ sbt ### Clearing out boot and local cache -When you run a locally built sbt, the JAR artifacts will be now cached under `$HOME/.sbt/boot/scala-2.12.4/org.scala-sbt/sbt/1.$MINOR.$PATCH-SNAPSHOT` directory. To clear this out run: `reboot dev` command from sbt's session of your test application. +When you run a locally built sbt, the JAR artifacts will be now cached under `$HOME/.sbt/boot/scala-2.12.6/org.scala-sbt/sbt/1.$MINOR.$PATCH-SNAPSHOT` directory. To clear this out run: `reboot dev` command from sbt's session of your test application. One drawback of `-SNAPSHOT` version is that it's slow to resolve as it tries to hit all the resolvers. You can workaround that by using a version name like `1.$MINOR.$PATCH-LOCAL1`. A non-SNAPSHOT artifacts will now be cached under `$HOME/.ivy/cache/` directory, so you need to clear that out using [sbt-dirty-money](https://github.com/sbt/sbt-dirty-money)'s `cleanCache` task. diff --git a/main/src/main/scala/sbt/PluginCross.scala b/main/src/main/scala/sbt/PluginCross.scala index 9828b42a7..91e823bbc 100644 --- a/main/src/main/scala/sbt/PluginCross.scala +++ b/main/src/main/scala/sbt/PluginCross.scala @@ -93,7 +93,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.4" + case VersionNumber(Seq(1, 0, _*), _, _) => "2.12.6" case _ => sys.error(s"Unsupported sbt binary version: $sv") } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bcefc8b4e..b1e9fd0ab 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.5" + val scala212 = "2.12.6" val baseScalaVersion = scala212 // sbt modules diff --git a/project/plugins.sbt b/project/plugins.sbt index 68b01d14b..b13554d41 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.12.4" +scalaVersion := "2.12.6" scalacOptions ++= Seq("-feature", "-language:postfixOps") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.6") diff --git a/sbt/src/sbt-test/tests/fork-async/build.sbt b/sbt/src/sbt-test/tests/fork-async/build.sbt index bb42b0c17..3ddfca63c 100644 --- a/sbt/src/sbt-test/tests/fork-async/build.sbt +++ b/sbt/src/sbt-test/tests/fork-async/build.sbt @@ -2,7 +2,7 @@ testFrameworks += new TestFramework("utest.runner.Framework") lazy val root = (project in file(".")). settings( - scalaVersion := "2.12.4", + scalaVersion := "2.12.6", libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.4" % Test, fork in Test := true ) diff --git a/sbt/src/test/scala/sbt/RunFromSourceMain.scala b/sbt/src/test/scala/sbt/RunFromSourceMain.scala index c0bd9cfc1..a625da9a8 100644 --- a/sbt/src/test/scala/sbt/RunFromSourceMain.scala +++ b/sbt/src/test/scala/sbt/RunFromSourceMain.scala @@ -14,8 +14,8 @@ import buildinfo.TestBuildInfo import xsbti._ object RunFromSourceMain { - private val sbtVersion = "1.0.3" // "dev" - private val scalaVersion = "2.12.4" + private val sbtVersion = "1.1.0" // "dev" + private val scalaVersion = "2.12.6" def fork(workingDirectory: File): Try[Unit] = { val fo = ForkOptions()