diff options
author | Mathias <mathias@spray.io> | 2014-04-22 13:47:52 +0200 |
---|---|---|
committer | Mathias <mathias@spray.io> | 2014-04-22 13:47:52 +0200 |
commit | 6b1aa0449d4eee0b6b28f1025744f083db4ea800 (patch) | |
tree | cfd0675200d08878e41ecd7c2cd8c9914234b9d7 | |
parent | f5937815e4eab31853d5f5e65b0dda8fb6b81e15 (diff) | |
download | spray-json-6b1aa0449d4eee0b6b28f1025744f083db4ea800.tar.gz spray-json-6b1aa0449d4eee0b6b28f1025744f083db4ea800.tar.bz2 spray-json-6b1aa0449d4eee0b6b28f1025744f083db4ea800.zip |
Upgrade to Scala 2.11.0 and SBT 0.13.2
-rw-r--r-- | build.sbt | 6 | ||||
-rw-r--r-- | project/build.properties | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -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 index 37b489c..8ac605a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.1 +sbt.version=0.13.2 |