Use latest Scala 2.12.4

sbt · Oct 21, 2017 · 2b3578e · 2b3578e
1 parent ecfbc34
commit 2b3578e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,4 @@ matrix:
  scala: 2.10.6
  - env: SBT_VERSION="1.0.0"
  jdk: oraclejdk8
- scala: 2.12.3
+ scala: 2.12.4
diff --git a/build.sbt b/build.sbt
@@ -42,9 +42,9 @@ def commonSettings = {
  ),
  scalaVersion := {
  (sbtVersion in GlobalScope).value match {
- case sbt10 if sbt10.startsWith("1.0") => "2.12.3"
+ case sbt10 if sbt10.startsWith("1.0") => "2.12.4"
  case sbt013 if sbt013.startsWith("0.13.") => "2.10.6"
- case _ => "2.12.3"
+ case _ => "2.12.4"
  }
  },
  sbtDependency in GlobalScope := {

diff --git a/src/sbt-test/sbteclipse/02-contents/build.sbt b/src/sbt-test/sbteclipse/02-contents/build.sbt
@@ -15,7 +15,7 @@ lazy val root =
  unmanagedSourceDirectories in Compile += { baseDirectory(new File(_, "src/main/scala")).value },
  unmanagedSourceDirectories in Test += { baseDirectory(new File(_, "src/test/scala")).value },
  libraryDependencies ++= Seq(
- "org.scala-lang" % "scala-compiler" % "2.12.3",
+ "org.scala-lang" % "scala-compiler" % "2.12.4",
  "biz.aQute.bnd" % "biz.aQute.bndlib" % "3.4.0"
  ),
  retrieveManaged := true

diff --git a/src/sbt-test/sbteclipse/02-contents/test b/src/sbt-test/sbteclipse/02-contents/test
@@ -1,4 +1,4 @@
-$ mkdir target/scala-2.12.3/src_managed/main
+$ mkdir target/scala-2.12.4/src_managed/main
 > eclipse skip-parents=false
 > verifyProjectXml
 > verifyProjectXmlJava

diff --git a/src/sbt-test/sbteclipse/06-multi-scala-version-support/build.sbt b/src/sbt-test/sbteclipse/06-multi-scala-version-support/build.sbt
@@ -15,6 +15,6 @@ lazy val subb =
  Project("subb", new File("subb")).
  settings(
  Defaults.coreDefaultSettings ++ Seq(
- scalaVersion := "2.12.3"
+ scalaVersion := "2.12.4"
  )
  )