Add shading. (#36)

rallyhealth · Jun 12, 2020 · 3560b8b · 3560b8b
1 parent ba6a6f0
commit 3560b8b
Show file tree

Hide file tree

Showing 95 changed files with 147 additions and 120 deletions.
diff --git 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
@@ -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/...y/api/libs/json/ops/AbstractJsonOps.scala → ...pi/libs/json/ops/v4/AbstractJsonOps.scala b/...y/api/libs/json/ops/AbstractJsonOps.scala → ...pi/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/...ay/api/libs/json/ops/DurationFormat.scala → ...api/libs/json/ops/v4/DurationFormat.scala b/...ay/api/libs/json/ops/DurationFormat.scala → ...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/...a/play/api/libs/json/ops/Exceptions.scala → ...lay/api/libs/json/ops/v4/Exceptions.scala b/...a/play/api/libs/json/ops/Exceptions.scala → ...lay/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/...la/play/api/libs/json/ops/FormatKey.scala → ...play/api/libs/json/ops/v4/FormatKey.scala b/...la/play/api/libs/json/ops/FormatKey.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/...la/play/api/libs/json/ops/FormatOps.scala → ...play/api/libs/json/ops/v4/FormatOps.scala b/...la/play/api/libs/json/ops/FormatOps.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/...json/ops/ImplicitEmptyIterableReads.scala → ...n/ops/v4/ImplicitEmptyIterableReads.scala b/...json/ops/ImplicitEmptyIterableReads.scala → ...n/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/.../libs/json/ops/ImplicitTupleFormats.scala → ...bs/json/ops/v4/ImplicitTupleFormats.scala b/.../libs/json/ops/ImplicitTupleFormats.scala → ...bs/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/...la/play/api/libs/json/ops/JsResults.scala → ...play/api/libs/json/ops/v4/JsResults.scala b/...la/play/api/libs/json/ops/JsResults.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/...a/play/api/libs/json/ops/JsValueOps.scala → ...lay/api/libs/json/ops/v4/JsValueOps.scala b/...a/play/api/libs/json/ops/JsValueOps.scala → ...lay/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
-}
+}
diff --git a/...lay/api/libs/json/ops/JsonImplicits.scala → .../api/libs/json/ops/v4/JsonImplicits.scala b/...lay/api/libs/json/ops/JsonImplicits.scala → .../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/...lay/api/libs/json/ops/JsonTransform.scala → .../api/libs/json/ops/v4/JsonTransform.scala b/...lay/api/libs/json/ops/JsonTransform.scala → .../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]
-}
+}
diff --git a/...a/play/api/libs/json/ops/OFormatOps.scala → ...lay/api/libs/json/ops/v4/OFormatOps.scala b/...a/play/api/libs/json/ops/OFormatOps.scala → ...lay/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/...ay/api/libs/json/ops/PlayJsonMacros.scala → ...api/libs/json/ops/v4/PlayJsonMacros.scala b/...ay/api/libs/json/ops/PlayJsonMacros.scala → ...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/...ala/play/api/libs/json/ops/ReadsKey.scala → .../play/api/libs/json/ops/v4/ReadsKey.scala b/...ala/play/api/libs/json/ops/ReadsKey.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)
-}
+}
diff --git a/...s/json/ops/TolerantContainerFormats.scala → ...son/ops/v4/TolerantContainerFormats.scala b/...s/json/ops/TolerantContainerFormats.scala → ...son/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/...la/play/api/libs/json/ops/WritesKey.scala → ...play/api/libs/json/ops/v4/WritesKey.scala b/...la/play/api/libs/json/ops/WritesKey.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
diff --git a/...concurrent/duration/ops/DurationOps.scala → ...current/duration/ops/v4/DurationOps.scala b/...concurrent/duration/ops/DurationOps.scala → ...current/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
@@ -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
@@ -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
diff --git a/...rent/duration/ops/FiniteDurationOps.scala → ...t/duration/ops/v4/FiniteDurationOps.scala b/...rent/duration/ops/FiniteDurationOps.scala → ...t/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
@@ -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
diff --git a/...i/libs/json/ops/AbstractJsonOpsSpec.scala → ...ibs/json/ops/v4/AbstractJsonOpsSpec.scala b/...i/libs/json/ops/AbstractJsonOpsSpec.scala → ...ibs/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/...ibs/json/ops/CompatibilityImplicits.scala → .../json/ops/v4/CompatibilityImplicits.scala b/...ibs/json/ops/CompatibilityImplicits.scala → .../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/...pi/libs/json/ops/DurationFormatSpec.scala → ...libs/json/ops/v4/DurationFormatSpec.scala b/...pi/libs/json/ops/DurationFormatSpec.scala → ...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/...lay/api/libs/json/ops/FormatOpsSpec.scala → .../api/libs/json/ops/v4/FormatOpsSpec.scala b/...lay/api/libs/json/ops/FormatOpsSpec.scala → .../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/...ay/api/libs/json/ops/JsValueOpsSpec.scala → ...api/libs/json/ops/v4/JsValueOpsSpec.scala b/...ay/api/libs/json/ops/JsValueOpsSpec.scala → ...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/...api/libs/json/ops/JsonImplicitsSpec.scala → .../libs/json/ops/v4/JsonImplicitsSpec.scala b/...api/libs/json/ops/JsonImplicitsSpec.scala → .../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/...api/libs/json/ops/JsonTransformSpec.scala → .../libs/json/ops/v4/JsonTransformSpec.scala b/...api/libs/json/ops/JsonTransformSpec.scala → .../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/...pi/libs/json/ops/PlayJsonMacrosSpec.scala → ...libs/json/ops/v4/PlayJsonMacrosSpec.scala b/...pi/libs/json/ops/PlayJsonMacrosSpec.scala → ...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
@@ -0,0 +1,3 @@
+package play.api.libs.json.ops
+
+package object v4 extends JsonImplicits
diff --git a/...la/play/api/libs/json/ops/JsResults.scala → ...play/api/libs/json/ops/v4/JsResults.scala b/...la/play/api/libs/json/ops/JsResults.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/...a/play/api/libs/json/ops/RecoverOps.scala → ...lay/api/libs/json/ops/v4/RecoverOps.scala b/...a/play/api/libs/json/ops/RecoverOps.scala → ...lay/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/...a/play/api/libs/json/ops/UTCFormats.scala → ...lay/api/libs/json/ops/v4/UTCFormats.scala b/...a/play/api/libs/json/ops/UTCFormats.scala → ...lay/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/...cala/play/api/libs/json/ops/package.scala → ...a/play/api/libs/json/ops/v4/package.scala b/...cala/play/api/libs/json/ops/package.scala → ...a/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/...i/libs/json/ops/ReadsRecoverOpsSpec.scala → ...ibs/json/ops/v4/ReadsRecoverOpsSpec.scala b/...i/libs/json/ops/ReadsRecoverOpsSpec.scala → ...ibs/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/...lay/api/libs/json/ops/UTCFormatSpec.scala → .../api/libs/json/ops/v4/UTCFormatSpec.scala b/...lay/api/libs/json/ops/UTCFormatSpec.scala → .../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
@@ -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
diff --git a/...rent/duration/ops/FiniteDurationOps.scala → ...t/duration/ops/v4/FiniteDurationOps.scala b/...rent/duration/ops/FiniteDurationOps.scala → ...t/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
@@ -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
diff --git a/...i/libs/json/ops/AbstractJsonOpsSpec.scala → ...ibs/json/ops/v4/AbstractJsonOpsSpec.scala b/...i/libs/json/ops/AbstractJsonOpsSpec.scala → ...ibs/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/...ibs/json/ops/CompatibilityImplicits.scala → .../json/ops/v4/CompatibilityImplicits.scala b/...ibs/json/ops/CompatibilityImplicits.scala → .../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/...pi/libs/json/ops/DurationFormatSpec.scala → ...libs/json/ops/v4/DurationFormatSpec.scala b/...pi/libs/json/ops/DurationFormatSpec.scala → ...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)
     }
   }
-}
+}
diff --git a/...lay/api/libs/json/ops/FormatOpsSpec.scala → .../api/libs/json/ops/v4/FormatOpsSpec.scala b/...lay/api/libs/json/ops/FormatOpsSpec.scala → .../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/...ay/api/libs/json/ops/JsValueOpsSpec.scala → ...api/libs/json/ops/v4/JsValueOpsSpec.scala b/...ay/api/libs/json/ops/JsValueOpsSpec.scala → ...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/...api/libs/json/ops/JsonImplicitsSpec.scala → .../libs/json/ops/v4/JsonImplicitsSpec.scala b/...api/libs/json/ops/JsonImplicitsSpec.scala → .../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/...api/libs/json/ops/JsonTransformSpec.scala → .../libs/json/ops/v4/JsonTransformSpec.scala b/...api/libs/json/ops/JsonTransformSpec.scala → .../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/...pi/libs/json/ops/PlayJsonMacrosSpec.scala → ...libs/json/ops/v4/PlayJsonMacrosSpec.scala b/...pi/libs/json/ops/PlayJsonMacrosSpec.scala → ...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