summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorMathias <mathias@spray.io>2012-11-28 15:50:14 +0100
committerMathias <mathias@spray.io>2012-11-28 15:57:35 +0100
commit9d8edfbef1b7870e9b88236325c0b424486fd17f (patch)
treee2c3c3ea67f95263890414c73f678c7b9a56f944 /build.sbt
parentf78b91acb85a3411582c1f9f5c2dfe4b954a9b9c (diff)
downloadspray-json-9d8edfbef1b7870e9b88236325c0b424486fd17f.tar.gz
spray-json-9d8edfbef1b7870e9b88236325c0b424486fd17f.tar.bz2
spray-json-9d8edfbef1b7870e9b88236325c0b424486fd17f.zip
Upgrade to Scala 2.10.0-RC3, parboiled 1.1.4 and specs2 1.12.3
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt10
1 files changed, 5 insertions, 5 deletions
diff --git a/build.sbt b/build.sbt
index 5f8652c..cf2a372 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.10.0-RC2"
+scalaVersion := "2.10.0-RC3"
scalacOptions <<= scalaVersion map {
case x if x startsWith "2.9" =>
@@ -23,11 +23,11 @@ scalacOptions <<= scalaVersion map {
Seq("-feature", "-language:implicitConversions", "-unchecked", "-deprecation", "-encoding", "utf8")
}
-resolvers += "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases/"
+resolvers += Opts.resolver.sonatypeReleases
libraryDependencies ++= Seq(
- "org.parboiled" %% "parboiled-scala" % "1.1.3" % "compile",
- "org.specs2" %% "specs2" % "1.12.2" % "test"
+ "org.parboiled" %% "parboiled-scala" % "1.1.4" % "compile",
+ "org.specs2" %% "specs2" % "1.12.3" % "test"
)
scaladocOptions <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " + v) }
@@ -37,7 +37,7 @@ scaladocOptions <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " +
// publishing
///////////////
-crossScalaVersions := Seq("2.9.2", "2.10.0-RC2")
+crossScalaVersions := Seq("2.9.2", "2.10.0-RC3")
scalaBinaryVersion <<= scalaVersion(sV => if (CrossVersion.isStable(sV)) CrossVersion.binaryScalaVersion(sV) else sV)