Merge pull request #440 from tpolecat/royal-sampler

royal sampler of build updates

Author: tpolecat

.github/workflows/build.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Start up Postgres instances
         run: docker-compose up -d
       - name: Compile (All) and Test/Coverage (Scala 2 Only)
-        run: csbt headerCheck +clean coverage test docs/makeSite coverageReport coverageOff +test
+        run: sbt headerCheck +clean coverage test docs/makeSite coverageReport coverageOff +test
       - name: Shut down Postgres instances
         run: docker-compose down
       - name: Upload code coverage data

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: olafurpg/setup-scala@v10
       - uses: olafurpg/setup-gpg@v3
       - name: Publish
-        run: csbt ci-release
+        run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

build.sbt

@@ -3,11 +3,11 @@
 // Our Scala versions.
 lazy val `scala-2.12`     = "2.12.13"
 lazy val `scala-2.13`     = "2.13.5"
-lazy val `scala-3.0-prev` = "3.0.0-RC1"
-lazy val `scala-3.0-curr` = "3.0.0-RC2"
+lazy val `scala-3.0-prev` = "3.0.0-RC2"
+lazy val `scala-3.0-curr` = "3.0.0-RC3"
 
 // This is used in a couple places
-lazy val fs2Version = "2.5.4"
+lazy val fs2Version = "2.5.5"
 
 // Global Settings
 lazy val commonSettings = Seq(
@@ -38,25 +38,25 @@ lazy val commonSettings = Seq(
   scalaVersion       := `scala-2.13`,
   crossScalaVersions := Seq(`scala-2.12`, `scala-2.13`, `scala-3.0-prev`, `scala-3.0-curr`),
   scalacOptions -= "-language:experimental.macros", // doesn't work cross-version
-  Compile / doc     / scalacOptions --= Seq("-Xfatal-warnings"),
-  Compile / doc     / scalacOptions ++= Seq(
+  Compile / doc / scalacOptions --= Seq("-Xfatal-warnings"),
+  Compile / doc / scalacOptions ++= Seq(
     "-groups",
-    "-sourcepath", (baseDirectory in LocalRootProject).value.getAbsolutePath,
+    "-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath,
     "-doc-source-url", "https://github.com/tpolecat/skunk/blob/v" + version.value + "€{FILE_PATH}.scala",
   ),
   libraryDependencies ++= Seq(
     compilerPlugin("org.typelevel" %% "kind-projector" % "0.11.3" cross CrossVersion.full),
-  ).filterNot(_ => isDotty.value),
+  ).filterNot(_ => scalaVersion.value.startsWith("3.")),
 
   // Coverage Exclusions
   coverageExcludedPackages := "ffstest.*;tests.*;example.*;natchez.http4s.*",
 
   // uncomment in case of emergency
-  // scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
+  // scalacOptions ++= { if (scalaVersion.value.startsWith("3.")) Seq("-source:3.0-migration") else Nil },
 
   // Add some more source directories
-  unmanagedSourceDirectories in Compile ++= {
-    val sourceDir = (sourceDirectory in Compile).value
+  Compile / unmanagedSourceDirectories ++= {
+    val sourceDir = (Compile / sourceDirectory).value
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _))  => Seq(sourceDir / "scala-3", sourceDir / "scala-2.13+")
       case Some((2, 12)) => Seq(sourceDir / "scala-2")
@@ -66,8 +66,8 @@ lazy val commonSettings = Seq(
   },
 
   // Also for test
-  unmanagedSourceDirectories in Test ++= {
-    val sourceDir = (sourceDirectory in Test).value
+  Test / unmanagedSourceDirectories ++= {
+    val sourceDir = (Test / sourceDirectory).value
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((3, _))  => Seq(sourceDir / "scala-3")
       case Some((2, _))  => Seq(sourceDir / "scala-2")
@@ -78,7 +78,7 @@ lazy val commonSettings = Seq(
   // dottydoc really doesn't work at all right now
   Compile / doc / sources := {
     val old = (Compile / doc / sources).value
-    if (isDotty.value)
+    if (scalaVersion.value.startsWith("3."))
       Seq()
     else
       old
@@ -103,20 +103,19 @@ lazy val core = project
     description := "Tagless, non-blocking data access library for Postgres.",
     resolvers   +=  "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
     libraryDependencies ++= Seq(
-      "org.typelevel"    %% "cats-core"    % "2.5.0",
-      "org.typelevel"    %% "cats-effect"  % "2.4.1",
-      "co.fs2"           %% "fs2-core"     % fs2Version,
-      "co.fs2"           %% "fs2-io"       % fs2Version,
-      "org.scodec"       %% "scodec-core"  % (if (isDotty.value) "2.0.0-RC2" else "1.11.7"),
-      "org.scodec"       %% "scodec-cats"  % "1.1.0-RC2",
-      "org.tpolecat"     %% "natchez-core" % "0.0.22",
-      "org.tpolecat"     %% "sourcepos"    % "0.1.2",
-      "com.ongres.scram"  % "client"       % "2.1",
+      "org.typelevel"          %% "cats-core"               % "2.6.0",
+      "org.typelevel"          %% "cats-effect"             % "2.5.0",
+      "co.fs2"                 %% "fs2-core"                % fs2Version,
+      "co.fs2"                 %% "fs2-io"                  % fs2Version,
+      "org.scodec"             %% "scodec-core"             % (if (scalaVersion.value.startsWith("3.")) "2.0.0-RC3" else "1.11.7"),
+      "org.scodec"             %% "scodec-cats"             % "1.1.0-RC3",
+      "org.tpolecat"           %% "natchez-core"            % "0.0.24",
+      "org.tpolecat"           %% "sourcepos"               % "0.1.3",
+      "com.ongres.scram"        % "client"                  % "2.1",
+      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3",
     ) ++ Seq(
       "com.beachape"  %% "enumeratum"   % "1.6.1",
-    ).map(_.withDottyCompat(scalaVersion.value)) ++ Seq(
-      "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3",
-    )
+    ).filterNot(_ => scalaVersion.value.startsWith("3."))
   )
 
 lazy val refined = project
@@ -127,7 +126,7 @@ lazy val refined = project
   .settings(
     libraryDependencies ++= Seq(
       "eu.timepit" %% "refined" % "0.9.24",
-    ).map(_.withDottyCompat(scalaVersion.value))
+    )
   )
 
 lazy val circe = project
@@ -137,10 +136,18 @@ lazy val circe = project
   .settings(commonSettings)
   .settings(
     name := "skunk-circe",
-    libraryDependencies ++= Seq(
-      "io.circe" %% "circe-core"   % "0.13.0",
-      "io.circe" %% "circe-parser" % "0.13.0"
-    ).filterNot(_ => isDotty.value)
+    libraryDependencies ++= {
+      lazy val circeVersion: String =
+        scalaVersion.value match {
+          case `scala-3.0-curr` => "0.14.0-M6"
+          case `scala-3.0-prev` => "0.14.0-M5"
+          case _                => "0.13.0"
+        }
+      Seq(
+        "io.circe" %% "circe-core"   % circeVersion,
+        "io.circe" %% "circe-parser" % circeVersion
+      )
+    }
   )
 
 lazy val tests = project
@@ -152,14 +159,14 @@ lazy val tests = project
     publish / skip := true,
     scalacOptions  -= "-Xfatal-warnings",
     libraryDependencies ++= Seq(
-      "org.typelevel"     %% "scalacheck-effect-munit" % "1.0.0",
-      "org.typelevel"     %% "munit-cats-effect-2"     % "1.0.1",
-      "org.typelevel"     %% "cats-free"               % "2.5.0",
-      "org.typelevel"     %% "cats-laws"               % "2.5.0",
-      "org.typelevel"     %% "discipline-munit"        % "1.0.7",
+      "org.typelevel"     %% "scalacheck-effect-munit" % "1.0.1",
+      "org.typelevel"     %% "munit-cats-effect-2"     % "1.0.2",
+      "org.typelevel"     %% "cats-free"               % "2.6.0",
+      "org.typelevel"     %% "cats-laws"               % "2.6.0",
+      "org.typelevel"     %% "discipline-munit"        % "1.0.8",
     ) ++ Seq(
       "io.chrisdavenport" %% "cats-time"               % "0.3.4",
-    ).filterNot(_ => isDotty.value),
+    ).filterNot(_ => scalaVersion.value.startsWith("3.")),
     testFrameworks += new TestFramework("munit.Framework")
   )
 
@@ -171,14 +178,14 @@ lazy val example = project
   .settings(
     publish / skip := true,
     libraryDependencies ++= Seq(
-      "org.tpolecat"  %% "natchez-honeycomb"   % "0.0.22",
-      "org.tpolecat"  %% "natchez-jaeger"      % "0.0.22",
+      "org.tpolecat"  %% "natchez-honeycomb"   % "0.0.24",
+      "org.tpolecat"  %% "natchez-jaeger"      % "0.0.24",
     ) ++ Seq(
       "org.http4s"    %% "http4s-dsl"          % "0.21.22",
       "org.http4s"    %% "http4s-blaze-server" % "0.21.22",
       "org.http4s"    %% "http4s-circe"        % "0.21.22",
       "io.circe"      %% "circe-generic"       % "0.13.0",
-    ).filterNot(_ => isDotty.value)
+    ).filterNot(_ => scalaVersion.value.startsWith("3."))
   )
 
 lazy val docs = project
@@ -198,7 +205,7 @@ lazy val docs = project
     paradoxTheme       := Some(builtinParadoxTheme("generic")),
     version            := version.value.takeWhile(_ != '+'), // strip off the +3-f22dca22+20191110-1520-SNAPSHOT business
     paradoxProperties ++= Map(
-      "scala-versions"          -> (crossScalaVersions in core).value.map(CrossVersion.partialVersion).flatten.map(_._2).mkString("2.", "/", ""),
+      "scala-versions"          -> (core / crossScalaVersions).value.map(CrossVersion.partialVersion).flatten.map(_._2).mkString("2.", "/", ""),
       "org"                     -> organization.value,
       "scala.binary.version"    -> s"2.${CrossVersion.partialVersion(scalaVersion.value).get._2}",
       "core-dep"                -> s"${(core / name).value}_2.${CrossVersion.partialVersion(scalaVersion.value).get._2}",

modules/circe/src/main/scala-2/JsonCodecs.scala renamed to modules/circe/src/main/scala/JsonCodecs.scala

@@ -0,0 +1,20 @@
+// Copyright (c) 2018-2021 by Rob Norris
+// This software is licensed under the MIT License (MIT).
+// For more information see LICENSE or https://opensource.org/licenses/MIT
+
+package skunk
+package codec
+
+import enumeratum.{ Enum, EnumEntry }
+import skunk.data.Type
+
+trait EnumCodecPlatform {
+
+  def `enum`[A <: EnumEntry](`enum`: Enum[A], tpe: Type): Codec[A] =
+    Codec.simple[A](
+       a => a.entryName,
+       s => `enum`.withNameOption(s).toRight(s"${`enum`}: no such element '$s'"),
+       tpe
+    )
+
+}

modules/core/src/main/scala-2/codec/EnumCodecPlatform.scala

@@ -5,7 +5,6 @@
 package skunk
 
 import scala.collection.immutable.IndexedSeq
-import enumeratum.{ EnumEntry, Enum }
 import skunk.exception.PostgresErrorException
 
 /**

modules/core/src/main/scala-3/SqlState.scala

@@ -0,0 +1,8 @@
+// Copyright (c) 2018-2021 by Rob Norris
+// This software is licensed under the MIT License (MIT).
+// For more information see LICENSE or https://opensource.org/licenses/MIT
+
+package skunk
+package codec
+
+trait EnumCodecPlatform

modules/core/src/main/scala-3/codec/EnumCodecPlatform.scala

@@ -8,7 +8,6 @@ package syntax
 import cats.data.State
 import cats.syntax.all._
 import scala.language.implicitConversions
-import scala.reflect.macros.whitebox
 import scala.quoted._
 import skunk.data.Identifier
 import skunk.util.Origin

modules/core/src/main/scala-3/syntax/StringContextOps.scala

@@ -5,21 +5,13 @@
 package skunk
 package codec
 
-import enumeratum.{ Enum, EnumEntry }
 import skunk.data.Type
 
-trait EnumCodec {
+trait EnumCodec extends EnumCodecPlatform {
 
   def `enum`[A](encode: A => String, decode: String => Option[A], tpe: Type): Codec[A] =
     Codec.simple[A](encode, s => decode(s).toRight(s"${tpe.name}: no such element '$s'"), tpe)
 
-  def `enum`[A <: EnumEntry](`enum`: Enum[A], tpe: Type): Codec[A] =
-    Codec.simple[A](
-       a => a.entryName,
-       s => `enum`.withNameOption(s).toRight(s"${`enum`}: no such element '$s'"),
-       tpe
-    )
-
 }
 
 object `enum` extends EnumCodec