Basic support for Slick 3.5.x (#378)

* Basic support for Slick 3.5.x * Buming CI to 3.3.3 * given -> implicit for ValueClassReps * Removing -Xsource:3 temporarily * Slick cleanup
theiterators · Jul 20, 2024 · 039c795 · 039c795
1 parent 80fddc4
commit 039c795
Show file tree

Hide file tree

Showing 34 changed files with 432 additions and 674 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11, 3.3.0]
+        scala: [2.13.11, 3.3.3]
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -15,7 +15,7 @@ lazy val baseSettings = Seq(
   organizationName := "Iterators",
   organizationHomepage := Some(url("https://iterato.rs")),
   homepage := Some(url("https://github.com/theiterators/kebs")),
-  scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-encoding", "utf8", "Xsource:3") ++ (if (scalaVersion.value.startsWith("3")) Seq("-Xmax-inlines", "64") else Seq.empty),
+  scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-encoding", "utf8") ++ (if (scalaVersion.value.startsWith("3")) Seq("-Xmax-inlines", "64", "-Yretain-trees") else Seq.empty),
 )
 
 lazy val commonMacroSettings = baseSettings ++ Seq(
@@ -99,10 +99,10 @@ def paradiseFlag(scalaVersion: String): Seq[String] =
 
 val scalaTest       = Def.setting("org.scalatest" %%% "scalatest" % "3.2.17")
 val scalaCheck      = Def.setting("org.scalacheck" %%% "scalacheck" % "1.17.0")
-val slick           = "com.typesafe.slick" %% "slick" % "3.4.1"
+val slick           = "com.typesafe.slick" %% "slick" % "3.5.1"
 val optionalSlick   = optional(slick)
 val playJson        = "org.playframework" %% "play-json" % "3.0.4"
-val slickPg         = "com.github.tminglei" %% "slick-pg" % "0.21.1"
+val slickPg         = "com.github.tminglei" %% "slick-pg" % "0.22.2"
 val doobie          = "org.tpolecat" %% "doobie-core" % "1.0.0-RC4"
 val doobiePg        = "org.tpolecat" %% "doobie-postgres" % "1.0.0-RC4"
 val sprayJson       = "io.spray" %% "spray-json" % "1.3.6"
@@ -171,8 +171,8 @@ lazy val commonSettings = baseSettings ++ Seq(
 )
 
 lazy val slickSettings = commonSettings ++ Seq(
-  libraryDependencies += slick.cross(CrossVersion.for3Use2_13),
-  libraryDependencies += (slickPg % "test").cross(CrossVersion.for3Use2_13),
+  libraryDependencies += slick,
+  libraryDependencies += (slickPg % "test"),
   libraryDependencies += (enumeratum % "test")
 )
 
@@ -263,14 +263,14 @@ lazy val scalacheckSettings = commonSettings ++ Seq(
   else Nil))
 
 lazy val taggedSettings = commonSettings ++ Seq(
-  libraryDependencies += optionalSlick.cross(CrossVersion.for3Use2_13),
+  libraryDependencies += optionalSlick,
   libraryDependencies += optional(circe)
 )
 
 lazy val opaqueSettings = commonSettings
 
 lazy val examplesSettings = commonSettings ++ Seq(
-  libraryDependencies += slickPg.cross(CrossVersion.for3Use2_13),
+  libraryDependencies += slickPg,
   libraryDependencies += circeParser,
   libraryDependencies ++= enumeratumInExamples,
   libraryDependencies ++= pekkoHttpInExamples,
@@ -301,7 +301,6 @@ lazy val slickSupport = project
   .dependsOn(core.jvm, enumeratumSupport, instances % "test -> test")
   .settings(slickSettings*)
   .settings(publishSettings*)
-  .settings(disableScala(List("3")))
   .settings(
     name := "slick",
     description := "Library to eliminate the boilerplate code that comes with the use of Slick",

diff --git a/core/src/main/scala-3/pl/iterators/kebs/core/macros/ValueClassReps.scala b/core/src/main/scala-3/pl/iterators/kebs/core/macros/ValueClassReps.scala
@@ -5,7 +5,7 @@ import scala.deriving.Mirror
 final class ValueClassLike[VC, F1](val apply: F1 => VC, val unapply: VC => F1)
 
 trait CaseClass1ToValueClass {
-  inline given[T <: Product, F1](using m: Mirror.ProductOf[T], teq: m.MirroredElemTypes =:= F1 *: EmptyTuple.type): ValueClassLike[T, F1] =  {
+  implicit def repFromCaseClass[T <: Product, F1](using m: Mirror.ProductOf[T], teq: m.MirroredElemTypes =:= F1 *: EmptyTuple.type): ValueClassLike[T, F1] =  {
     new ValueClassLike[T, F1](f1 => m.fromProduct(Tuple1(f1)), _.productElement(0).asInstanceOf[F1])
   }
 }

diff --git a/examples/src/main/scala/pl/iterators/kebs/examples/EnumValueColumnType.scala b/examples/src/main/scala/pl/iterators/kebs/examples/EnumValueColumnType.scala
@@ -98,11 +98,11 @@ object EnumValueColumnType {
 
   object AfterKebsTraitStyle {
 
-    import pl.iterators.kebs.slick.Kebs
+    import pl.iterators.kebs.slick.KebsSlickSupport
 
     object MyPostgresProfile extends ExPostgresProfile {
       override val api: APIWithKebsAndEnums = new APIWithKebsAndEnums {}
-      trait APIWithKebsAndEnums extends super.API with Kebs with KebsEnums.Lowercase
+      trait APIWithKebsAndEnums extends super.API with KebsSlickSupport with KebsEnums.Lowercase
     }
 
     import MyPostgresProfile.api._

diff --git a/examples/src/main/scala/pl/iterators/kebs/examples/HStoreColumnType.scala b/examples/src/main/scala/pl/iterators/kebs/examples/HStoreColumnType.scala
@@ -73,11 +73,11 @@ object HStoreColumnType {
 
   object AfterKebs {
     import pl.iterators.kebs.circe.instances.time.YearMonthString
-    import pl.iterators.kebs.slick.Kebs
+    import pl.iterators.kebs.slick.KebsSlickSupport
 
     object MyPostgresProfile extends ExPostgresProfile with PgHStoreSupport {
       override val api: APIWithHstore = new APIWithHstore {}
-      trait APIWithHstore extends super.API with HStoreImplicits with Kebs with YearMonthString
+      trait APIWithHstore extends super.API with HStoreImplicits with KebsSlickSupport with YearMonthString
     }
 
     import MyPostgresProfile.api._

diff --git a/examples/src/main/scala/pl/iterators/kebs/examples/HStoreExtensionMethods.scala b/examples/src/main/scala/pl/iterators/kebs/examples/HStoreExtensionMethods.scala
@@ -49,11 +49,11 @@ object HStoreExtensionMethods {
 
   object AfterKebs {
     import pl.iterators.kebs.circe.instances.time.YearMonthString
-    import pl.iterators.kebs.slick.Kebs
+    import pl.iterators.kebs.slick.KebsSlickSupport
 
     object MyPostgresProfile extends ExPostgresProfile with PgHStoreSupport with PgArraySupport {
       override val api: APIWithHstore = new APIWithHstore {}
-      trait APIWithHstore extends super.API with HStoreImplicits with ArrayImplicits with Kebs with YearMonthString
+      trait APIWithHstore extends super.API with HStoreImplicits with ArrayImplicits with KebsSlickSupport with YearMonthString
     }
 
     import MyPostgresProfile.api._

diff --git a/examples/src/main/scala/pl/iterators/kebs/examples/ListValueCommonType.scala b/examples/src/main/scala/pl/iterators/kebs/examples/ListValueCommonType.scala
@@ -47,10 +47,10 @@ object ListValueCommonType {
 
   object AfterKebsTraitStyle {
 
-    import pl.iterators.kebs.slick.Kebs
+    import pl.iterators.kebs.slick.KebsSlickSupport
     object MyPostgresProfile extends ExPostgresProfile with PgArraySupport {
       override val api: APIWithArraysAndKebs = new APIWithArraysAndKebs {}
-      trait APIWithArraysAndKebs extends super.API with ArrayImplicits with Kebs
+      trait APIWithArraysAndKebs extends super.API with ArrayImplicits with KebsSlickSupport
     }
 
     import MyPostgresProfile.api._

diff --git a/examples/src/main/scala/pl/iterators/kebs/examples/SlickTaggedExample.scala b/examples/src/main/scala/pl/iterators/kebs/examples/SlickTaggedExample.scala
@@ -3,9 +3,9 @@ package pl.iterators.kebs.examples
 import slick.jdbc.PostgresProfile.api._
 import slick.lifted.ProvenShape
 import pl.iterators.kebs.tagged._
-import pl.iterators.kebs.tagged.slick.SlickSupport
+import pl.iterators.kebs.tagged.slick.TaggedSlickSupport
 
-object SlickTaggedExample extends SlickSupport {
+object SlickTaggedExample extends TaggedSlickSupport {
   trait UserIdTag
   type UserId = Long @@ UserIdTag
 

diff --git a/slick/src/main/scala/pl/iterators/kebs/slick/Kebs.scala b/slick/src/main/scala/pl/iterators/kebs/slick/Kebs.scala