summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2012-10-12 14:35:12 +0200
committerMathias <mathias@spray.cc>2012-10-12 14:35:12 +0200
commit72987d6fa81c944470a1b16c1fa9a727c82c459b (patch)
treedfaeaf63a7f3cdf5cefa7035acf871395ab0700f
parente5a7de26dfc8a4bb4410b7ee500624e30bf66650 (diff)
downloadspray-json-72987d6fa81c944470a1b16c1fa9a727c82c459b.tar.gz
spray-json-72987d6fa81c944470a1b16c1fa9a727c82c459b.tar.bz2
spray-json-72987d6fa81c944470a1b16c1fa9a727c82c459b.zip
Finalize 1.2 releasev1.2
-rw-r--r--CHANGELOG7
-rw-r--r--README.markdown8
-rw-r--r--build.sbt2
-rw-r--r--notes/1.2.markdown4
-rw-r--r--notes/about.markdown2
-rw-r--r--src/main/ls/1.2.json21
6 files changed, 38 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 14acfb0..48b3e6b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+Version 1.2 (2012-10-12)
+------------------------
+- Upgraded to Scala 2.9.2 and parboiled 1.1.1
+- Renamed group id from "cc.spray" to "io.spray"
+- Renamed package from "cc.spray.json" to "spray.json"
+
+
Version 1.1.1 (2012-03-13)
--------------------------
- Fixed significant performance problem in JsonParser
diff --git a/README.markdown b/README.markdown
index 569f0f4..a070bda 100644
--- a/README.markdown
+++ b/README.markdown
@@ -11,15 +11,15 @@ It sports the following features:
### Installation
_spray-json_ is available from the [repo.spray.io] repository.
-The latest release is `1.1.1` and is built against Scala 2.9.1.
+The latest release is `1.2` and is built against Scala 2.9.2.
If you use SBT you can include _spray-json_ in your project with
- "io.spray" %% "spray-json" % "1.1.1"
+ "io.spray" %% "spray-json" % "1.2"
_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).
+(which is also a dependency of _spray-http_, so if you use _spray-json_ together with other modules of the *spray*
+suite you are not incurring any additional dependency).
### Usage
diff --git a/build.sbt b/build.sbt
index a0511d9..833295d 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
name := "spray-json"
-version := "1.1.2"
+version := "1.2"
organization := "io.spray"
diff --git a/notes/1.2.markdown b/notes/1.2.markdown
new file mode 100644
index 0000000..bafe2b0
--- /dev/null
+++ b/notes/1.2.markdown
@@ -0,0 +1,4 @@
+- Upgraded to Scala 2.9.2 and parboiled 1.1.1
+- Renamed group id from "cc.spray" to "io.spray"
+- Renamed package from "cc.spray.json" to "spray.json"
+- _spray-json_ artifacts now live on <http://repo.spray.io/> \ No newline at end of file
diff --git a/notes/about.markdown b/notes/about.markdown
index 975f50c..f29246b 100644
--- a/notes/about.markdown
+++ b/notes/about.markdown
@@ -7,6 +7,6 @@ It sports the following features:
* Choice of either compact or pretty JSON-to-string printing
* Type-class based (de)serialization of custom objects (no reflection, no intrusion)
- [spray-json]: http://json.spray.io
+ [spray-json]: https://github.com/spray/spray-json
[JSON]: http://json.org
[parboiled]: http://parboiled.org
diff --git a/src/main/ls/1.2.json b/src/main/ls/1.2.json
new file mode 100644
index 0000000..d085d99
--- /dev/null
+++ b/src/main/ls/1.2.json
@@ -0,0 +1,21 @@
+{
+ "organization" : "io.spray",
+ "name" : "spray-json",
+ "version" : "1.2",
+ "description" : "A Scala library for easy and idiomatic JSON (de)serialization",
+ "site" : "https://github.com/spray/spray-json",
+ "tags" : [ "json" ],
+ "docs" : "http://spray.github.com/spray/api/spray-json/",
+ "resolvers" : [ "http://repo.spray.io" ],
+ "dependencies" : [ {
+ "organization" : "org.parboiled",
+ "name" : "parboiled-scala",
+ "version" : "1.1.1"
+ } ],
+ "scalas" : [ "2.9.2" ],
+ "licenses" : [ {
+ "name" : "Apache 2",
+ "url" : "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ } ],
+ "sbt" : false
+} \ No newline at end of file