rename derivation traits

pureconfig · Mar 24, 2024 · 8e5c5b9 · 8e5c5b9
1 parent 3fe7c14
commit 8e5c5b9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/build.sbt b/build.sbt
@@ -94,9 +94,7 @@ lazy val commonSettings = Seq(
     Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr"))
   ),
 
-  // scalaVersion := scala212,
-  // TODO: temporary, for development only
-  scalaVersion := scala3,
+  scalaVersion := scala212,
 
   resolvers ++= Resolver.sonatypeOssRepos("releases"),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),

diff --git a/...c/derivation/ConfigReaderDerivation.scala → ...on/HintsAwareConfigReaderDerivation.scala b/...c/derivation/ConfigReaderDerivation.scala → ...on/HintsAwareConfigReaderDerivation.scala
@@ -4,13 +4,15 @@ package derivation
 
 import scala.deriving.Mirror
 
-trait ConfigReaderDerivation extends CoproductConfigReaderDerivation, ProductConfigReaderDerivation:
+trait HintsAwareConfigReaderDerivation
+    extends HintsAwareCoproductConfigReaderDerivation,
+      HintsAwareProductConfigReaderDerivation:
   inline def deriveReader[A](using m: Mirror.Of[A], ph: ProductHint[A], cph: CoproductHint[A]): ConfigReader[A] =
     inline m match
       case given Mirror.ProductOf[A] => deriveProductReader[A]
       case given Mirror.SumOf[A] => deriveSumReader[A]
 
-object ConfigReaderDerivation extends ConfigReaderDerivation:
+object HintsAwareConfigReaderDerivation extends HintsAwareConfigReaderDerivation:
   object syntax:
     extension (c: ConfigReader.type)
       inline def derived[A](using Mirror.Of[A], ProductHint[A], CoproductHint[A]): ConfigReader[A] = deriveReader[A]
diff --git a/...ion/CoproductConfigReaderDerivation.scala → ...wareCoproductConfigReaderDerivation.scala b/...ion/CoproductConfigReaderDerivation.scala → ...wareCoproductConfigReaderDerivation.scala
@@ -8,8 +8,8 @@ import scala.deriving.Mirror
 import pureconfig.error.{CannotConvert, ConfigReaderFailures}
 import pureconfig.generic.error.InvalidCoproductOption
 
-trait CoproductConfigReaderDerivation:
-  self: ConfigReaderDerivation =>
+trait HintsAwareCoproductConfigReaderDerivation:
+  self: HintsAwareConfigReaderDerivation =>
 
   inline def deriveSumReader[A](using m: Mirror.SumOf[A], ch: CoproductHint[A], ph: ProductHint[A]): ConfigReader[A] =
     new ConfigReader[A]:

diff --git a/...ation/ProductConfigReaderDerivation.scala → ...sAwareProductConfigReaderDerivation.scala b/...ation/ProductConfigReaderDerivation.scala → ...sAwareProductConfigReaderDerivation.scala
@@ -12,8 +12,8 @@ import pureconfig.generic.ProductHint.UseOrDefault
 import pureconfig.generic.derivation.Utils
 import pureconfig.generic.derivation.Utils.widen
 
-trait ProductConfigReaderDerivation:
-  self: ConfigReaderDerivation =>
+trait HintsAwareProductConfigReaderDerivation:
+  self: HintsAwareConfigReaderDerivation =>
 
   inline def deriveProductReader[A](using
       m: Mirror.ProductOf[A],

diff --git a/modules/generic-scala3/src/main/scala-3/pureconfig/generic/semiauto.scala b/modules/generic-scala3/src/main/scala-3/pureconfig/generic/semiauto.scala
@@ -3,4 +3,4 @@ package pureconfig.generic
 import pureconfig.generic.derivation.*
 
 object semiauto:
-  export ConfigReaderDerivation.deriveReader
+  export HintsAwareConfigReaderDerivation.deriveReader