diff options
| author | Jakob Odersky <jakob@odersky.com> | 2018-03-08 16:28:33 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2018-03-08 16:28:33 -0800 |
| commit | cf7531102305dd9131748eaf486e9519ab454bcb (patch) | |
| tree | 030a38e7f601138e3176e26cc46b8a8e65189a99 | |
| parent | 5ef502abc058358ec3a329c774bb42b9a7bd106f (diff) | |
| download | spray-json-derivation-cf7531102305dd9131748eaf486e9519ab454bcb.tar.gz spray-json-derivation-cf7531102305dd9131748eaf486e9519ab454bcb.tar.bz2 spray-json-derivation-cf7531102305dd9131748eaf486e9519ab454bcb.zip | |
Rename packages to spray.json, for seamless integration
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/main/scala/DerivedFormats.scala | 3 | ||||
| -rw-r--r-- | src/main/scala/annotations.scala | 2 | ||||
| -rw-r--r-- | src/test/scala/CoproductTypeFormatTests.scala | 4 | ||||
| -rw-r--r-- | src/test/scala/FormatTests.scala | 3 | ||||
| -rw-r--r-- | src/test/scala/ImplicitDerivedFormatTests.scala | 4 | ||||
| -rw-r--r-- | src/test/scala/ProductTypeFormatTests.scala | 4 |
7 files changed, 6 insertions, 16 deletions
@@ -31,7 +31,6 @@ protocol stack. That's it. ```scala import spray.json._ -import xyz.driver.json.ImplicitDerivedFormats object Main extends App with DefaultJsonProtocol with ImplicitDerivedFormats { @@ -73,7 +72,6 @@ object Main extends App with DefaultJsonProtocol with ImplicitDerivedFormats { It is also possible to summon derived formats explicitly by mixing in `DerivedFormats`instead of `ImplicitDerivedFormats`: ```scala import spray.json._ -import xyz.driver.json.DerivedFormats object Main extends App with DefaultJsonProtocol with DerivedFormats { diff --git a/src/main/scala/DerivedFormats.scala b/src/main/scala/DerivedFormats.scala index 4339e5c..c3f0811 100644 --- a/src/main/scala/DerivedFormats.scala +++ b/src/main/scala/DerivedFormats.scala @@ -1,7 +1,6 @@ -package xyz.driver.json +package spray.json import magnolia._ -import spray.json._ import scala.language.experimental.macros diff --git a/src/main/scala/annotations.scala b/src/main/scala/annotations.scala index 216030e..9d35d16 100644 --- a/src/main/scala/annotations.scala +++ b/src/main/scala/annotations.scala @@ -1,4 +1,4 @@ -package xyz.driver.json +package spray.json import scala.annotation.StaticAnnotation diff --git a/src/test/scala/CoproductTypeFormatTests.scala b/src/test/scala/CoproductTypeFormatTests.scala index ec9b3f5..de73967 100644 --- a/src/test/scala/CoproductTypeFormatTests.scala +++ b/src/test/scala/CoproductTypeFormatTests.scala @@ -1,6 +1,4 @@ -package xyz.driver.json - -import spray.json._ +package spray.json import org.scalatest._ diff --git a/src/test/scala/FormatTests.scala b/src/test/scala/FormatTests.scala index f9cae2d..0f56091 100644 --- a/src/test/scala/FormatTests.scala +++ b/src/test/scala/FormatTests.scala @@ -1,6 +1,5 @@ -package xyz.driver.json +package spray.json -import spray.json._ import org.scalatest._ trait FormatTests { self: FlatSpec => diff --git a/src/test/scala/ImplicitDerivedFormatTests.scala b/src/test/scala/ImplicitDerivedFormatTests.scala index 9723cb0..1d54ae9 100644 --- a/src/test/scala/ImplicitDerivedFormatTests.scala +++ b/src/test/scala/ImplicitDerivedFormatTests.scala @@ -1,6 +1,4 @@ -package xyz.driver.json - -import spray.json._ +package spray.json import org.scalatest._ diff --git a/src/test/scala/ProductTypeFormatTests.scala b/src/test/scala/ProductTypeFormatTests.scala index b7d8d27..ce05000 100644 --- a/src/test/scala/ProductTypeFormatTests.scala +++ b/src/test/scala/ProductTypeFormatTests.scala @@ -1,6 +1,4 @@ -package xyz.driver.json - -import spray.json._ +package spray.json import org.scalatest._ |