From 8d2a15da6ee39b0b7281ef3e30487a28c568c448 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 14 Dec 2015 05:26:34 -0500 Subject: [PATCH 1/2] Bumping Scala version to 2.10.6. --- build.sbt | 4 ++-- notes/0.13.10/bump-scalaversion.md | 10 ++++++++++ project/Dependencies.scala | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 notes/0.13.10/bump-scalaversion.md diff --git a/build.sbt b/build.sbt index 46aad7661..509f95495 100644 --- a/build.sbt +++ b/build.sbt @@ -569,10 +569,10 @@ def customCommands: Seq[Setting[_]] = Seq( }, /** There are several complications with sbt's build. * First is the fact that interface project is a Java-only project - * that uses source generator from datatype subproject in Scala 2.10.5. + * that uses source generator from datatype subproject in Scala 2.10.6. * * Second is the fact that all subprojects are released with crossPaths - * turned off for the sbt's Scala version 2.10.5, but some of them are also + * turned off for the sbt's Scala version 2.10.6, but some of them are also * cross published against 2.11.1 with crossPaths turned on. * * `so compile` handles 2.10.x/2.11.x cross building. diff --git a/notes/0.13.10/bump-scalaversion.md b/notes/0.13.10/bump-scalaversion.md new file mode 100644 index 000000000..0c7fcfb19 --- /dev/null +++ b/notes/0.13.10/bump-scalaversion.md @@ -0,0 +1,10 @@ + + [@eed3si9n]: https://github.com/eed3si9n + +### Fixes with compatibility implications + +### Improvements + +- Updated Scala version used by the build to 2.10.6. + +### Bug fixes diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8e37675a5..6a3d7633b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,7 +5,7 @@ object Dependencies { lazy val scala282 = "2.8.2" lazy val scala292 = "2.9.2" lazy val scala293 = "2.9.3" - lazy val scala210 = "2.10.5" + lazy val scala210 = "2.10.6" lazy val scala211 = "2.11.7" lazy val jline = "jline" % "jline" % "2.13" From a14112720a7ac2e392e8de21b307b73833ffea9b Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Mon, 14 Dec 2015 11:38:57 -0500 Subject: [PATCH 2/2] Bump up Scala version in project/p.sbt --- project/p.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/p.sbt b/project/p.sbt index b2b8e4830..9afec8288 100644 --- a/project/p.sbt +++ b/project/p.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.10.5" +scalaVersion := "2.10.6" libraryDependencies ++= Seq( "net.databinder" %% "dispatch-http" % "0.8.9",