Remove all package.scala

Author: pauldijou

CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## 0.12.0 (20/02/2017)
+
+- **Breaking changes** I liked having all implicits directly inside the package object but it started to create problems. When generating the documentation, which depends on all projects, we had runtime errors while all tests were green, but they are ran on project at a time. Also, it means all implicits where always present on the scope which might not be the best option. So the idea is to move them from the package object to the `JwtXXX` object. For example, for Play Json:
+
+```scala
+// Before
+// JwtJson.scala.
+package pdi.jwt
+
+object JwtJson extends JwtJsonCommon[JsObject] {
+  // stuff...
+}
+
+// package.scala
+package pdi
+
+package object jwt extends JwtJsonImplicits {}
+
+// --------------------------------------------------------
+// After
+// JwtJson.scala.
+package pdi.jwt
+
+object JwtJson extends JwtJsonCommon[JsObject] with JwtJsonImplicits {
+  // stuff...
+}
+```
+
 ## 0.11.0 (19/02/2017)
 
 - Drop Scala 2.10

build.sbt

@@ -5,8 +5,8 @@ import play.sbt.Play.autoImport._
 import PlayKeys._
 import Dependencies._
 
-val previousVersion = "0.10.0"
-val buildVersion = "0.11.0"
+val previousVersion = "0.11.0"
+val buildVersion = "0.12.0"
 
 val projects = Seq("coreCommon", "playJson", "json4sNative", "json4sJackson", "circe", "upickle", "play")
 val crossProjects = projects.map(p => Seq(p + "Legacy", p + "Edge")).flatten

docs/src/main/tut/_includes/tut/jwt-play-json-jwt-json.md

@@ -46,6 +46,7 @@ The project provides implicit reader and writer for both `JwtHeader` and `JwtCla
 
 ```tut
 import pdi.jwt._
+import pdi.jwt.JwtJson._
 
 // Reads
 Json.fromJson[JwtHeader](header)

docs/src/main/tut/_includes/tut/jwt-play-jwt-session.md

@@ -65,7 +65,9 @@ session2.getAs[User]("user")
 You can extract a `JwtSession` from a `RequestHeader`.
 
 ```tut
-import pdi.jwt._, play.api.test.{FakeRequest, FakeHeaders}
+import pdi.jwt._
+import pdi.jwt.JwtSession._
+import play.api.test.{FakeRequest, FakeHeaders}
 
 // Default JwtSession
 FakeRequest().jwtSession

docs/src/main/tut/_includes/tut/jwt-upickle-jwt-upickle.md

@@ -1,10 +1,8 @@
 ## JwtUpickle Object
 
-**Compilation problem** Right now, even if all tests are green, there is a problem for compiling this documentation file.
-
 ### Basic usage
 
-```
+```tut
 import java.time.Instant
 import upickle.json
 import upickle.default._
@@ -25,7 +23,7 @@ JwtUpickle.decode(token, key, Seq(JwtAlgorithm.HS256))
 
 ### Encoding
 
-```
+```tut
 val key = "secretKey"
 val algo = JwtAlgorithm.HS256
 
@@ -39,7 +37,7 @@ JwtUpickle.encode(header, claimJson, key)
 
 ### Decoding
 
-```
+```tut
 val claim = JwtClaim(
   expiration = Some(Instant.now.plusSeconds(157784760).getEpochSecond),
   issuedAt = Some(Instant.now.getEpochSecond)

json/json4s-jackson/src/main/scala/JwtJson4sJackson.scala

@@ -12,7 +12,7 @@ import org.json4s.jackson.Serialization.{read, write}
   *
   * To see a full list of samples, check the [[http://pauldijou.fr/jwt-scala/samples/jwt-json4s/ online documentation]].
   */
-object JwtJson4s extends JwtJson4sCommon {
+object JwtJson4s extends JwtJson4sCommon with JwtJson4sImplicits {
   protected def parse(value: String): JObject = jparse(value) match {
     case res: JObject => res
     case _ => throw new RuntimeException(s"Couldn't parse [$value] to a JObject")

json/json4s-jackson/src/main/scala/package.scala

@@ -5,6 +5,8 @@ import org.json4s.JsonDSL._
 import org.json4s.jackson.JsonMethods._
 
 class JwtJson4sJacksonSpec extends JwtJsonCommonSpec[JObject] with Json4sJacksonFixture {
+  import pdi.jwt.JwtJson4s._
+
   val jwtJsonCommon = JwtJson4s
 
   describe("JwtJson") {

json/json4s-jackson/src/test/scala/Json4sJacksonSpec.scala

@@ -12,7 +12,7 @@ import org.json4s.native.Serialization.{read, write}
   *
   * To see a full list of samples, check the [[http://pauldijou.fr/jwt-scala/samples/jwt-json4s/ online documentation]].
   */
-object JwtJson4s extends JwtJson4sCommon {
+object JwtJson4s extends JwtJson4sCommon with JwtJson4sImplicits {
   protected def parse(value: String): JObject = jparse(value) match {
     case res: JObject => res
     case _ => throw new RuntimeException(s"Couldn't parse [$value] to a JObject")