summaryrefslogtreecommitdiff
path: root/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2011-05-24 23:02:25 +0200
committerMathias <mathias@spray.cc>2011-05-24 23:02:25 +0200
commit57bc594e1daa7dff6013759d6fc65f183118aa33 (patch)
treef8ad4c437284fb0583a556a98aba74126a988ea3 /src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
parent854700927ca944d684c9e0758b5a52da4dde2609 (diff)
downloadspray-json-57bc594e1daa7dff6013759d6fc65f183118aa33.tar.gz
spray-json-57bc594e1daa7dff6013759d6fc65f183118aa33.tar.bz2
spray-json-57bc594e1daa7dff6013759d6fc65f183118aa33.zip
Add JsonFormat for JsValues, some more helpers
Diffstat (limited to 'src/main/scala/cc/spray/json/DefaultJsonProtocol.scala')
-rw-r--r--src/main/scala/cc/spray/json/DefaultJsonProtocol.scala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala b/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
index a8201c2..6f8daf5 100644
--- a/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
+++ b/src/main/scala/cc/spray/json/DefaultJsonProtocol.scala
@@ -20,6 +20,11 @@ package cc.spray.json
/**
* Provides all the predefined JsonFormats.
*/
-trait DefaultJsonProtocol extends BasicFormats with StandardFormats with CollectionFormats with GenericFormats
+trait DefaultJsonProtocol
+ extends BasicFormats
+ with StandardFormats
+ with CollectionFormats
+ with ProductFormats
+ with AdditionalFormats
object DefaultJsonProtocol extends DefaultJsonProtocol