summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorMathias <mathias@spray.io>2015-05-06 12:04:14 +0200
committerMathias <mathias@spray.io>2015-05-06 12:41:50 +0200
commit45672ff730516dd28416cb3a5f5c2c8be1d3e0b5 (patch)
treea076eb388b7f2f25095233a0897eabefa1924a3f /build.sbt
parentf1c92120ceef1430472aeffc5169b547b4ab985e (diff)
downloadspray-json-45672ff730516dd28416cb3a5f5c2c8be1d3e0b5.tar.gz
spray-json-45672ff730516dd28416cb3a5f5c2c8be1d3e0b5.tar.bz2
spray-json-45672ff730516dd28416cb3a5f5c2c8be1d3e0b5.zip
Upgrade to SBT 0.13.8 and Scala 2.11.6
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index 45e2fa8..87a4786 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.11.5"
+scalaVersion := "2.11.6"
scalacOptions ++= Seq("-feature", "-language:_", "-unchecked", "-deprecation", "-encoding", "utf8")
@@ -46,7 +46,7 @@ OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-
// publishing
///////////////
-crossScalaVersions := Seq("2.10.4", "2.11.2")
+crossScalaVersions := Seq("2.10.5", "2.11.6")
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)