Drop Scala 2.12

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04]
-        scala: [2.12.17, 2.13.10, 3.2.2]
+        scala: [2.13.10, 3.2.2]
         java: [temurin@11]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -168,36 +168,6 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (2.12.17, rootJS)
-        uses: actions/download-artifact@v3
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS
-
-      - name: Inflate target directories (2.12.17, rootJS)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (2.12.17, rootJVM)
-        uses: actions/download-artifact@v3
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
-
-      - name: Inflate target directories (2.12.17, rootJVM)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
-      - name: Download target directories (2.12.17, rootNative)
-        uses: actions/download-artifact@v3
-        with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative
-
-      - name: Inflate target directories (2.12.17, rootNative)
-        run: |
-          tar xf targets.tar
-          rm targets.tar
-
       - name: Download target directories (2.13.10, rootJS)
         uses: actions/download-artifact@v3
         with:

README.md

@@ -3,8 +3,8 @@
 [![Discord](https://img.shields.io/discord/632277896739946517.svg?label=&logo=discord&logoColor=ffffff&color=404244&labelColor=6A7EC2)](https://discord.gg/CSh8u9yPMe)
 [![Join the chat at https://gitter.im/skunk-pg/Lobby](https://badges.gitter.im/skunk-pg/Lobby.svg)](https://gitter.im/skunk-pg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![codecov](https://codecov.io/gh/tpolecat/skunk/branch/master/graph/badge.svg)](https://codecov.io/gh/tpolecat/skunk)
-[![Maven Central](https://img.shields.io/maven-central/v/org.tpolecat/skunk-core_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/org.tpolecat/skunk-core_2.12)
-[![Javadocs](https://javadoc.io/badge/org.tpolecat/skunk-core_2.12.svg)](https://javadoc.io/doc/org.tpolecat/skunk-core_2.12)
+[![Maven Central](https://img.shields.io/maven-central/v/org.tpolecat/skunk-core_2.13.svg)](https://maven-badges.herokuapp.com/maven-central/org.tpolecat/skunk-core_2.13)
+[![Javadocs](https://javadoc.io/badge/org.tpolecat/skunk-core_2.13.svg)](https://javadoc.io/doc/org.tpolecat/skunk-core_2.13)
 
 Skunk is a data access library for Scala + Postgres.
 

build.sbt

@@ -1,13 +1,11 @@
-ThisBuild / tlBaseVersion := "0.5"
+ThisBuild / tlBaseVersion := "1.0"
 
 // Our Scala versions.
-lazy val `scala-2.12` = "2.12.17"
 lazy val `scala-2.13` = "2.13.10"
-lazy val `scala-3.0`  = "3.2.2"
+lazy val `scala-3`  = "3.2.2"
 
 ThisBuild / scalaVersion       := `scala-2.13`
-ThisBuild / crossScalaVersions :=
-  Seq(`scala-2.12`, `scala-2.13`, `scala-3.0`)
+ThisBuild / crossScalaVersions := Seq(`scala-2.13`, `scala-3`)
 
 ThisBuild / organization := "org.tpolecat"
 ThisBuild / licenses     := Seq(License.MIT)
@@ -134,7 +132,6 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       "org.scodec"             %%% "scodec-cats"             % "1.2.0",
       "org.tpolecat"           %%% "natchez-core"            % natchezVersion,
       "org.tpolecat"           %%% "sourcepos"               % "1.1.0",
-      "org.scala-lang.modules" %%% "scala-collection-compat" % "2.10.0",
       "org.typelevel"          %%% "twiddles-core"           % "0.6.0",
     ) ++ Seq(
       "com.beachape"  %%% "enumeratum"   % "1.7.2",
@@ -252,8 +249,8 @@ lazy val docs = project
       "core-dep"                -> s"${(core.jvm / name).value}_2.${CrossVersion.partialVersion(scalaVersion.value).get._2}",
       "circe-dep"               -> s"${(circe.jvm / name).value}_2.${CrossVersion.partialVersion(scalaVersion.value).get._2}",
       "version"                 -> version.value,
-      "scaladoc.skunk.base_url" -> s"https://static.javadoc.io/org.tpolecat/skunk-core_2.12/${version.value}",
-      "scaladoc.fs2.io.base_url"-> s"https://static.javadoc.io/co.fs2/fs2-io_2.12/${fs2Version}",
+      "scaladoc.skunk.base_url" -> s"https://static.javadoc.io/org.tpolecat/skunk-core_2.13/${version.value}",
+      "scaladoc.fs2.io.base_url"-> s"https://static.javadoc.io/co.fs2/fs2-io_2.13/${fs2Version}",
     ),
     mdocIn := (baseDirectory.value) / "src" / "main" / "paradox",
     Compile / paradox / sourceDirectory := mdocOut.value,

modules/core/shared/src/main/scala-2/codec/EnumCodecPlatform.scala → modules/core/shared/src/main/scala-2/codec/EnumCodecCompat.scala

@@ -8,7 +8,7 @@ package codec
 import enumeratum.{ Enum, EnumEntry }
 import skunk.data.Type
 
-trait EnumCodecPlatform {
+private[codec] trait EnumCodecCompat {
 
   def `enum`[A <: EnumEntry](`enum`: Enum[A], tpe: Type): Codec[A] =
     Codec.simple[A](

modules/core/shared/src/main/scala-3/codec/EnumCodecPlatform.scala → modules/core/shared/src/main/scala-3/codec/EnumCodecCompat.scala

@@ -5,4 +5,4 @@
 package skunk
 package codec
 
-trait EnumCodecPlatform
+private[codec] trait EnumCodecCompat

modules/core/shared/src/main/scala/codec/EnumCodec.scala

@@ -7,7 +7,7 @@ package codec
 
 import skunk.data.Type
 
-trait EnumCodec extends EnumCodecPlatform {
+trait EnumCodec extends EnumCodecCompat {
 
   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)

modules/core/shared/src/main/scala/data/Arr.scala

@@ -6,6 +6,7 @@ package skunk.data
 
 import cats._
 import cats.syntax.all._
+import scala.collection.Factory
 import scala.collection.mutable.ArrayBuffer
 
 /**
@@ -16,7 +17,7 @@ import scala.collection.mutable.ArrayBuffer
 final class Arr[A] private (
   protected val data:   ArrayBuffer[A],
   private   val extent: Array[Int]
-) extends ArrPlatform[A] {
+) {
 
   // Data and extent must be consistent. Should be guaranteed but let's check anyway.
   assert((data.isEmpty && extent.isEmpty) || (data.length  == extent.product))
@@ -60,6 +61,13 @@ final class Arr[A] private (
   def dimensions: List[Int] =
     extent.toList
 
+  /**
+   * Construct this `Arr`'s elements as a collection `C`, as if first reshaped to be
+   * single-dimensional.
+   */
+  def flattenTo[C](fact: Factory[A, C]): C =
+    data.to(fact)
+
   /**
    * Retrieve the element at the specified location, if the ordinates are in range (i.e., between
    * zero and the corresponding entry in `dimensions`).