Permalink
Browse files

Prepare for release 1.2.2

  • Loading branch information...
1 parent 0f49d4c commit d63a3273f47e7268ab616f3414dc9b6328f45ff3 @sirthias sirthias committed Oct 16, 2012
Showing with 12 additions and 7 deletions.
  1. +5 −0 CHANGELOG
  2. +2 −2 README.markdown
  3. +1 −1 build.sbt
  4. +0 −2 notes/1.2.1.markdown
  5. +2 −0 notes/1.2.2.markdown
  6. +2 −2 src/main/ls/{1.2.1.json → 1.2.2.json}
View
5 CHANGELOG
@@ -1,3 +1,8 @@
+Version 1.2.2 (2012-10-16)
+--------------------------
+- Upgraded to parboiled 1.1.3
+
+
Version 1.2.1 (2012-10-15)
--------------------------
- Upgraded to parboiled 1.1.2
View
4 README.markdown
@@ -11,11 +11,11 @@ It sports the following features:
### Installation
_spray-json_ is available from the [repo.spray.io] repository.
-The latest release is `1.2.1` and is built against Scala 2.9.2 as well as Scala 2.10.0-RC1.
+The latest release is `1.2.2` and is built against Scala 2.9.2 as well as Scala 2.10.0-RC1.
If you use SBT you can include _spray-json_ in your project with
- "io.spray" %% "spray-json" % "1.2.1" cross CrossVersion.full
+ "io.spray" %% "spray-json" % "1.2.2" cross CrossVersion.full
(the trailing "cross CrossVersion.full" modifier is only required for SBT 0.12.x)
View
2 build.sbt
@@ -1,6 +1,6 @@
name := "spray-json"
-version := "1.2.1"
+version := "1.2.2"
organization := "io.spray"
View
2 notes/1.2.1.markdown
@@ -1,2 +0,0 @@
-- Upgraded to parboiled 1.1.2
-- Cross-published for Scala 2.9.2 and Scala 2.10.0-RC1
View
2 notes/1.2.2.markdown
@@ -0,0 +1,2 @@
+- Upgraded to parboiled 1.1.3
+- Cross-published for Scala 2.9.2 and Scala 2.10.0-RC1
View
4 src/main/ls/1.2.1.json → src/main/ls/1.2.2.json
@@ -1,7 +1,7 @@
{
"organization" : "io.spray",
"name" : "spray-json",
- "version" : "1.2.1",
+ "version" : "1.2.2",
"description" : "A Scala library for easy and idiomatic JSON (de)serialization",
"site" : "https://github.com/spray/spray-json",
"tags" : [ "json" ],
@@ -10,7 +10,7 @@
"dependencies" : [ {
"organization" : "org.parboiled",
"name" : "parboiled-scala",
- "version" : "1.1.2"
+ "version" : "1.1.3"
} ],
"scalas" : [ "2.9.2", "2.10.0-RC1" ],
"licenses" : [ {

0 comments on commit d63a327

Please sign in to comment.