summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorMathias <mathias@decodified.com>2015-05-06 15:50:11 +0200
committerMathias <mathias@decodified.com>2015-05-06 15:50:11 +0200
commit8c838e7e00b0582fee528cde6e8cd67c39256664 (patch)
tree61d20d6a8b82a763d5e400d74087605eb941f554 /build.sbt
parentf1c92120ceef1430472aeffc5169b547b4ab985e (diff)
parent0477e5082dc8cac5e15b7911b9c6e022be6e0c0a (diff)
downloadspray-json-8c838e7e00b0582fee528cde6e8cd67c39256664.tar.gz
spray-json-8c838e7e00b0582fee528cde6e8cd67c39256664.tar.bz2
spray-json-8c838e7e00b0582fee528cde6e8cd67c39256664.zip
Merge pull request #154 from spray/wip-mathias
Close "low-hanging" tickets
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)