Kebs 2.0 package cleanup

akka-http/src/main/scala/pl/iterators/kebs/akkahttp/matchers/KebsMatchers.scala

@@ -1,7 +1,7 @@
 package pl.iterators.kebs.akkahttp.matchers
 
 import akka.http.scaladsl.server.{PathMatcher1, PathMatchers}
-import enumeratum.{Enum, EnumEntry}
+import pl.iterators.kebs.core.enums.EnumLike
 import pl.iterators.kebs.core.instances.InstanceConverter
 import pl.iterators.kebs.core.macros.ValueClassLike
 
@@ -16,9 +16,8 @@ trait KebsMatchers extends PathMatchers {
   }
 
   object EnumSegment {
-    def as[T <: EnumEntry: Enum]: PathMatcher1[T] = {
-      val enumCompanion = implicitly[Enum[T]]
-      Segment.map(enumCompanion.withNameInsensitive)
+    def as[T](implicit e: EnumLike[T]): PathMatcher1[T] = {
+      Segment.map(e.withNameIgnoreCase)
     }
   }
 }

akka-http/src/test/scala/pl/iterators/kebs/akkahttp/matchers/AkkaHttpMatchersTests.scala

@@ -7,6 +7,7 @@ import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 import pl.iterators.kebs.akkahttp.domain.Domain.Greeting
 import pl.iterators.kebs.akkahttp.domain.Domain._
+import pl.iterators.kebs.enumeratum.KebsEnumeratum
 import pl.iterators.kebs.instances.net.URIString
 import pl.iterators.kebs.instances.time.{DayOfWeekInt, ZonedDateTimeString}
 import pl.iterators.kebs.instances.time.mixins.InstantEpochMilliLong
@@ -23,6 +24,7 @@ class AkkaHttpMatchersTests
     with ZonedDateTimeString
     with DayOfWeekInt
     with InstantEpochMilliLong
+    with KebsEnumeratum
     with URIString {
 
   test("No ValueClassLike implicits derived") {

build.sbt

@@ -206,11 +206,8 @@ lazy val enumeratumSettings = commonMacroSettings ++ Seq(
   scalacOptions ++= paradiseFlag(scalaVersion.value)
 )
 
-lazy val sprayJsonMacroSettings = commonMacroSettings ++ Seq(
-  libraryDependencies += sprayJson.cross(CrossVersion.for3Use2_13)
-)
-
 lazy val sprayJsonSettings = commonSettings ++ Seq(
+  libraryDependencies += sprayJson.cross(CrossVersion.for3Use2_13),
   libraryDependencies += optionalEnumeratum
 )
 
@@ -330,22 +327,9 @@ lazy val doobieSupport = project
     crossScalaVersions := supportedScalaVersions
   )
 
-lazy val sprayJsonMacros = project
-  .in(file("spray-json-macros"))
-  .dependsOn(core.jvm)
-  .settings(sprayJsonMacroSettings *)
-  .settings(publishSettings *)
-  .settings(disableScala(List("3")))
-  .settings(
-    name               := "spray-json-macros",
-    description        := "Automatic generation of Spray json formats for case-classes - macros",
-    moduleName         := "kebs-spray-json-macros",
-    crossScalaVersions := supportedScalaVersions
-  )
-
 lazy val sprayJsonSupport = project
   .in(file("spray-json"))
-  .dependsOn(sprayJsonMacros, enumeratumSupport, instances % "test -> test")
+  .dependsOn(enumeratumSupport, instances % "test -> test")
   .settings(sprayJsonSettings *)
   .settings(publishSettings *)
   .settings(disableScala(List("3")))
@@ -564,7 +548,6 @@ lazy val kebs = project
     core.js,
     slickSupport,
     doobieSupport,
-    sprayJsonMacros,
     sprayJsonSupport,
     playJsonSupport,
     circeSupport,

circe/src/test/scala-2/pl/iterators/kebs/circe/KebsEnumForTests.scala

@@ -0,0 +1,5 @@
+package pl.iterators.kebs.circe
+
+import pl.iterators.kebs.enumeratum.KebsEnumeratum
+
+trait KebsEnumForTests extends KebsEnumeratum

circe/src/test/scala-2/pl/iterators/kebs/circe/KebsValueEnumForTests.scala

@@ -0,0 +1,5 @@
+package pl.iterators.kebs.circe
+
+import pl.iterators.kebs.enumeratum.KebsValueEnumeratum
+
+trait KebsValueEnumForTests extends KebsValueEnumeratum