summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2012-10-12 14:07:10 +0200
committerMathias <mathias@spray.cc>2012-10-12 14:07:10 +0200
commit573b9d6e0b637e6ffe9c5a036bf552542d79eae8 (patch)
tree2f17f1c799e865b0cadd885e71d0c5bb50735681
parent7cb4d5e95af773d4aafc70b31d1e58fde64d3fc9 (diff)
downloadspray-json-573b9d6e0b637e6ffe9c5a036bf552542d79eae8.tar.gz
spray-json-573b9d6e0b637e6ffe9c5a036bf552542d79eae8.tar.bz2
spray-json-573b9d6e0b637e6ffe9c5a036bf552542d79eae8.zip
Upgrade to Scala 2.9.2, SBT 0.12.1 and parboiled 1.1.1
-rw-r--r--build.sbt8
-rw-r--r--project/build.properties2
-rw-r--r--project/plugins.sbt7
3 files changed, 6 insertions, 11 deletions
diff --git a/build.sbt b/build.sbt
index d88b22b..4adc735 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
name := "spray-json"
-version := "1.1.1"
+version := "1.1.2"
organization := "cc.spray"
@@ -14,13 +14,13 @@ startYear := Some(2011)
licenses := Seq("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt"))
-scalaVersion := "2.9.1"
+scalaVersion := "2.9.2"
scalacOptions := Seq("-deprecation", "-encoding", "utf8")
libraryDependencies ++= Seq(
- "org.parboiled" % "parboiled-scala" % "1.0.2" % "compile",
- "org.specs2" %% "specs2" % "1.7.1" % "test"
+ "org.parboiled" %% "parboiled-scala" % "1.1.1" % "compile",
+ "org.specs2" %% "specs2" % "1.12.2" % "test"
)
scaladocOptions <<= (name, version).map { (n, v) => Seq("-doc-title", n + " " + v) }
diff --git a/project/build.properties b/project/build.properties
index fdfc61f..2b9d40c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.11.2 \ No newline at end of file
+sbt.version=0.12.1 \ No newline at end of file
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 9660fcf..feffd34 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,6 +1 @@
-addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.1")
-
-resolvers ++= Seq(
- "less is" at "http://repo.lessis.me",
- "coda" at "http://repo.codahale.com"
-) \ No newline at end of file
+addSbtPlugin("me.lessis" % "ls-sbt" % "0.1.2") \ No newline at end of file