diff --git a/README.md b/README.md index 550f11c..cfa4100 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,19 @@ implicits and tools for: # Versions +## 4.X Branch + +| play version | scala versions | scalatest version | artifact name | bintray | +|--------------|-------------------------|-------------------|------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| 2.7.x | 2.13.1, 2.12.6, 2.11.12 | | play27-json-ops-v4 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play27-json-ops-v4/images/download.svg) ](https://bintray.com/rallyhealth/maven/play27-json-ops-v4/_latestVersion) | +| 2.7.x | 2.13.1, 2.12.6, 2.11.12 | 3.1.x | play27-json-tests-sc14 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play27-json-tests-sc14/images/download.svg) ](https://bintray.com/rallyhealth/maven/play27-json-tests-sc14/_latestVersion) | +| 2.6.x | 2.12.6, 2.11.12 | | play26-json-ops-v4 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play26-json-ops-v4/images/download.svg) ](https://bintray.com/rallyhealth/maven/play26-json-ops-v4/_latestVersion) | +| 2.6.x | 2.12.6, 2.11.12 | 3.0.x | play26-json-tests-sc13 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play26-json-tests-sc13/images/download.svg) ](https://bintray.com/rallyhealth/maven/play26-json-tests-sc13/_latestVersion) | +| 2.5.x | 2.11.12 | | play25-json-ops-v4 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play25-json-ops-v4/images/download.svg) ](https://bintray.com/rallyhealth/maven/play25-json-ops-v4/_latestVersion) | +| 2.5.x | 2.11.12 | 3.1.x | play25-json-tests-sc14 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play25-json-tests-sc14/images/download.svg) ](https://bintray.com/rallyhealth/maven/play25-json-tests-sc14/_latestVersion) | +| 2.5.x | 2.11.12 | 3.0.x | play25-json-tests-sc13 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play25-json-tests-sc13/images/download.svg) ](https://bintray.com/rallyhealth/maven/play25-json-tests-sc13/_latestVersion) | +| 2.5.x | 2.11.12 | 2.2.x | play25-json-tests-sc12 | [ ![Download](https://api.bintray.com/packages/rallyhealth/maven/play25-json-tests-sc12/images/download.svg) ](https://bintray.com/rallyhealth/maven/play25-json-tests-sc12/_latestVersion) | + ## 3.X Branch | play version | scala versions | scalatest version | artifact name | bintray | diff --git a/build.sbt b/build.sbt index fcb831b..4df023c 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ name := "play-json-ops-root" ThisBuild / organization := "com.rallyhealth" ThisBuild / organizationName := "Rally Health" -ThisBuild / gitVersioningSnapshotLowerBound := "3.0.0" +ThisBuild / gitVersioningSnapshotLowerBound := "4.0.0" ThisBuild / bintrayOrganization := Some("rallyhealth") ThisBuild / bintrayRepository := "maven" @@ -26,7 +26,11 @@ def commonProject(id: String, projectPath: String, scalacVersion: String): Proje } val target = s"$id-$versionSuffix" Project(target, file(target)).settings( - name := id, + name := { + // Shade only non-test jars since they're most exposed to transitive dependency hell. + def majorVersion = version.value.split('.').head + if (id.contains("test")) id else s"$id-v$majorVersion" + }, scalaVersion := scalacVersion, @@ -214,3 +218,5 @@ lazy val `play26-json-tests-sc13-212` = playJsonTests(Scala_2_12, Play_2_6, Scal lazy val `play27-json-tests-sc13-211` = playJsonTests(Scala_2_11, Play_2_7, ScalaCheck_1_14) lazy val `play27-json-tests-sc13-212` = playJsonTests(Scala_2_12, Play_2_7, ScalaCheck_1_14) lazy val `play27-json-tests-sc14-213` = playJsonTests(Scala_2_13, Play_2_7, ScalaCheck_1_14) + +Global / onChangedBuildSource := ReloadOnSourceChanges diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/AbstractJsonOps.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/AbstractJsonOps.scala similarity index 99% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/AbstractJsonOps.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/AbstractJsonOps.scala index eba049b..6ac5ed5 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/AbstractJsonOps.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/AbstractJsonOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/DurationFormat.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/DurationFormat.scala similarity index 97% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/DurationFormat.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/DurationFormat.scala index 7145a0f..8561151 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/DurationFormat.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/DurationFormat.scala @@ -1,10 +1,10 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ -import play.api.libs.json.ops.ImplicitTupleFormats._ +import play.api.libs.json.ops.v4.ImplicitTupleFormats._ import scala.concurrent.duration._ -import scala.concurrent.duration.ops._ +import scala.concurrent.duration.ops.v4.DurationOps import scala.util.control.NonFatal import scala.util.{Failure, Success} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/Exceptions.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/Exceptions.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/Exceptions.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/Exceptions.scala index 05a00fa..8ceefdc 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/Exceptions.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/Exceptions.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/FormatKey.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/FormatKey.scala similarity index 93% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/FormatKey.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/FormatKey.scala index 1f8319c..348abf1 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/FormatKey.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/FormatKey.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.JsResult diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/FormatOps.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/FormatOps.scala similarity index 99% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/FormatOps.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/FormatOps.scala index 442d515..f86a5db 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/FormatOps.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/FormatOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/ImplicitEmptyIterableReads.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ImplicitEmptyIterableReads.scala similarity index 96% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/ImplicitEmptyIterableReads.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ImplicitEmptyIterableReads.scala index 99a3d21..7e94b9b 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/ImplicitEmptyIterableReads.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ImplicitEmptyIterableReads.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsArray, JsError, JsSuccess, Json, Reads, Writes} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/ImplicitTupleFormats.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ImplicitTupleFormats.scala similarity index 99% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/ImplicitTupleFormats.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ImplicitTupleFormats.scala index 7a7f867..220a503 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/ImplicitTupleFormats.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ImplicitTupleFormats.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsResults.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala similarity index 98% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsResults.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala index 2560e39..92424b9 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsResults.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsError, JsPath, JsResult} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsValueOps.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsValueOps.scala similarity index 97% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsValueOps.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsValueOps.scala index d70a181..b071f03 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsValueOps.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsValueOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsError, JsSuccess, JsValue, Reads} @@ -33,4 +33,4 @@ class JsValueOps(val json: JsValue) extends AnyVal { * @return a JsValue that has been altered based on the implicit transformer */ def transformAs[A](implicit transformer: JsonTransform[A]): JsValue = transformer transform json -} \ No newline at end of file +} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsonImplicits.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsonImplicits.scala similarity index 97% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsonImplicits.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsonImplicits.scala index 0d3a9a5..d105772 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsonImplicits.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsonImplicits.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsonTransform.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsonTransform.scala similarity index 98% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsonTransform.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsonTransform.scala index 162d264..b5eec49 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsonTransform.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/JsonTransform.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ @@ -58,4 +58,4 @@ object JsonTransform { } def transform[A: JsonTransform](json: JsValue): JsValue = new JsValueOps(json).transformAs[A] -} \ No newline at end of file +} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/OFormatOps.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/OFormatOps.scala similarity index 96% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/OFormatOps.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/OFormatOps.scala index 432da34..1684fd2 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/OFormatOps.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/OFormatOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/PlayJsonMacros.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/PlayJsonMacros.scala similarity index 99% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/PlayJsonMacros.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/PlayJsonMacros.scala index 8ae6531..58471eb 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/PlayJsonMacros.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/PlayJsonMacros.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{Json, Reads} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ReadsKey.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ReadsKey.scala similarity index 98% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ReadsKey.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ReadsKey.scala index bbe95b3..33dd13a 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ReadsKey.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/ReadsKey.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import java.util.UUID @@ -64,4 +64,4 @@ object ReadsKey { implicit val readKeyShort: ReadsKey[Short] = readsKeyNumber(java.lang.Short.parseShort) implicit val readKeyInt: ReadsKey[Int] = readsKeyNumber(java.lang.Integer.parseInt) implicit val readKeyLong: ReadsKey[Long] = readsKeyNumber(java.lang.Long.parseLong) -} \ No newline at end of file +} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/TolerantContainerFormats.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/TolerantContainerFormats.scala similarity index 96% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/TolerantContainerFormats.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/TolerantContainerFormats.scala index ce0b62f..ae0866a 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/TolerantContainerFormats.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/TolerantContainerFormats.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsPath, Reads} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/WritesKey.scala b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/WritesKey.scala similarity index 97% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/WritesKey.scala rename to play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/WritesKey.scala index 139db38..c05d7f4 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/WritesKey.scala +++ b/play-json-ops-common/src/main/scala/play/api/libs/json/ops/v4/WritesKey.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import java.util.UUID diff --git a/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/package.scala b/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/package.scala deleted file mode 100644 index f3c46e5..0000000 --- a/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.concurrent.duration - -package object ops extends DurationImplicits diff --git a/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/DurationOps.scala b/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/v4/DurationOps.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/DurationOps.scala rename to play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/v4/DurationOps.scala index 3849f2c..723a6e5 100644 --- a/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/DurationOps.scala +++ b/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/v4/DurationOps.scala @@ -1,4 +1,4 @@ -package scala.concurrent.duration.ops +package scala.concurrent.duration.ops.v4 import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/v4/package.scala b/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/v4/package.scala new file mode 100644 index 0000000..d8b5643 --- /dev/null +++ b/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/v4/package.scala @@ -0,0 +1,3 @@ +package scala.concurrent.duration.ops + +package object v4 extends DurationImplicits diff --git a/play-json-tests-common/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala b/play-json-tests-common/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala index 62ffab1..12a5497 100644 --- a/play-json-tests-common/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala +++ b/play-json-tests-common/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala @@ -3,7 +3,7 @@ package play.api.libs.json.scalacheck import org.scalacheck.{Arbitrary, Gen} import scala.concurrent.duration._ -import scala.concurrent.duration.ops._ +import scala.concurrent.duration.ops.v4._ import scala.language.implicitConversions trait DurationGenerators { diff --git a/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/package.scala b/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/package.scala deleted file mode 100644 index b24df1e..0000000 --- a/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.concurrent.duration - -package object ops extends DurationImplicits \ No newline at end of file diff --git a/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala b/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala similarity index 97% rename from play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala rename to play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala index 1f251b8..7b9aef7 100644 --- a/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala +++ b/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala @@ -1,4 +1,4 @@ -package scala.concurrent.duration.ops +package scala.concurrent.duration.ops.v4 import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/v4/package.scala b/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/v4/package.scala new file mode 100644 index 0000000..d8b5643 --- /dev/null +++ b/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/v4/package.scala @@ -0,0 +1,3 @@ +package scala.concurrent.duration.ops + +package object v4 extends DurationImplicits diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/package.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/package.scala deleted file mode 100644 index 81689aa..0000000 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package play.api.libs.json - -package object ops extends JsonImplicits diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala similarity index 99% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala index c9c29e0..4e195b4 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen} import org.scalatest.prop.GeneratorDrivenPropertyChecks diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala similarity index 92% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala index 280ebc2..cea0b9f 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.JsValue diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala similarity index 98% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala index 6eeaeec..0a99020 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.Arbitrary.arbitrary import play.api.libs.json.scalacheck.DurationGenerators._ diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala similarity index 98% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala index 30c4c90..a811d8a 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.WordSpec import play.api.libs.json._ diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala similarity index 97% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala index de9a530..4ef2449 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen} import org.scalatest.FlatSpec diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala similarity index 98% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala index a14762d..f0dcbe6 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen, Shrink} import org.scalacheck.ops._ diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala similarity index 98% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala index e6fbb7e..d3c5bd7 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.FlatSpec import org.scalatest.prop.GeneratorDrivenPropertyChecks._ diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala similarity index 99% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala rename to play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala index 6639a03..07d706f 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.{FunSpec, Matchers} import play.api.libs.json.{Json, Reads} diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/package.scala b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/package.scala new file mode 100644 index 0000000..867bbcb --- /dev/null +++ b/play-json-tests-common/src/test/scala/play/api/libs/json/ops/v4/package.scala @@ -0,0 +1,3 @@ +package play.api.libs.json.ops + +package object v4 extends JsonImplicits diff --git a/play25-json-ops/src/main/scala/play/api/libs/json/ops/JsResults.scala b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala similarity index 98% rename from play25-json-ops/src/main/scala/play/api/libs/json/ops/JsResults.scala rename to play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala index 0eb15f1..b6a8bf9 100644 --- a/play25-json-ops/src/main/scala/play/api/libs/json/ops/JsResults.scala +++ b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsError, JsPath, JsResult} diff --git a/play25-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala similarity index 99% rename from play25-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala rename to play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala index 7d3b093..b27df33 100644 --- a/play25-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala +++ b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.data.validation.ValidationError import play.api.libs.json._ diff --git a/play25-json-ops/src/main/scala/play/api/libs/json/ops/UTCFormats.scala b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/UTCFormats.scala similarity index 97% rename from play25-json-ops/src/main/scala/play/api/libs/json/ops/UTCFormats.scala rename to play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/UTCFormats.scala index ec58d91..a788bce 100644 --- a/play25-json-ops/src/main/scala/play/api/libs/json/ops/UTCFormats.scala +++ b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/UTCFormats.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.joda.time.{DateTime, DateTimeZone} import play.api.libs.json._ diff --git a/play25-json-ops/src/main/scala/play/api/libs/json/ops/package.scala b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala similarity index 74% rename from play25-json-ops/src/main/scala/play/api/libs/json/ops/package.scala rename to play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala index e913652..76ac464 100644 --- a/play25-json-ops/src/main/scala/play/api/libs/json/ops/package.scala +++ b/play25-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala @@ -1,8 +1,10 @@ -package play.api.libs.json +package play.api.libs.json.ops + +import play.api.libs.json.{Format, OFormat, Reads} import scala.language.implicitConversions -package object ops extends JsonImplicits { +package object v4 extends JsonImplicits { implicit def safeReadsOps[A](reads: Reads[A]): ReadsRecoverOps[A] = new ReadsRecoverOps(reads) diff --git a/play25-json-ops/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala b/play25-json-ops/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala similarity index 97% rename from play25-json-ops/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala rename to play25-json-ops/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala index 4f69349..d4bab9d 100644 --- a/play25-json-ops/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala +++ b/play25-json-ops/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.FreeSpec import org.scalatest.Matchers._ diff --git a/play25-json-ops/src/test/scala/play/api/libs/json/ops/UTCFormatSpec.scala b/play25-json-ops/src/test/scala/play/api/libs/json/ops/v4/UTCFormatSpec.scala similarity index 96% rename from play25-json-ops/src/test/scala/play/api/libs/json/ops/UTCFormatSpec.scala rename to play25-json-ops/src/test/scala/play/api/libs/json/ops/v4/UTCFormatSpec.scala index 0a54998..db2815f 100644 --- a/play25-json-ops/src/test/scala/play/api/libs/json/ops/UTCFormatSpec.scala +++ b/play25-json-ops/src/test/scala/play/api/libs/json/ops/v4/UTCFormatSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.joda.time.{DateTime, DateTimeZone} import org.scalatest.WordSpec diff --git a/play25-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala b/play25-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala index 62ffab1..12a5497 100644 --- a/play25-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala +++ b/play25-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala @@ -3,7 +3,7 @@ package play.api.libs.json.scalacheck import org.scalacheck.{Arbitrary, Gen} import scala.concurrent.duration._ -import scala.concurrent.duration.ops._ +import scala.concurrent.duration.ops.v4._ import scala.language.implicitConversions trait DurationGenerators { diff --git a/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/package.scala b/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/package.scala deleted file mode 100644 index f3c46e5..0000000 --- a/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.concurrent.duration - -package object ops extends DurationImplicits diff --git a/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala b/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala similarity index 97% rename from play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala rename to play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala index 1f251b8..7b9aef7 100644 --- a/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala +++ b/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala @@ -1,4 +1,4 @@ -package scala.concurrent.duration.ops +package scala.concurrent.duration.ops.v4 import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/package.scala b/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/package.scala new file mode 100644 index 0000000..d8b5643 --- /dev/null +++ b/play25-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/package.scala @@ -0,0 +1,3 @@ +package scala.concurrent.duration.ops + +package object v4 extends DurationImplicits diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/package.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/package.scala deleted file mode 100644 index 81689aa..0000000 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package play.api.libs.json - -package object ops extends JsonImplicits diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala similarity index 99% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala index fdd2471..c5df7fc 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala @@ -1,9 +1,9 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen} +import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec -import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import play.api.libs.json._ class AbstractJsonOpsSpec extends AnyWordSpec diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala similarity index 92% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala index 280ebc2..cea0b9f 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.JsValue diff --git a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala similarity index 97% rename from play-json-tests-common/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala index 627eab9..0a99020 100644 --- a/play-json-tests-common/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.Arbitrary.arbitrary import play.api.libs.json.scalacheck.DurationGenerators._ @@ -38,4 +38,4 @@ private[ops] trait AssertDurationEquality[T <: Duration] extends PlayJsonFormatS assertResult(expected)(actual) } } -} \ No newline at end of file +} diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala similarity index 98% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala index 3574b3a..1c68d54 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.wordspec.AnyWordSpec import play.api.libs.json._ diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala similarity index 97% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala index 0862307..6177cea 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen} import org.scalatest.flatspec.AnyFlatSpec diff --git a/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala similarity index 98% rename from play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala index 20030a9..ae093c5 100644 --- a/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen, Shrink} import org.scalacheck.ops._ diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala similarity index 98% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala index 121e72f..fd7edf6 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.flatspec.AnyFlatSpec import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks._ diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala similarity index 99% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala rename to play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala index f632262..2a8f9fc 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/package.scala b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/package.scala new file mode 100644 index 0000000..867bbcb --- /dev/null +++ b/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/package.scala @@ -0,0 +1,3 @@ +package play.api.libs.json.ops + +package object v4 extends JsonImplicits diff --git a/play26-json-ops/src/main/scala/play/api/libs/json/ops/JsResults.scala b/play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala similarity index 98% rename from play26-json-ops/src/main/scala/play/api/libs/json/ops/JsResults.scala rename to play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala index 0eb15f1..b6a8bf9 100644 --- a/play26-json-ops/src/main/scala/play/api/libs/json/ops/JsResults.scala +++ b/play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsError, JsPath, JsResult} diff --git a/play26-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala b/play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala similarity index 99% rename from play26-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala rename to play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala index 95fad5a..2c9e43f 100644 --- a/play26-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala +++ b/play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/package.scala b/play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala similarity index 74% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/package.scala rename to play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala index e913652..76ac464 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/package.scala +++ b/play26-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala @@ -1,8 +1,10 @@ -package play.api.libs.json +package play.api.libs.json.ops + +import play.api.libs.json.{Format, OFormat, Reads} import scala.language.implicitConversions -package object ops extends JsonImplicits { +package object v4 extends JsonImplicits { implicit def safeReadsOps[A](reads: Reads[A]): ReadsRecoverOps[A] = new ReadsRecoverOps(reads) diff --git a/play26-json-ops/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala b/play26-json-ops/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala similarity index 97% rename from play26-json-ops/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala rename to play26-json-ops/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala index 973f8c8..6b6fff2 100644 --- a/play26-json-ops/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala +++ b/play26-json-ops/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.FreeSpec import org.scalatest.Matchers._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/AbstractJsonOps.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/AbstractJsonOps.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/AbstractJsonOps.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/AbstractJsonOps.scala index eba049b..6ac5ed5 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/AbstractJsonOps.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/AbstractJsonOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/DurationFormat.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/DurationFormat.scala similarity index 97% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/DurationFormat.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/DurationFormat.scala index 6ceb142..575ffbe 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/DurationFormat.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/DurationFormat.scala @@ -1,9 +1,9 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ import scala.concurrent.duration._ -import scala.concurrent.duration.ops._ +import scala.concurrent.duration.ops.v4.DurationOps import scala.util.control.NonFatal import scala.util.{Failure, Success} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/Exceptions.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/Exceptions.scala similarity index 99% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/Exceptions.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/Exceptions.scala index 05a00fa..8ceefdc 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/Exceptions.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/Exceptions.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/FormatKey.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/FormatKey.scala similarity index 92% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/FormatKey.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/FormatKey.scala index f07a787..348abf1 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/FormatKey.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/FormatKey.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.JsResult @@ -12,4 +12,4 @@ object FormatKey { final override def write(key: A): String = writesKey.write(key) final override def read(key: String): JsResult[A] = readsKey.read(key) } -} \ No newline at end of file +} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/FormatOps.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/FormatOps.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/FormatOps.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/FormatOps.scala index f1a49fa..b294eb9 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/FormatOps.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/FormatOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ImplicitEmptyIterableReads.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ImplicitEmptyIterableReads.scala similarity index 96% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ImplicitEmptyIterableReads.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ImplicitEmptyIterableReads.scala index a87396a..f522ba4 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ImplicitEmptyIterableReads.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ImplicitEmptyIterableReads.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ImplicitTupleFormats.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ImplicitTupleFormats.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ImplicitTupleFormats.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ImplicitTupleFormats.scala index af5d25c..65db9d9 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/ImplicitTupleFormats.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ImplicitTupleFormats.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsResults.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala similarity index 98% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsResults.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala index d6e2149..cd58aea 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsResults.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsResults.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsError, JsPath, JsResult} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsValueOps.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsValueOps.scala similarity index 97% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsValueOps.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsValueOps.scala index f2da7e3..2680de8 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsValueOps.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsValueOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsError, JsSuccess, JsValue, Reads} @@ -33,4 +33,4 @@ class JsValueOps(val json: JsValue) extends AnyVal { * @return a JsValue that has been altered based on the implicit transformer */ def transformAs[A](implicit transformer: JsonTransform[A]): JsValue = transformer transform json -} \ No newline at end of file +} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsonImplicits.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsonImplicits.scala similarity index 97% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsonImplicits.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsonImplicits.scala index ee0e356..01883cd 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/JsonImplicits.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsonImplicits.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsonTransform.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsonTransform.scala similarity index 98% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsonTransform.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsonTransform.scala index 162d264..b5eec49 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/JsonTransform.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/JsonTransform.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ @@ -58,4 +58,4 @@ object JsonTransform { } def transform[A: JsonTransform](json: JsValue): JsValue = new JsValueOps(json).transformAs[A] -} \ No newline at end of file +} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/OFormatOps.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/OFormatOps.scala similarity index 96% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/OFormatOps.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/OFormatOps.scala index 432da34..1684fd2 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/OFormatOps.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/OFormatOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/PlayJsonMacros.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/PlayJsonMacros.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/PlayJsonMacros.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/PlayJsonMacros.scala index c431a01..1687f26 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/PlayJsonMacros.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/PlayJsonMacros.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{Json, Reads} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/ReadsKey.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ReadsKey.scala similarity index 98% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/ReadsKey.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ReadsKey.scala index bbe95b3..33dd13a 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/ReadsKey.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/ReadsKey.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import java.util.UUID @@ -64,4 +64,4 @@ object ReadsKey { implicit val readKeyShort: ReadsKey[Short] = readsKeyNumber(java.lang.Short.parseShort) implicit val readKeyInt: ReadsKey[Int] = readsKeyNumber(java.lang.Integer.parseInt) implicit val readKeyLong: ReadsKey[Long] = readsKeyNumber(java.lang.Long.parseLong) -} \ No newline at end of file +} diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/RecoverOps.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala similarity index 99% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/RecoverOps.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala index 309ad75..f31ac26 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/RecoverOps.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/TolerantContainerFormats.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/TolerantContainerFormats.scala similarity index 96% rename from play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/TolerantContainerFormats.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/TolerantContainerFormats.scala index e859d6e..77783b2 100644 --- a/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/TolerantContainerFormats.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/TolerantContainerFormats.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.{JsPath, Reads} diff --git a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/WritesKey.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/WritesKey.scala similarity index 97% rename from play-json-ops-common/src/main/scala/play/api/libs/json/ops/WritesKey.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/WritesKey.scala index 139db38..c05d7f4 100644 --- a/play-json-ops-common/src/main/scala/play/api/libs/json/ops/WritesKey.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/WritesKey.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import java.util.UUID diff --git a/play27-json-ops/src/main/scala/play/api/libs/json/ops/package.scala b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/package.scala similarity index 74% rename from play27-json-ops/src/main/scala/play/api/libs/json/ops/package.scala rename to play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/package.scala index e913652..76ac464 100644 --- a/play27-json-ops/src/main/scala/play/api/libs/json/ops/package.scala +++ b/play27-json-ops-scala213/src/main/scala/play/api/libs/json/ops/v4/package.scala @@ -1,8 +1,10 @@ -package play.api.libs.json +package play.api.libs.json.ops + +import play.api.libs.json.{Format, OFormat, Reads} import scala.language.implicitConversions -package object ops extends JsonImplicits { +package object v4 extends JsonImplicits { implicit def safeReadsOps[A](reads: Reads[A]): ReadsRecoverOps[A] = new ReadsRecoverOps(reads) diff --git a/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/package.scala b/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/package.scala deleted file mode 100644 index f3c46e5..0000000 --- a/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.concurrent.duration - -package object ops extends DurationImplicits diff --git a/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/DurationOps.scala b/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/v4/DurationOps.scala similarity index 99% rename from play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/DurationOps.scala rename to play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/v4/DurationOps.scala index 3849f2c..723a6e5 100644 --- a/play-json-ops-common/src/main/scala/scala/concurrent/duration/ops/DurationOps.scala +++ b/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/v4/DurationOps.scala @@ -1,4 +1,4 @@ -package scala.concurrent.duration.ops +package scala.concurrent.duration.ops.v4 import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/v4/package.scala b/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/v4/package.scala new file mode 100644 index 0000000..d8b5643 --- /dev/null +++ b/play27-json-ops-scala213/src/main/scala/scala/concurrent/duration/ops/v4/package.scala @@ -0,0 +1,3 @@ +package scala.concurrent.duration.ops + +package object v4 extends DurationImplicits diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala b/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala similarity index 98% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala rename to play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala index 20030a9..ae093c5 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonImplicitsSpec.scala +++ b/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/v4/JsonImplicitsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen, Shrink} import org.scalacheck.ops._ diff --git a/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala b/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala similarity index 97% rename from play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala rename to play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala index abed96e..5b90ea1 100644 --- a/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/ReadsRecoverOpsSpec.scala +++ b/play27-json-ops-scala213/src/test/scala/play/api/libs/json/ops/v4/ReadsRecoverOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.freespec.AnyFreeSpec import org.scalatest.matchers.should.Matchers._ diff --git a/play27-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala b/play27-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala similarity index 98% rename from play27-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala rename to play27-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala index fdd363a..43a9f43 100644 --- a/play27-json-ops/src/main/scala/play/api/libs/json/ops/RecoverOps.scala +++ b/play27-json-ops/src/main/scala/play/api/libs/json/ops/v4/RecoverOps.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json._ diff --git a/play26-json-ops/src/main/scala/play/api/libs/json/ops/package.scala b/play27-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala similarity index 74% rename from play26-json-ops/src/main/scala/play/api/libs/json/ops/package.scala rename to play27-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala index e913652..76ac464 100644 --- a/play26-json-ops/src/main/scala/play/api/libs/json/ops/package.scala +++ b/play27-json-ops/src/main/scala/play/api/libs/json/ops/v4/package.scala @@ -1,8 +1,10 @@ -package play.api.libs.json +package play.api.libs.json.ops + +import play.api.libs.json.{Format, OFormat, Reads} import scala.language.implicitConversions -package object ops extends JsonImplicits { +package object v4 extends JsonImplicits { implicit def safeReadsOps[A](reads: Reads[A]): ReadsRecoverOps[A] = new ReadsRecoverOps(reads) diff --git a/play27-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala b/play27-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala index 62ffab1..12a5497 100644 --- a/play27-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala +++ b/play27-json-tests-sc14/src/main/scala/play/api/libs/json/scalacheck/DurationGenerators.scala @@ -3,7 +3,7 @@ package play.api.libs.json.scalacheck import org.scalacheck.{Arbitrary, Gen} import scala.concurrent.duration._ -import scala.concurrent.duration.ops._ +import scala.concurrent.duration.ops.v4._ import scala.language.implicitConversions trait DurationGenerators { diff --git a/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/package.scala b/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/package.scala deleted file mode 100644 index b24df1e..0000000 --- a/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/package.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scala.concurrent.duration - -package object ops extends DurationImplicits \ No newline at end of file diff --git a/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala b/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala similarity index 97% rename from play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala rename to play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala index 1f251b8..7b9aef7 100644 --- a/play-json-tests-common/src/main/scala/scala/concurrent/duration/ops/FiniteDurationOps.scala +++ b/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/FiniteDurationOps.scala @@ -1,4 +1,4 @@ -package scala.concurrent.duration.ops +package scala.concurrent.duration.ops.v4 import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/package.scala b/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/package.scala new file mode 100644 index 0000000..d8b5643 --- /dev/null +++ b/play27-json-tests-sc14/src/main/scala/scala/concurrent/duration/ops/v4/package.scala @@ -0,0 +1,3 @@ +package scala.concurrent.duration.ops + +package object v4 extends DurationImplicits diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala similarity index 99% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala index b992069..88e5283 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/AbstractJsonOpsSpec.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/AbstractJsonOpsSpec.scala @@ -1,9 +1,9 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen} -import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks import play.api.libs.json._ class AbstractJsonOpsSpec extends AnyWordSpec diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala similarity index 92% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala index 280ebc2..cea0b9f 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/CompatibilityImplicits.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/CompatibilityImplicits.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import play.api.libs.json.JsValue diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala similarity index 97% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala index 4733fe1..ad8c1aa 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/DurationFormatSpec.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/DurationFormatSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.Arbitrary.arbitrary import play.api.libs.json.scalacheck.DurationGenerators._ @@ -38,4 +38,4 @@ private[ops] trait AssertDurationEquality[T <: Duration] extends PlayJsonFormatS assertResult(expected)(actual) } } -} \ No newline at end of file +} diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala similarity index 98% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala index cc0e6bf..83d62e1 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/FormatOpsSpec.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/FormatOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.wordspec.AnyWordSpec import play.api.libs.json._ diff --git a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala similarity index 97% rename from play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala index 0862307..6177cea 100644 --- a/play25-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsValueOpsSpec.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsValueOpsSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalacheck.{Arbitrary, Gen} import org.scalatest.flatspec.AnyFlatSpec diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala similarity index 98% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala index ebf41cb..7a0528b 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/JsonTransformSpec.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/JsonTransformSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.flatspec.AnyFlatSpec import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks._ diff --git a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala similarity index 99% rename from play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala rename to play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala index 5504fe8..fca9467 100644 --- a/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/PlayJsonMacrosSpec.scala +++ b/play27-json-tests-sc14/src/test/scala/play/api/libs/json/ops/v4/PlayJsonMacrosSpec.scala @@ -1,4 +1,4 @@ -package play.api.libs.json.ops +package play.api.libs.json.ops.v4 import org.scalatest.funspec.AnyFunSpec import org.scalatest.matchers.should.Matchers