summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2014-03-11 17:04:43 +0100
committerJohannes Rudolph <johannes.rudolph@gmail.com>2014-03-11 17:04:43 +0100
commit615f60aa6e8e9481ada227bc0a6db76ba8c34920 (patch)
tree6a61ec3ee7e103231941a1943877dd054da93070 /build.sbt
parent7a2d6acdca84f97b6870735cc206db33c9a3bfb8 (diff)
downloadspray-json-615f60aa6e8e9481ada227bc0a6db76ba8c34920.tar.gz
spray-json-615f60aa6e8e9481ada227bc0a6db76ba8c34920.tar.bz2
spray-json-615f60aa6e8e9481ada227bc0a6db76ba8c34920.zip
upgrade to Scala 2.10.3
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt8
1 files changed, 4 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index 78e75f0..ced5227 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,11 +14,11 @@ startYear := Some(2011)
licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-scalaVersion := "2.10.1"
+scalaVersion := "2.10.3"
scalacOptions <<= scalaVersion map {
case "2.9.3" => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
- case "2.10.1" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
+ case x if x startsWith "2.10" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
}
resolvers += Opts.resolver.sonatypeReleases
@@ -28,7 +28,7 @@ libraryDependencies <++= scalaVersion { sv =>
"org.parboiled" %% "parboiled-scala" % "1.1.5" % "compile",
sv match {
case "2.9.3" => "org.specs2" %% "specs2" % "1.12.4.1" % "test"
- case "2.10.1" => "org.specs2" %% "specs2" % "1.14" % "test"
+ case x if x startsWith "2.10" => "org.specs2" %% "specs2" % "1.14" % "test"
}
)
}
@@ -42,7 +42,7 @@ Boilerplate.settings
// publishing
///////////////
-crossScalaVersions := Seq("2.9.3", "2.10.1")
+crossScalaVersions := Seq("2.9.3", "2.10.3")
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)