summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias <mathias@spray.io>2013-05-13 13:10:20 +0200
committerMathias <mathias@spray.io>2013-05-13 13:32:19 +0200
commitad075808107758a99be09ce2aaac72539cb85875 (patch)
treefa4ee8f79ac5e6d91260e9f3481e3f06e0b3304e
parentd71c6b6c813b89881a31d4c3ad934adf7f7d0eeb (diff)
downloadspray-json-ad075808107758a99be09ce2aaac72539cb85875.tar.gz
spray-json-ad075808107758a99be09ce2aaac72539cb85875.tar.bz2
spray-json-ad075808107758a99be09ce2aaac72539cb85875.zip
sbt: upgrade to Scala 2.10.1, Scala 2.9.3, parboiled 1.1.5 and latest specs2 versions
-rw-r--r--build.sbt14
1 files changed, 7 insertions, 7 deletions
diff --git a/build.sbt b/build.sbt
index 2517910..4d082f4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -14,21 +14,21 @@ startYear := Some(2011)
licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-scalaVersion := "2.10.0"
+scalaVersion := "2.10.1"
scalacOptions <<= scalaVersion map {
- case "2.9.2" => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
- case "2.10.0" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
+ case "2.9.3" => Seq("-unchecked", "-deprecation", "-encoding", "utf8")
+ case "2.10.1" => Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
}
resolvers += Opts.resolver.sonatypeReleases
libraryDependencies <++= scalaVersion { sv =>
Seq(
- "org.parboiled" %% "parboiled-scala" % "1.1.4" % "compile",
+ "org.parboiled" %% "parboiled-scala" % "1.1.5" % "compile",
sv match {
- case "2.9.2" => "org.specs2" %% "specs2" % "1.12.3" % "test"
- case "2.10.0" => "org.specs2" %% "specs2" % "1.13" % "test"
+ case "2.9.3" => "org.specs2" %% "specs2" % "1.12.4.1" % "test"
+ case "2.10.1" => "org.specs2" %% "specs2" % "1.14" % "test"
}
)
}
@@ -40,7 +40,7 @@ scaladocOptions <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " +
// publishing
///////////////
-crossScalaVersions := Seq("2.9.2", "2.10.0")
+crossScalaVersions := Seq("2.9.3", "2.10.1")
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)