Merge pull request #161 from MansurAshraf/develop

added json4s to project aggregate
twitter · Feb 5, 2014 · 2a3cf7e · 2a3cf7e
2 parents a37923c + da70498
commit 2a3cf7e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/bijection-json4s/src/test/scala/com/twitter/bijection/json4s/Json4sInjectionLaws.scala b/bijection-json4s/src/test/scala/com/twitter/bijection/json4s/Json4sInjectionLaws.scala
@@ -16,7 +16,7 @@ package com.twitter.bijection.json4s
 
 import org.scalacheck.Properties
 import com.twitter.bijection.{Injection, BaseProperties}
-import Json4sInjections._
+
 import org.json4s.JsonAST._
 import org.json4s.JsonAST.JString
 
@@ -51,7 +51,16 @@ with BaseProperties {
 
   def roundTripJValueToString(implicit inj: Injection[JValue, String]) = isLooseInjection[JValue, String]
 
-  property("round trip Case Class to Json") = roundTripCaseClassToJson
-  property("round trip Case Class to JValue") = roundTripCaseClassToJValue
-  property("round trip JValue to String") = roundTripJValueToString
+  property("round trip Case Class to Json") = {
+    import Json4sInjections.caseClass2Json
+    roundTripCaseClassToJson
+  }
+  property("round trip Case Class to JValue") = {
+    import Json4sInjections.caseClass2JValue
+    roundTripCaseClassToJValue
+  }
+  property("round trip JValue to String") = {
+    import Json4sInjections.jvalue2Json
+    roundTripJValueToString
+  }
 }
diff --git a/project/Build.scala b/project/Build.scala
@@ -129,7 +129,8 @@ object BijectionBuild extends Build {
     bijectionNetty,
     bijectionAvro,
     bijectionHbase,
-    bijectionJodaTime
+    bijectionJodaTime,
+    bijectionJson4s
   )
 
   def module(name: String) = {