summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-02-20 22:09:17 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-03-17 17:14:42 +0100
commitd0de5a9e8a6c6fe7c65c8245259fc2c0843f5d44 (patch)
tree088caa9dbe453eeae27a2133f0cf4674d53058a4 /build.sbt
parent604efd5728bcb0b993f96bc18058e29bc0d4e63e (diff)
downloadspray-json-d0de5a9e8a6c6fe7c65c8245259fc2c0843f5d44.tar.gz
spray-json-d0de5a9e8a6c6fe7c65c8245259fc2c0843f5d44.tar.bz2
spray-json-d0de5a9e8a6c6fe7c65c8245259fc2c0843f5d44.zip
Support Scala 2.11 in the build definition file.
Fix pattern matches to work with Scala 2.10 and 2.11 by just using the wildcard case.
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt9
1 files changed, 5 insertions, 4 deletions
diff --git a/build.sbt b/build.sbt
index c279897..fe859e6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,20 +18,21 @@ scalaVersion := "2.10.3"
scalacOptions <<= scalaVersion map {
case "2.9.3" => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
- case x if x startsWith "2.10" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
+ case _ => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
}
resolvers += Opts.resolver.sonatypeReleases
-libraryDependencies <++= scalaVersion { sv =>
+libraryDependencies ++= {
Seq("org.parboiled" %% "parboiled-scala" % "1.1.5" % "compile") ++
- (sv match {
+ (scalaVersion.value match {
case "2.9.3" =>
Seq(
"org.specs2" %% "specs2" % "1.12.4.1" % "test",
"org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
)
- case x if x startsWith "2.10" =>
+ // Scala 2.10 and Scala 2.11
+ case _ =>
Seq(
"org.specs2" %% "specs2" % "2.3.10" % "test",
"org.scalacheck" %% "scalacheck" % "1.11.3" % "test"