Disable JsonCodec derivaton from encoder & decoder for Scala 2.12

zio · May 17, 2024 · e6a2b6a · e6a2b6a
1 parent ef21ec3
commit e6a2b6a
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 11 deletions.
diff --git a/zio-json/shared/src/main/scala-2.12/zio/json/JsonCodecVersionSpecific.scala b/zio-json/shared/src/main/scala-2.12/zio/json/JsonCodecVersionSpecific.scala
@@ -0,0 +1,3 @@
+package zio.json
+
+private[json] trait JsonCodecVersionSpecific
diff --git a/zio-json/shared/src/main/scala-2.13/zio/json/JsonCodecVersionSpecific.scala b/zio-json/shared/src/main/scala-2.13/zio/json/JsonCodecVersionSpecific.scala
@@ -0,0 +1,7 @@
+package zio.json
+
+private[json] trait JsonCodecVersionSpecific {
+
+  implicit def fromEncoderDecoder[A](implicit encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
+    JsonCodec(encoder, decoder)
+}
diff --git a/zio-json/shared/src/main/scala-2.x/zio/json/JsonCodecVersionSpecific.scala b/zio-json/shared/src/main/scala-2.x/zio/json/JsonCodecVersionSpecific.scala
diff --git a/zio-json/shared/src/main/scala-2.x/zio/json/JsonDecoderVersionSpecific.scala b/zio-json/shared/src/main/scala-2.x/zio/json/JsonDecoderVersionSpecific.scala
@@ -1,3 +1,3 @@
 package zio.json
 
-trait JsonDecoderVersionSpecific
+private[json] trait JsonDecoderVersionSpecific
diff --git a/zio-json/shared/src/main/scala-2.x/zio/json/JsonEncoderVersionSpecific.scala b/zio-json/shared/src/main/scala-2.x/zio/json/JsonEncoderVersionSpecific.scala
@@ -1,3 +1,3 @@
 package zio.json
 
-trait JsonEncoderVersionSpecific
+private[json] trait JsonEncoderVersionSpecific
diff --git a/zio-json/shared/src/main/scala-3/zio/json/JsonCodecVersionSpecific.scala b/zio-json/shared/src/main/scala-3/zio/json/JsonCodecVersionSpecific.scala
@@ -1,5 +1,8 @@
 package zio.json
 
-trait JsonCodecVersionSpecific {
+private[json] trait JsonCodecVersionSpecific {
   inline def derived[A: deriving.Mirror.Of]: JsonCodec[A] = DeriveJsonCodec.gen[A]
+
+  given fromEncoderDecoder[A](using encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
+    JsonCodec(encoder, decoder)
 }
diff --git a/zio-json/shared/src/main/scala-3/zio/json/JsonDecoderVersionSpecific.scala b/zio-json/shared/src/main/scala-3/zio/json/JsonDecoderVersionSpecific.scala
@@ -1,5 +1,5 @@
 package zio.json
 
-trait JsonDecoderVersionSpecific {
+private[json] trait JsonDecoderVersionSpecific {
   inline def derived[A: deriving.Mirror.Of]: JsonDecoder[A] = DeriveJsonDecoder.gen[A]
 }
diff --git a/zio-json/shared/src/main/scala-3/zio/json/JsonEncoderVersionSpecific.scala b/zio-json/shared/src/main/scala-3/zio/json/JsonEncoderVersionSpecific.scala
@@ -1,5 +1,5 @@
 package zio.json
 
-trait JsonEncoderVersionSpecific {
+private[json] trait JsonEncoderVersionSpecific {
   inline def derived[A: deriving.Mirror.Of]: JsonEncoder[A] = DeriveJsonEncoder.gen[A]
 }
diff --git a/zio-json/shared/src/main/scala/zio/json/JsonCodec.scala b/zio-json/shared/src/main/scala/zio/json/JsonCodec.scala
@@ -188,7 +188,4 @@ private[json] trait CodecLowPriority3 { this: JsonCodec.type =>
   implicit val uuid: JsonCodec[java.util.UUID] = JsonCodec(JsonEncoder.uuid, JsonDecoder.uuid)
 
   implicit val currency: JsonCodec[java.util.Currency] = JsonCodec(JsonEncoder.currency, JsonDecoder.currency)
-
-  implicit def fromEncoderDecoder[A](implicit encoder: JsonEncoder[A], decoder: JsonDecoder[A]): JsonCodec[A] =
-    new JsonCodec(encoder, decoder)
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package zio.json

		private[json] trait JsonCodecVersionSpecific