Merge branch 'series/0.6.x'

typelevel · May 10, 2024 · 02868e9 · 02868e9
2 parents 5cb88ef + 5c7e21a
commit 02868e9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -297,7 +297,7 @@ jobs:
 
       - name: Publish site
         if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.6.x'
-        uses: peaceiris/actions-gh-pages@v3.9.3
+        uses: peaceiris/actions-gh-pages@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: modules/docs/target/docs/site

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 ThisBuild / tlBaseVersion := "1.0"
 
 // Our Scala versions.
-lazy val `scala-2.13` = "2.13.12"
+lazy val `scala-2.13` = "2.13.14"
 lazy val `scala-3.0`  = "3.3.3"
 
 ThisBuild / scalaVersion       := `scala-2.13`
@@ -156,8 +156,8 @@ lazy val circe = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(
     name := "skunk-circe",
     libraryDependencies ++= Seq(
-      "io.circe" %%% "circe-core"   % "0.14.6",
-      "io.circe" %%% "circe-jawn" % "0.14.6"
+      "io.circe" %%% "circe-core"   % "0.14.7",
+      "io.circe" %%% "circe-jawn" % "0.14.7"
     )
   )
 
@@ -183,10 +183,10 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(
     tlFatalWarnings := false,
     libraryDependencies ++= Seq(
-      "org.scalameta"     %%% "munit"                   % "1.0.0-M11",
-      "org.scalameta"     % "junit-interface"           % "1.0.0-M12",
+      "org.scalameta"     %%% "munit"                   % "1.0.0-RC1",
+      "org.scalameta"     % "junit-interface"           % "1.0.0-RC1",
       "org.typelevel"     %%% "scalacheck-effect-munit" % "2.0.0-M2",
-      "org.typelevel"     %%% "munit-cats-effect"       % "2.0.0-M5",
+      "org.typelevel"     %%% "munit-cats-effect"       % "2.0.0-RC1",
       "org.typelevel"     %%% "cats-free"               % "2.10.0",
       "org.typelevel"     %%% "cats-laws"               % "2.10.0",
       "org.typelevel"     %%% "cats-effect-testkit"     % "3.5.4",

diff --git a/modules/core/shared/src/main/scala-2/SqlState.scala b/modules/core/shared/src/main/scala-2/SqlState.scala
@@ -12,7 +12,7 @@ import skunk.exception.PostgresErrorException
 sealed abstract class SqlState(val code: String) extends EnumEntry {
 
   def unapply(e: Throwable): Option[PostgresErrorException] =
-    Some(e).collect { case e: PostgresErrorException if e.code == code => e }
+    Some(e).collect { case pe: PostgresErrorException if pe.code == code => pe }
 
 }
 
@@ -1222,4 +1222,4 @@ object SqlState extends Enum[SqlState] {
 
   override val values: IndexedSeq[SqlState] = findValues
 
-}
+}
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,11 +3,11 @@ ThisBuild / libraryDependencySchemes ++= Seq(
   "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 )
 
-addSbtPlugin("org.typelevel"      % "sbt-typelevel"                               % "0.6.7")
-addSbtPlugin("org.typelevel"      % "sbt-typelevel-site"                          % "0.6.7")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel"                               % "0.7.1")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel-site"                          % "0.7.1")
 addSbtPlugin("com.timushev.sbt"   % "sbt-updates"                                 % "0.6.4")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                                     % "0.4.7")
-addSbtPlugin("org.scoverage"      % "sbt-scoverage"                               % "2.0.11")
+addSbtPlugin("org.scoverage"      % "sbt-scoverage"                               % "2.0.12")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"                                 % "1.16.0")
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"                            % "0.4.17")
-addSbtPlugin("com.armanbilge"     % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1")
+addSbtPlugin("com.armanbilge"     % "sbt-scala-native-config-brew-github-actions" % "0.3.0")