Upgrade to Scala 2.11.0 and SBT 0.13.2

spray · Apr 22, 2014 · 6b1aa04 · 6b1aa04
1 parent f593781
commit 6b1aa04
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -14,7 +14,7 @@ startYear := Some(2011)
 
 licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
 
-scalaVersion := "2.10.4"
+scalaVersion := "2.11.0"
 
 scalacOptions <<= scalaVersion map {
   case "2.9.3"  => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
@@ -34,7 +34,7 @@ libraryDependencies ++= {
     // Scala 2.10 and Scala 2.11
     case _ =>
       Seq(
-        "org.specs2" %% "specs2" % "2.3.10" % "test",
+        "org.specs2" %% "specs2" % "2.3.11" % "test",
         "org.scalacheck" %% "scalacheck" % "1.11.3" % "test"
       )
   })
@@ -60,7 +60,7 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
 // publishing
 ///////////////
 
-crossScalaVersions := Seq("2.9.3", "2.10.4", "2.11.0-RC4")
+crossScalaVersions := Seq("2.9.3", "2.10.4", "2.11.0")
 
 scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.1
+sbt.version=0.13.2