Merge branch 'series/0.6.x' into update/series/0.6.x/junit-interface-…

…1.0.0-RC1
typelevel · May 10, 2024 · 8fdf77d · 8fdf77d
2 parents a77069f + 72cb16b
commit 8fdf77d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -352,7 +352,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
@@ -2,7 +2,7 @@ ThisBuild / tlBaseVersion := "0.6"
 
 // Our Scala versions.
 lazy val `scala-2.12` = "2.12.19"
-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"
     )
   )
 
@@ -187,10 +187,10 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .settings(
     tlFatalWarnings := false,
     libraryDependencies ++= Seq(
-      "org.scalameta"     %%% "munit"                   % "1.0.0-M11",
+      "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/modules/core/shared/src/main/scala/util/Typer.scala b/modules/core/shared/src/main/scala/util/Typer.scala
@@ -177,7 +177,10 @@ object Typer {
   case class TypeInfo(oid: Int, name: String, arrayTypeOid: Option[Int], relOid: Option[Int])
 
   implicit class ProtocolOps[F[_]: Functor](p: Protocol[F]) {
-    val oid: Codec[Int] = Codec.simple(_.toString, _.toInt.asRight, Type.oid)
+    //Note Postgres defines oids as *unsigned* Ints https://www.postgresql.org/docs/current/datatype-oid.html
+    //Since Scala currently lacks a built-in unsigned Int type, if the oid exceeds `Int.MaxValue`
+    //it will be converted to/from a negative Int by this Codec (only observed in CockroachDB)
+    val oid: Codec[Int] = Codec.simple(java.lang.Integer.toUnsignedLong(_).toString, _.toLong.toInt.asRight, Type.oid)
 
     val typeInfoMap: F[Map[Int, TypeInfo]] = {
 

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,10 +3,10 @@ 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("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")