summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias <mathias@spray.io>2013-05-31 12:22:42 +0200
committerMathias <mathias@spray.io>2013-05-31 12:22:42 +0200
commitfecfebd00519f30f25a6c007b3c9a9a4c6901d09 (patch)
treedbe281a8c0965b5262ee7121d9ef9f275c72644f
parentbf1e8ade08a4ac6cfd3895a9574f56a5b2724e8f (diff)
downloadspray-json-fecfebd00519f30f25a6c007b3c9a9a4c6901d09.tar.gz
spray-json-fecfebd00519f30f25a6c007b3c9a9a4c6901d09.tar.bz2
spray-json-fecfebd00519f30f25a6c007b3c9a9a4c6901d09.zip
Prepare for release 1.2.5v1.2.5
-rw-r--r--CHANGELOG5
-rw-r--r--README.markdown4
-rw-r--r--build.sbt2
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7d98ede..34d1ca0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 1.2.5 (2013-05-31)
+--------------------------
+- Extended `jsonFormat` support for case classes w/ > 15 parameters, closed #48
+
+
Version 1.2.4 (2013-05-13)
--------------------------
- Upgraded to 2.10.1 and parboiled 1.1.5
diff --git a/README.markdown b/README.markdown
index 2e31551..fdd7e49 100644
--- a/README.markdown
+++ b/README.markdown
@@ -11,13 +11,13 @@ It sports the following features:
### Installation
_spray-json_ is available from the [repo.spray.io] repository.
-The latest release is `1.2.4` and is built against Scala 2.9.3 as well as Scala 2.10.1.
+The latest release is `1.2.5` and is built against Scala 2.9.3 as well as Scala 2.10.1.
If you use SBT you can include _spray-json_ in your project with
resolvers += "spray" at "http://repo.spray.io/"
- "io.spray" %% "spray-json" % "1.2.4" cross CrossVersion.full
+ "io.spray" %% "spray-json" % "1.2.5" cross CrossVersion.full
(the trailing "cross CrossVersion.full" modifier is only required when using SBT 0.12.x with Scala < 2.10)
diff --git a/build.sbt b/build.sbt
index c8f006b..78e75f0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
name := "spray-json"
-version := "1.2.4"
+version := "1.2.5"
organization := "io.spray"