diff options
author | Mathias <mathias@spray.cc> | 2011-05-17 11:09:12 +0200 |
---|---|---|
committer | Mathias <mathias@spray.cc> | 2011-05-17 11:09:12 +0200 |
commit | 25f696587cedc7aad2053cd50ca9da22e42c3146 (patch) | |
tree | 0d731a7cc47dc7a6e66aae8572995586977b6938 | |
parent | 1051f06850047a63c9fabd08fad9ea7edefaa149 (diff) | |
download | spray-json-25f696587cedc7aad2053cd50ca9da22e42c3146.tar.gz spray-json-25f696587cedc7aad2053cd50ca9da22e42c3146.tar.bz2 spray-json-25f696587cedc7aad2053cd50ca9da22e42c3146.zip |
Upgrade to Scala 2.9.0, SBT 0.7.7 and parboiled 1.0.0
-rw-r--r-- | README.markdown | 2 | ||||
-rw-r--r-- | project/build.properties | 4 | ||||
-rw-r--r-- | project/build/Project.scala | 7 | ||||
-rw-r--r-- | src/test/scala/cc/spray/json/CollectionFormatsSpec.scala | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/README.markdown b/README.markdown index 34d7562..cb10113 100644 --- a/README.markdown +++ b/README.markdown @@ -12,6 +12,7 @@ It sports the following features: _spray-json_ is available from the [scala-tools.org][] repositories. There is no official release yet, but the current snapshot is `1.0-SNAPSHOT`. +It is built against Scala 2.9.0, but backporting to 2.8.1 is no problem (let me know if you need a 2.8.1 compatible version). If you use SBT you can include _spray-json_ in your project with @@ -19,7 +20,6 @@ If you use SBT you can include _spray-json_ in your project with val sprayJson = "cc.spray.json" %% "spray-json" % "1.0.0-SNAPSHOT" % "compile" withSources() _spray-json_ has only one dependency: the parsing library [parboiled][] (which is also a dependency of _spray-server_ and _spray_client_, so if you use _spray-json_ with either of them you are not incurring any additional dependency). -Currently it is built against Scala 2.8.1. A Scala 2.9.0 version will be available shortly after 2.9.0 final is shipped. ### Usage diff --git a/project/build.properties b/project/build.properties index 402713a..c926ef8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,6 +1,6 @@ project.organization=cc.spray.json project.name=spray-json -sbt.version=0.7.5 +sbt.version=0.7.7 project.version=1.0.0-SNAPSHOT -build.scala.versions=2.8.1 +build.scala.versions=2.9.0 project.initialize=false diff --git a/project/build/Project.scala b/project/build/Project.scala index 77459d0..62b0b21 100644 --- a/project/build/Project.scala +++ b/project/build/Project.scala @@ -17,15 +17,14 @@ class Project(info: ProjectInfo) extends DefaultProject(info) { // Therefore, if repositories are defined, this must happen as def, not as val. // ------------------------------------------------------------------------------------------------------------------- import Repositories._ - val parboiledModuleConfig = ModuleConfiguration("org.parboiled", ScalaToolsSnapshots) // ------------------------------------------------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------------------------------------------------- - val parboiledC = "org.parboiled" % "parboiled-core" % "0.12.0-SNAPSHOT" % "compile" withSources() - val parboiledS = "org.parboiled" % "parboiled-scala" % "0.12.0-SNAPSHOT" % "compile" withSources() + val parboiledC = "org.parboiled" % "parboiled-core" % "1.0.0" % "compile" withSources() + val parboiledS = "org.parboiled" % "parboiled-scala" % "1.0.0" % "compile" withSources() - val specs = "org.scala-tools.testing" %% "specs" % "1.6.7" % "test" withSources() + val specs = "org.scala-tools.testing" %% "specs" % "1.6.8" % "test" withSources() // ------------------------------------------------------------------------------------------------------------------- // Options diff --git a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala index 58175ac..7a47fb7 100644 --- a/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala +++ b/src/test/scala/cc/spray/json/CollectionFormatsSpec.scala @@ -54,7 +54,7 @@ class CollectionFormatsSpec extends Specification with CollectionFormats with Ba "The mutableSetFormat" should { val set = collection.mutable.Set(1, 2, 3) - val json = JsArray(JsNumber(3), JsNumber(1), JsNumber(2)) + val json = JsArray(JsNumber(1), JsNumber(3), JsNumber(2)) "convert a collection.mutable.Set[Int] to a JsArray of JsNumbers" in { set.toJson mustEqual json } |