From 35028b767b68431bbd994f075499e7a18f3ab5e7 Mon Sep 17 00:00:00 2001 From: Chris Davenport Date: Fri, 25 Sep 2026 19:50:54 -0700 Subject: [PATCH 1/2] Move to the 2026 dependency baseline Scala 2.13.18 and 3.3.8 LTS, dropping 2.12. cats 2.13.0, cats-effect 3.7.1, fs2 3.14.0, http4s 0.23.37, log4cats 2.8.0, and the munit/scalacheck/scodec test stack brought current. Scala.js 1.22.0 and Scala Native 0.5.12. fs2 and http4s are the reason this is not optional: every repo sat below the fs2 3.12.2 floor, thirteen below the 3.2.11 one, and fourteen below http4s 0.23.17. The rest follows because the Typelevel stack moves together. Co-Authored-By: Claude Opus 5 (1M context) --- build.sbt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index 95c798a..c20ccec 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ val Scala3 = "3.3.8" Global / onChangedBuildSource := ReloadOnSourceChanges -ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3) +ThisBuild / crossScalaVersions := Seq(Scala213, Scala3) ThisBuild / scalaVersion := Scala213 def crossCompileDirs(scalaVersion: String, baseDirectory: File) = { @@ -76,7 +76,7 @@ lazy val doobie = project "org.typelevel" %% "discipline-munit" % disciplineMunit % Test, "org.scalameta" %% "munit" % munitV % Test, "org.scalameta" %% "munit-scalacheck" % munitV % Test, - "org.typelevel" %%% "munit-cats-effect-3" % munitCE3V % Test, + "org.typelevel" %%% "munit-cats-effect" % munitCE3V % Test, ("com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersV % Test) .cross(CrossVersion.for3Use2_13) ), @@ -128,16 +128,16 @@ lazy val site = project .build ) -val catsV = "2.7.0" //https://github.com/typelevel/cats/releases -val catsEffectV = "3.3.12" //https://github.com/typelevel/cats-effect/releases +val catsV = "2.13.0" //https://github.com/typelevel/cats/releases +val catsEffectV = "3.7.1" //https://github.com/typelevel/cats-effect/releases val circeV = "0.14.1" //https://github.com/circe/circe/releases -val http4sV = "0.23.6" //https://github.com/http4s/http4s/releases +val http4sV = "0.23.37" //https://github.com/http4s/http4s/releases val doobieV = "1.0.0-RC1" //https://github.com/tpolecat/doobie/releases -val scalaJavaTimeV = "2.3.0" // https://github.com/cquiroz/scala-java-time/releases +val scalaJavaTimeV = "2.7.0" // https://github.com/cquiroz/scala-java-time/releases val testcontainersV = "0.39.8" -val munitV = "0.7.29" -val munitCE3V = "1.0.6" -val disciplineMunit = "1.0.9" +val munitV = "1.3.1" +val munitCE3V = "2.2.1" +val disciplineMunit = "2.0.0" // General Settings lazy val commonSettings = Seq( @@ -147,7 +147,7 @@ lazy val commonSettings = Seq( "org.typelevel" %%% "discipline-munit" % disciplineMunit % Test, "org.scalameta" %%% "munit" % munitV % Test, "org.scalameta" %%% "munit-scalacheck" % munitV % Test, - "org.typelevel" %%% "munit-cats-effect-3" % munitCE3V % Test + "org.typelevel" %%% "munit-cats-effect" % munitCE3V % Test ), // Compiler settings DavenversePlugin injected globally. sbt-typelevel-ci-release // does not supply these (only sbt-typelevel-settings would). From 5525733f5cdd48584350113bd01752d5c06e4a2b Mon Sep 17 00:00:00 2001 From: Chris Davenport Date: Fri, 25 Sep 2026 20:26:33 -0700 Subject: [PATCH 2/2] Regenerate workflows for the new Scala matrix Dropping Scala 2.12 changes the generated CI matrix, so the committed workflow no longer matched the build and githubWorkflowCheck failed. Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/ci.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index face3f6..eadaf74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.12, 2.13, 3] + scala: [2.13, 3] java: [temurin@8] runs-on: ${{ matrix.os }} timeout-minutes: 60 @@ -114,16 +114,6 @@ jobs: if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.12) - uses: actions/download-artifact@v6 - with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12 - - - name: Inflate target directories (2.12) - run: | - tar xf targets.tar - rm targets.tar - - name: Download target directories (2.13) uses: actions/download-artifact@v6 with: @@ -201,7 +191,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: fuuid_2.12 fuuid_2.13 fuuid_3 site_2.12 site_2.13 site_3 + modules-ignore: fuuid_2.13 fuuid_3 site_2.13 site_3 configs-ignore: test scala-tool scala-doc-tool test-internal site: