Skip to content

Commit 02868e9

Browse files
committed
Merge branch 'series/0.6.x'
2 parents 5cb88ef + 5c7e21a commit 02868e9

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ jobs:
297297

298298
- name: Publish site
299299
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/series/0.6.x'
300-
uses: peaceiris/actions-gh-pages@v3.9.3
300+
uses: peaceiris/actions-gh-pages@v4.0.0
301301
with:
302302
github_token: ${{ secrets.GITHUB_TOKEN }}
303303
publish_dir: modules/docs/target/docs/site

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ThisBuild / tlBaseVersion := "1.0"
22

33
// Our Scala versions.
4-
lazy val `scala-2.13` = "2.13.12"
4+
lazy val `scala-2.13` = "2.13.14"
55
lazy val `scala-3.0` = "3.3.3"
66

77
ThisBuild / scalaVersion := `scala-2.13`
@@ -156,8 +156,8 @@ lazy val circe = crossProject(JVMPlatform, JSPlatform, NativePlatform)
156156
.settings(
157157
name := "skunk-circe",
158158
libraryDependencies ++= Seq(
159-
"io.circe" %%% "circe-core" % "0.14.6",
160-
"io.circe" %%% "circe-jawn" % "0.14.6"
159+
"io.circe" %%% "circe-core" % "0.14.7",
160+
"io.circe" %%% "circe-jawn" % "0.14.7"
161161
)
162162
)
163163

@@ -183,10 +183,10 @@ lazy val tests = crossProject(JVMPlatform, JSPlatform, NativePlatform)
183183
.settings(
184184
tlFatalWarnings := false,
185185
libraryDependencies ++= Seq(
186-
"org.scalameta" %%% "munit" % "1.0.0-M11",
187-
"org.scalameta" % "junit-interface" % "1.0.0-M12",
186+
"org.scalameta" %%% "munit" % "1.0.0-RC1",
187+
"org.scalameta" % "junit-interface" % "1.0.0-RC1",
188188
"org.typelevel" %%% "scalacheck-effect-munit" % "2.0.0-M2",
189-
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-M5",
189+
"org.typelevel" %%% "munit-cats-effect" % "2.0.0-RC1",
190190
"org.typelevel" %%% "cats-free" % "2.10.0",
191191
"org.typelevel" %%% "cats-laws" % "2.10.0",
192192
"org.typelevel" %%% "cats-effect-testkit" % "3.5.4",

modules/core/shared/src/main/scala-2/SqlState.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import skunk.exception.PostgresErrorException
1212
sealed abstract class SqlState(val code: String) extends EnumEntry {
1313

1414
def unapply(e: Throwable): Option[PostgresErrorException] =
15-
Some(e).collect { case e: PostgresErrorException if e.code == code => e }
15+
Some(e).collect { case pe: PostgresErrorException if pe.code == code => pe }
1616

1717
}
1818

@@ -1222,4 +1222,4 @@ object SqlState extends Enum[SqlState] {
12221222

12231223
override val values: IndexedSeq[SqlState] = findValues
12241224

1225-
}
1225+
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.9
1+
sbt.version=1.10.0

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ ThisBuild / libraryDependencySchemes ++= Seq(
33
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
44
)
55

6-
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7")
7-
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.7")
6+
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.1")
7+
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.1")
88
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
99
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
10-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")
10+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
1111
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
1212
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
13-
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1")
13+
addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")

0 commit comments

Comments
 (0)