summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG5
-rw-r--r--README.markdown4
-rw-r--r--build.sbt2
-rw-r--r--notes/1.2.1.markdown2
-rw-r--r--notes/1.2.2.markdown2
-rw-r--r--src/main/ls/1.2.2.json (renamed from src/main/ls/1.2.1.json)4
6 files changed, 12 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0bd003e..db09d3b 100644
--- a/CHANGELOG
+++ b/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
diff --git a/README.markdown b/README.markdown
index 3d2c4c4..1ef8eec 100644
--- a/README.markdown
+++ b/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)
diff --git a/build.sbt b/build.sbt
index ef797d5..e982a3e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
name := "spray-json"
-version := "1.2.1"
+version := "1.2.2"
organization := "io.spray"
diff --git a/notes/1.2.1.markdown b/notes/1.2.1.markdown
deleted file mode 100644
index 851e6e1..0000000
--- a/notes/1.2.1.markdown
+++ /dev/null
@@ -1,2 +0,0 @@
-- Upgraded to parboiled 1.1.2
-- Cross-published for Scala 2.9.2 and Scala 2.10.0-RC1 \ No newline at end of file
diff --git a/notes/1.2.2.markdown b/notes/1.2.2.markdown
new file mode 100644
index 0000000..7a3a723
--- /dev/null
+++ b/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 \ No newline at end of file
diff --git a/src/main/ls/1.2.1.json b/src/main/ls/1.2.2.json
index 95a4381..3daed44 100644
--- a/src/main/ls/1.2.1.json
+++ b/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" : [ {