Merge pull request #269 from mielnikk/instances-refactor

Remove instances dependency from slick, spray, akka, circe and play
theiterators · Feb 20, 2023 · 8079209 · 8079209
2 parents 26290ed + b2242ed
commit 8079209
Show file tree

Hide file tree

Showing 40 changed files with 46 additions and 21 deletions.
diff --git a/build.sbt b/build.sbt
@@ -172,7 +172,7 @@ lazy val doobieSettings = commonSettings ++ Seq(
   libraryDependencies += optionalEnumeratum.cross(CrossVersion.for3Use2_13),
 )
 
-lazy val macroUtilsSettings = commonMacroSettings ++ Seq(
+lazy val coreSettings = commonMacroSettings ++ Seq(
   libraryDependencies += (scalaCheck.value % "test").cross(CrossVersion.for3Use2_13),
   libraryDependencies += optionalEnumeratum
 )
@@ -252,6 +252,23 @@ lazy val taggedMetaSettings = metaSettings ++ Seq(
 
 lazy val instancesSettings = commonSettings
 
+lazy val macroUtilsSettings = coreSettings ++ Seq(
+  Compile / scalaSource := baseDirectory.value  / ".." / ".." / "core" / "src" / "main" / "scala",
+  Test / scalaSource := baseDirectory.value / ".." / ".." / "core" / "src" / "test" / "scala"
+)
+
+lazy val core = crossProject(JSPlatform, JVMPlatform)
+  .withoutSuffixFor(JVMPlatform)
+  .crossType(CrossType.Pure)
+  .in(file("core"))
+  .settings(coreSettings: _*)
+  .settings(publishSettings: _*)
+  .settings(
+    name := "core",
+    description := "Macros and utils supporting Kebs library",
+    moduleName := "kebs-core",
+)
+
 lazy val macroUtils = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Pure)
@@ -260,13 +277,13 @@ lazy val macroUtils = crossProject(JSPlatform, JVMPlatform)
   .settings(publishSettings: _*)
   .settings(
     name := "macro-utils",
-    description := "Macros supporting Kebs library",
-    moduleName := "kebs-macro-utils"
+    description := "Macros and utils supporting Kebs library",
+    moduleName := "kebs-macro-utils",
   )
 
 lazy val slickSupport = project
   .in(file("slick"))
-  .dependsOn(macroUtils.jvm, instances)
+  .dependsOn(core.jvm, instances % "test -> test")
   .settings(slickSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -291,7 +308,7 @@ lazy val doobieSupport = project
 
 lazy val sprayJsonMacros = project
   .in(file("spray-json-macros"))
-  .dependsOn(macroUtils.jvm)
+  .dependsOn(core.jvm)
   .settings(sprayJsonMacroSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -304,7 +321,7 @@ lazy val sprayJsonMacros = project
 
 lazy val sprayJsonSupport = project
   .in(file("spray-json"))
-  .dependsOn(sprayJsonMacros, instances)
+  .dependsOn(sprayJsonMacros, instances % "test -> test")
   .settings(sprayJsonSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -317,7 +334,7 @@ lazy val sprayJsonSupport = project
 
 lazy val playJsonSupport = project
   .in(file("play-json"))
-  .dependsOn(macroUtils.jvm, instances)
+  .dependsOn(core.jvm, instances % "test -> test")
   .settings(playJsonSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -330,7 +347,7 @@ lazy val playJsonSupport = project
 
 lazy val circeSupport = project
   .in(file("circe"))
-  .dependsOn(macroUtils.jvm, instances)
+  .dependsOn(core.jvm, instances % "test -> test")
   .settings(circeSettings: _*)
   .settings(crossBuildSettings: _*)
   .settings(publishSettings: _*)
@@ -343,7 +360,7 @@ lazy val circeSupport = project
 
 lazy val akkaHttpSupport = project
   .in(file("akka-http"))
-  .dependsOn(macroUtils.jvm, instances, tagged.jvm % "test -> test", taggedMeta % "test -> test")
+  .dependsOn(core.jvm, instances % "test -> test", tagged.jvm % "test -> test", taggedMeta % "test -> test")
   .settings(akkaHttpSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -356,7 +373,7 @@ lazy val akkaHttpSupport = project
 
 lazy val http4sSupport = project
   .in(file("http4s"))
-  .dependsOn(macroUtils.jvm, instances, opaque.jvm % "test -> test", tagged.jvm % "test -> test", taggedMeta % "test -> test")
+  .dependsOn(core.jvm, instances, opaque.jvm % "test -> test", tagged.jvm % "test -> test", taggedMeta % "test -> test")
   .settings(http4sSettings: _*)
   .settings(publishSettings: _*)
   .settings(
@@ -368,7 +385,7 @@ lazy val http4sSupport = project
 
 lazy val jsonschemaSupport = project
   .in(file("jsonschema"))
-  .dependsOn(macroUtils.jvm)
+  .dependsOn(core.jvm)
   .settings(jsonschemaSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -381,7 +398,7 @@ lazy val jsonschemaSupport = project
 
 lazy val scalacheckSupport = project
   .in(file("scalacheck"))
-  .dependsOn(macroUtils.jvm)
+  .dependsOn(core.jvm)
   .settings(scalacheckSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -396,7 +413,7 @@ lazy val tagged = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Full)
   .in(file("tagged"))
-  .dependsOn(macroUtils)
+  .dependsOn(core)
   .settings(taggedSettings: _*)
   .settings(publishSettings: _*)
   .settings(disableScala("3"))
@@ -411,7 +428,7 @@ lazy val opaque = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Pure)
   .in(file("opaque"))
-  .dependsOn(macroUtils)
+  .dependsOn(core)
   .settings(opaqueSettings: _*)
   .settings(disableScala("2.13"))
   .settings(disableScala("2.12"))
@@ -427,7 +444,7 @@ lazy val opaque = crossProject(JSPlatform, JVMPlatform)
 lazy val taggedMeta = project
   .in(file("tagged-meta"))
   .dependsOn(
-    macroUtils.jvm,
+    core.jvm,
     tagged.jvm,
     sprayJsonSupport  % "test -> test",
     circeSupport      % "test -> test",
@@ -468,6 +485,7 @@ lazy val benchmarks = project
 
 lazy val instances = project
   .in(file("instances"))
+  .dependsOn(core.jvm)
   .settings(instancesSettings: _*)
   .settings(publishSettings: _*)
   .settings(
@@ -483,6 +501,8 @@ lazy val kebs = project
     tagged.js,
     opaque.jvm,
     opaque.js,
+    core.jvm,
+    core.js,
     macroUtils.jvm,
     macroUtils.js,
     slickSupport,

diff --git a/circe/src/test/scala/instances/TimeInstancesMixinTests.scala b/circe/src/test/scala/instances/TimeInstancesMixinTests.scala
@@ -4,9 +4,10 @@ import io.circe.{Decoder, Encoder, Json}
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import pl.iterators.kebs.circe.KebsCirce
+import pl.iterators.kebs.instances.InstanceConverter
 import pl.iterators.kebs.instances.time.LocalDateTimeString
 import pl.iterators.kebs.instances.time.mixins.{DurationNanosLong, InstantEpochMilliLong}
-import pl.iterators.kebs.instances.{InstanceConverter, TimeInstances}
+import pl.iterators.kebs.instances.TimeInstances
 
 import java.time._
 import java.time.format.DateTimeFormatter

diff --git a/...tors/kebs/support/FractionalSupport.scala → ...tors/kebs/support/FractionalSupport.scala b/...tors/kebs/support/FractionalSupport.scala → ...tors/kebs/support/FractionalSupport.scala
diff --git a/...rators/kebs/support/IntegralSupport.scala → ...rators/kebs/support/IntegralSupport.scala b/...rators/kebs/support/IntegralSupport.scala → ...rators/kebs/support/IntegralSupport.scala
diff --git a/...erators/kebs/support/NumericSupport.scala → ...erators/kebs/support/NumericSupport.scala b/...erators/kebs/support/NumericSupport.scala → ...erators/kebs/support/NumericSupport.scala
diff --git a/...tors/kebs/support/FractionalSupport.scala → ...tors/kebs/support/FractionalSupport.scala b/...tors/kebs/support/FractionalSupport.scala → ...tors/kebs/support/FractionalSupport.scala
diff --git a/...rators/kebs/support/IntegralSupport.scala → ...rators/kebs/support/IntegralSupport.scala b/...rators/kebs/support/IntegralSupport.scala → ...rators/kebs/support/IntegralSupport.scala
diff --git a/...erators/kebs/support/NumericSupport.scala → ...erators/kebs/support/NumericSupport.scala b/...erators/kebs/support/NumericSupport.scala → ...erators/kebs/support/NumericSupport.scala
diff --git a/...iterators/kebs/macros/CaseClassReps.scala → ...iterators/kebs/macros/CaseClassReps.scala b/...iterators/kebs/macros/CaseClassReps.scala → ...iterators/kebs/macros/CaseClassReps.scala
diff --git a/...pl/iterators/kebs/macros/MacroUtils.scala → ...pl/iterators/kebs/macros/MacroUtils.scala b/...pl/iterators/kebs/macros/MacroUtils.scala → ...pl/iterators/kebs/macros/MacroUtils.scala
diff --git a/...s/kebs/macros/enums/EnumEntryMacros.scala → ...s/kebs/macros/enums/EnumEntryMacros.scala b/...s/kebs/macros/enums/EnumEntryMacros.scala → ...s/kebs/macros/enums/EnumEntryMacros.scala
diff --git a/...rs/kebs/macros/enums/EnumMacroUtils.scala → ...rs/kebs/macros/enums/EnumMacroUtils.scala b/...rs/kebs/macros/enums/EnumMacroUtils.scala → ...rs/kebs/macros/enums/EnumMacroUtils.scala
diff --git a/...s/macros/enums/ValueEnumEntryMacros.scala → ...s/macros/enums/ValueEnumEntryMacros.scala b/...s/macros/enums/ValueEnumEntryMacros.scala → ...s/macros/enums/ValueEnumEntryMacros.scala
diff --git a/...os/namingconventions/SnakifyVariant.scala → ...os/namingconventions/SnakifyVariant.scala b/...os/namingconventions/SnakifyVariant.scala → ...os/namingconventions/SnakifyVariant.scala
diff --git a/...iterators/kebs/support/EquivSupport.scala → ...iterators/kebs/support/EquivSupport.scala b/...iterators/kebs/support/EquivSupport.scala → ...iterators/kebs/support/EquivSupport.scala
diff --git a/...kebs/support/PartialOrderingSupport.scala → ...kebs/support/PartialOrderingSupport.scala b/...kebs/support/PartialOrderingSupport.scala → ...kebs/support/PartialOrderingSupport.scala
diff --git a/...2/pl/iterators/kebs/support/package.scala → ...2/pl/iterators/kebs/support/package.scala b/...2/pl/iterators/kebs/support/package.scala → ...2/pl/iterators/kebs/support/package.scala
diff --git a/...iterators/kebs/macros/CaseClassReps.scala → ...iterators/kebs/macros/CaseClassReps.scala b/...iterators/kebs/macros/CaseClassReps.scala → ...iterators/kebs/macros/CaseClassReps.scala
diff --git a/...s/kebs/macros/enums/EnumEntryMacros.scala → ...s/kebs/macros/enums/EnumEntryMacros.scala b/...s/kebs/macros/enums/EnumEntryMacros.scala → ...s/kebs/macros/enums/EnumEntryMacros.scala
diff --git a/...iterators/kebs/support/EquivSupport.scala → ...iterators/kebs/support/EquivSupport.scala b/...iterators/kebs/support/EquivSupport.scala → ...iterators/kebs/support/EquivSupport.scala
diff --git a/...tors/kebs/support/FractionalSupport.scala → ...tors/kebs/support/FractionalSupport.scala b/...tors/kebs/support/FractionalSupport.scala → ...tors/kebs/support/FractionalSupport.scala
diff --git a/...rators/kebs/support/IntegralSupport.scala → ...rators/kebs/support/IntegralSupport.scala b/...rators/kebs/support/IntegralSupport.scala → ...rators/kebs/support/IntegralSupport.scala
diff --git a/...erators/kebs/support/NumericSupport.scala → ...erators/kebs/support/NumericSupport.scala b/...erators/kebs/support/NumericSupport.scala → ...erators/kebs/support/NumericSupport.scala
diff --git a/...kebs/support/PartialOrderingSupport.scala → ...kebs/support/PartialOrderingSupport.scala b/...kebs/support/PartialOrderingSupport.scala → ...kebs/support/PartialOrderingSupport.scala
diff --git a/...3/pl/iterators/kebs/support/package.scala → ...3/pl/iterators/kebs/support/package.scala b/...3/pl/iterators/kebs/support/package.scala → ...3/pl/iterators/kebs/support/package.scala
diff --git a/...rs/kebs/instances/InstanceConverter.scala → ...rs/kebs/instances/InstanceConverter.scala b/...rs/kebs/instances/InstanceConverter.scala → ...rs/kebs/instances/InstanceConverter.scala
diff --git a/.../test/scala-3/DerivingSpecification.scala → .../test/scala-3/DerivingSpecification.scala b/.../test/scala-3/DerivingSpecification.scala → .../test/scala-3/DerivingSpecification.scala
diff --git a/...est/scala/EquivSupportSpecification.scala → ...est/scala/EquivSupportSpecification.scala b/...est/scala/EquivSupportSpecification.scala → ...est/scala/EquivSupportSpecification.scala
diff --git a/...cala/FractionalSupportSpecification.scala → ...cala/FractionalSupportSpecification.scala b/...cala/FractionalSupportSpecification.scala → ...cala/FractionalSupportSpecification.scala
diff --git a/.../scala/IntegralSupportSpecification.scala → .../scala/IntegralSupportSpecification.scala b/.../scala/IntegralSupportSpecification.scala → .../scala/IntegralSupportSpecification.scala
diff --git a/...-utils/src/test/scala/NumbersDomain.scala → core/src/test/scala/NumbersDomain.scala b/...-utils/src/test/scala/NumbersDomain.scala → core/src/test/scala/NumbersDomain.scala
diff --git a/...t/scala/NumericSupportSpecification.scala → ...t/scala/NumericSupportSpecification.scala b/...t/scala/NumericSupportSpecification.scala → ...t/scala/NumericSupportSpecification.scala
diff --git a/.../scala/OrderingSupportSpecification.scala → .../scala/OrderingSupportSpecification.scala b/.../scala/OrderingSupportSpecification.scala → .../scala/OrderingSupportSpecification.scala
diff --git a/...PartialOrderingSupportSpecification.scala → ...PartialOrderingSupportSpecification.scala b/...PartialOrderingSupportSpecification.scala → ...PartialOrderingSupportSpecification.scala
diff --git a/...-utils/src/test/scala/StringsDomain.scala → core/src/test/scala/StringsDomain.scala b/...-utils/src/test/scala/StringsDomain.scala → core/src/test/scala/StringsDomain.scala
diff --git a/instances/src/test/scala/pl/iterators/kebs/instances/net/NetInstancesTests.scala b/instances/src/test/scala/pl/iterators/kebs/instances/net/NetInstancesTests.scala
@@ -3,7 +3,7 @@ package pl.iterators.kebs.instances.net
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import pl.iterators.kebs.instances.InstanceConverter
-import pl.iterators.kebs.instances.InstanceConverter.DecodeErrorException
+import InstanceConverter.DecodeErrorException
 
 import java.net.URI
 

diff --git a/instances/src/test/scala/pl/iterators/kebs/instances/time/TimeInstancesTests.scala b/instances/src/test/scala/pl/iterators/kebs/instances/time/TimeInstancesTests.scala
@@ -2,8 +2,9 @@ package pl.iterators.kebs.instances.time
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
+import pl.iterators.kebs.instances.InstanceConverter
 import pl.iterators.kebs.instances.InstanceConverter.DecodeErrorException
-import pl.iterators.kebs.instances.{InstanceConverter, TimeInstances}
+import pl.iterators.kebs.instances.TimeInstances
 
 import java.time._
 

diff --git a/instances/src/test/scala/pl/iterators/kebs/instances/util/UtilInstancesTests.scala b/instances/src/test/scala/pl/iterators/kebs/instances/util/UtilInstancesTests.scala
@@ -2,8 +2,9 @@ package pl.iterators.kebs.instances.util
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
+import pl.iterators.kebs.instances.InstanceConverter
 import pl.iterators.kebs.instances.InstanceConverter.DecodeErrorException
-import pl.iterators.kebs.instances.{InstanceConverter, UtilInstances}
+import pl.iterators.kebs.instances.UtilInstances
 
 import java.util.{Currency, Locale, UUID}
 

diff --git a/play-json/src/test/scala/instances/TimeInstancesMixinTests.scala b/play-json/src/test/scala/instances/TimeInstancesMixinTests.scala
@@ -2,9 +2,10 @@ package instances
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
+import pl.iterators.kebs.instances.InstanceConverter
 import pl.iterators.kebs.instances.time.LocalDateTimeString
 import pl.iterators.kebs.instances.time.mixins.{DurationNanosLong, InstantEpochMilliLong}
-import pl.iterators.kebs.instances.{InstanceConverter, TimeInstances}
+import pl.iterators.kebs.instances.TimeInstances
 import play.api.libs.json.{Format, JsNumber, JsString, JsSuccess}
 
 import java.time._

diff --git a/spray-json/src/test/scala/instances/TimeInstancesMixinTests.scala b/spray-json/src/test/scala/instances/TimeInstancesMixinTests.scala
@@ -2,9 +2,10 @@ package instances
 
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
+import pl.iterators.kebs.instances.InstanceConverter
 import pl.iterators.kebs.instances.time.LocalDateTimeString
 import pl.iterators.kebs.instances.time.mixins.{DurationNanosLong, InstantEpochMilliLong}
-import pl.iterators.kebs.instances.{InstanceConverter, TimeInstances}
+import pl.iterators.kebs.instances.TimeInstances
 import pl.iterators.kebs.json.KebsSpray
 import pl.iterators.kebs.macros.CaseClass1Rep
 import spray.json._