summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorMathias <mathias@spray.io>2014-04-22 13:47:52 +0200
committerMathias <mathias@spray.io>2014-04-22 13:47:52 +0200
commit6b1aa0449d4eee0b6b28f1025744f083db4ea800 (patch)
treecfd0675200d08878e41ecd7c2cd8c9914234b9d7 /build.sbt
parentf5937815e4eab31853d5f5e65b0dda8fb6b81e15 (diff)
downloadspray-json-6b1aa0449d4eee0b6b28f1025744f083db4ea800.tar.gz
spray-json-6b1aa0449d4eee0b6b28f1025744f083db4ea800.tar.bz2
spray-json-6b1aa0449d4eee0b6b28f1025744f083db4ea800.zip
Upgrade to Scala 2.11.0 and SBT 0.13.2
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.sbt b/build.sbt
index 41175fe..b3d8a17 100644
--- 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)