Update to sbt 2

.github/workflows/ci.yml

@@ -16,24 +16,24 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
 
-      - name: Install JDK 11
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+      - name: Install JDK 17
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: zulu
-          java-version: '11'
+          java-version: '17'
           java-package: jdk
 
       - name: Install SBT
-        uses: sbt/setup-sbt@93e926cbdb4a428e41b4ef754124ec82925ffdc2 # v1.1.23
+        uses: sbt/setup-sbt@66fb4376e81982c7d92a4074170846fff88e2e30 # v1.5.0
 
       - name: Cache SBT
         uses: coursier/cache-action@95e5b1029b6b86e7bac033ee44a0697d8a527d2d # v8.1.1
         with:
-          extraKey: v1
+          extraKey: v2
 
       - name: Lint
         run: sbt ++${{ matrix.scala }} scalafmtCheckAll

.github/workflows/release.yml

@@ -11,22 +11,22 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-      - name: Install JDK 11
-        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
+      - name: Install JDK 17
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
         with:
           distribution: zulu
-          java-version: '11'
+          java-version: '17'
           java-package: jdk
 
       - name: Install SBT
-        uses: sbt/setup-sbt@93e926cbdb4a428e41b4ef754124ec82925ffdc2 # v1.1.23
+        uses: sbt/setup-sbt@66fb4376e81982c7d92a4074170846fff88e2e30 # v1.5.0
 
       - name: Cache SBT
         uses: coursier/cache-action@95e5b1029b6b86e7bac033ee44a0697d8a527d2d # v8.1.1
         with:
-          extraKey: v1
+          extraKey: v2
 
       - name: Release
         run: sbt ci-release

.jvmopts

@@ -0,0 +1,2 @@
+# avoid stack overflow while compiling project/FreeGen2.scala
+-Xss2m

.sbtopts

@@ -1 +1 @@
--mem 2048
+-J-Xmx2000m

README.md

@@ -8,7 +8,7 @@ Currently contains the following changes:
 - PostGIS instances have been moved to the new `postgis` module and are available under `doobie.postgis.instances.{geography,geometry}`
 - `LogHandler` has been removed. Override interpreters if you want to log things.
 - removed `WeakAsync`, a `ConnectionIO` is pretty much always a database transaction and should not be mixed with an `IO` implementation
-- Requires Java 11
+- Requires Java 17
 
 To use add at least the core module to your project:
 ```

build.sbt

@@ -3,16 +3,16 @@ import FreeGen2.*
 
 val catsVersion = "2.13.0"
 val catsEffectVersion = "3.7.0"
-val circeVersion = "0.14.15"
+val circeVersion = "0.14.16"
 val fs2Version = "3.13.0"
 val h2Version = "2.4.240"
-val hikariVersion = "7.0.2"
+val hikariVersion = "7.1.0"
 val magnoliaVersion = "1.1.10"
 val munitVersion = "1.3.3"
 val mysqlVersion = "9.7.0"
 val openTelemetryVersion = "1.63.0"
 val postgisVersion = "2025.1.1"
-val postgresVersion = "42.7.11"
+val postgresVersion = "42.7.12"
 val scalatestVersion = "3.2.20"
 val shapelessVersion = "2.3.12"
 val slf4jVersion = "2.0.18"
@@ -21,7 +21,7 @@ val zioInteropCats = "23.1.0.5"
 val zioVersion = "2.1.19"
 
 val Scala213 = "2.13.18"
-val Scala3 = "3.3.7"
+val Scala3 = "3.3.8"
 
 inThisBuild(Seq(
   organization := "io.github.guymers",
@@ -42,7 +42,7 @@ lazy val commonSettings = Seq(
     "-deprecation",
     "-encoding", "UTF-8",
     "-feature",
-    "-release", "11",
+    "-release", "17",
     "-unchecked",
   ),
   scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
@@ -96,7 +96,7 @@ lazy val commonSettings = Seq(
   ),
 
   libraryDependencies ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, _)) => Seq(compilerPlugin("org.typelevel" % "kind-projector" % "0.13.4" cross CrossVersion.full))
+    case Some((2, _)) => Seq(compilerPlugin(("org.typelevel" % "kind-projector" % "0.13.4").cross(CrossVersion.full)))
     case _ => Seq.empty
   }),
 
@@ -166,7 +166,7 @@ lazy val foobie = project.in(file("."))
   )
   .aggregate(
     modules, integrationTests,
-    example, bench, docs,
+    example, bench,
   )
 
 lazy val modules = project.in(file("project/.root"))
@@ -418,52 +418,7 @@ lazy val bench = project.in(file("modules/bench"))
   .enablePlugins(JmhPlugin)
   .dependsOn(core, postgres)
 
-lazy val docs = project.in(file("modules/docs"))
-  .dependsOn(core, postgres, postgis, h2, hikari, munit, scalatest, weaver)
-  .settings(commonSettings)
-  .settings(noPublishSettings)
-  .settings(Compile / compile / wartremoverErrors := Nil)
-  .enablePlugins(GhpagesPlugin)
-  .enablePlugins(ParadoxPlugin)
-  .enablePlugins(ParadoxSitePlugin)
-  .enablePlugins(MdocPlugin)
-  .settings(
-    scalacOptions := (CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, _)) => Seq("-Xsource:3", "-Wconf:cat=scala3-migration:silent")
-      case Some((3, _)) => Seq("-Ykind-projector")
-      case _ => Seq.empty
-    }),
-    libraryDependencies ++= Seq(
-      "io.circe" %% "circe-core" % circeVersion,
-      "io.circe" %% "circe-generic" % circeVersion,
-      "io.circe" %% "circe-parser" % circeVersion,
-    ),
-    Test / fork := true,
-
-    version := version.value.takeWhile(_ != '+'), // strip off the +3-f22dca22+20191110-1520-SNAPSHOT business
-
-    git.remoteRepo := "git@github.com:guymers/foobie.git",
-    ghpagesNoJekyll := true,
-    paradoxTheme := Some(builtinParadoxTheme("generic")),
-    paradoxProperties ++= Map(
-      "scala-versions" -> {
-        val crossVersions = (core / crossScalaVersions).value.flatMap(CrossVersion.partialVersion)
-        val scala2Versions = crossVersions.filter(_._1 == 2).map(_._2).mkString("2.", "/", "") // 2.12/13
-        val scala3 = crossVersions.find(_._1 == 3).map(_ => "3") // 3
-        List(Some(scala2Versions), scala3).flatten.filter(_.nonEmpty).mkString(" and ") // 2.12/13 and 3
-      },
-      "org"                      -> organization.value,
-      "scala.binary.version"     -> CrossVersion.binaryScalaVersion(scalaVersion.value),
-      "version"                  -> version.value,
-      "catsVersion"              -> catsVersion,
-      "fs2Version"               -> fs2Version,
-      "shapelessVersion"         -> shapelessVersion,
-      "h2Version"                -> h2Version,
-      "postgresVersion"          -> postgresVersion,
-      "scalaVersion"             -> scalaVersion.value,
-    ),
-
-    mdocIn := baseDirectory.value / "src" / "main" / "mdoc",
-    Compile / paradox / sourceDirectory := mdocOut.value,
-    makeSite := makeSite.dependsOn(mdoc.toTask("")).value,
-  )
+Global / excludeLintKeys ++= Set(
+  com.github.sbt.git.SbtGit.GitKeys.gitDescribedVersion,
+  com.github.sbt.git.SbtGit.GitKeys.gitUncommittedChanges,
+)