Skip to content

Commit 58812e0

Browse files
committed
Dep updates
1 parent 66ee764 commit 58812e0

File tree

6 files changed

+30
-17
lines changed

6 files changed

+30
-17
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ name: Continuous Integration
1010
on:
1111
pull_request:
1212
branches: ['**', '!update/**', '!pr/**']
13+
types: []
1314
push:
1415
branches: ['**', '!update/**', '!pr/**']
1516
tags: [v*]

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=3.10.0
1+
version=3.10.1
22
maxColumn = 120
33
assumeStandardLibraryStripMargin = true
44

build.sbt

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ lazy val catsVersion = "2.13.0"
77
lazy val catsEffectVersion = "3.6.3"
88
lazy val circeVersion = "0.14.15"
99
lazy val fs2Version = "3.12.2"
10-
lazy val h2Version = "2.3.232"
10+
lazy val h2Version = "2.4.240"
1111
lazy val hikariVersion = "7.0.2" // N.B. Hikari v4 introduces a breaking change via slf4j v2
1212
lazy val kindProjectorVersion = "0.11.2"
13-
lazy val mysqlVersion = "9.4.0"
13+
lazy val mysqlVersion = "9.5.0"
1414
lazy val log4catsVersion = "2.7.1"
1515
lazy val postGisVersion = "2025.1.1"
1616
lazy val postgresVersion = "42.7.8"
1717
lazy val refinedVersion = "0.11.3"
1818
lazy val scalaCollectionCompatVersion = "2.14.0"
1919
lazy val scalaCheckVersion = "1.15.4"
2020
lazy val scalatestVersion = "3.2.18"
21-
lazy val munitVersion = "1.2.0"
21+
lazy val munitVersion = "1.2.1"
2222
lazy val shapelessVersion = "2.3.13"
2323
lazy val silencerVersion = "1.7.1"
24-
lazy val specs2Version = "4.21.0"
24+
lazy val specs2Version = "4.23.0"
2525
lazy val scala212Version = "2.12.20"
26-
lazy val scala213Version = "2.13.16"
27-
lazy val scala3Version = "3.3.6"
26+
lazy val scala213Version = "2.13.17"
27+
lazy val scala3Version = "3.3.7"
2828
// scala-steward:off
2929
lazy val slf4jVersion = "1.7.36"
3030
// scala-steward:on
@@ -62,6 +62,8 @@ ThisBuild / githubWorkflowBuild := {
6262
case other => other
6363
}
6464
}
65+
// Disable running CI for Pull Requests (a normal push already triggers CI)
66+
ThisBuild / githubWorkflowPREventTypes := Seq.empty
6567
ThisBuild / githubWorkflowBuildPostamble ++= Seq(
6668
WorkflowStep.Sbt(
6769
commands = List("checkGitNoUncommittedChanges"),
@@ -111,7 +113,11 @@ lazy val compilerFlags = Seq(
111113
// Handle irrefutable patterns in for comprehensions
112114
Seq("-source:future", "-language:adhocExtensions", "-Xmax-inlines", "64")
113115
case "2.13" =>
114-
Seq("-Xsource:3-cross")
116+
Seq(
117+
"-Xsource:3-cross",
118+
// See https://github.com/scala/bug/issues/13128. Should no longer be need in 2.13.18 since change was reverted
119+
"-Wconf:cat=lint-infer-any&msg=kind-polymorphic:s"
120+
)
115121
case "2.12" =>
116122
Seq("-Xsource:3")
117123
}
@@ -144,6 +150,10 @@ lazy val commonSettings =
144150
"https://github.com/typelevel/doobie/blob/v" + version.value + "€{FILE_PATH}.scala"
145151
),
146152

153+
// I'm not sure why semanticdbVersion is 4.12.3 which doesn't exist for Scala version 2.13.17
154+
// Perhaps SBT / Metals need to update their default version and this will be fixed in the future?
155+
semanticdbVersion := "4.14.1",
156+
147157
// Kind Projector (Scala 2 only)
148158
libraryDependencies ++= Seq(
149159
compilerPlugin("org.typelevel" %% "kind-projector" % "0.13.4" cross CrossVersion.full),

modules/core/src/test/scala/doobie/util/ReadSuite.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,15 @@ class ReadSuite extends munit.CatsEffectSuite with ReadSuitePlatform {
344344
test("Derivation for big case class works") {
345345
Read.derived[Big30CaseClass].void
346346

347+
// Check "derived" still works in the presense of auto derivation
347348
import doobie.implicits.*
348349
Read.derived[Big30CaseClass].void
349-
}
350-
351-
test("Derivation for big case class works") {
352-
Read.derived[Big30CaseClass].void
350+
}: @nowarn("msg=.*(u|U)nused import.*")
353351

352+
test("Auto-derivation for big case class works") {
354353
import doobie.implicits.*
355354
Read[Big30CaseClass].void
356-
}
355+
}: @nowarn("msg=.*(u|U)nused import.*")
357356

358357
private def insertTuple3AndCheckRead[Tup <: (?, ?, ?): Write, A: Read](in: Tup, expectedOut: A)(implicit
359358
loc: Location

modules/core/src/test/scala/doobie/util/YoloSuite.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,22 @@ package util
88
import cats.effect.IO
99
import doobie.util.yolo.*
1010

11+
import scala.annotation.nowarn
12+
1113
class YoloSuite extends munit.FunSuite {
1214

1315
// Kind of a bogus test; just checking for compilation
1416
test("YOLO checks should compile for Query, Query0, Update, Update0") {
15-
lazy val _ = {
16-
val y = new Yolo[IO](null); import y.*
17+
lazy val x = {
18+
val y = new Yolo[IO](null);
19+
import y.*
1720
void(
1821
(null: Query0[Int]).check,
1922
(null: Query[Int, Int]).check,
2023
Update0("", None).check,
2124
Update[Int]("", None).check
2225
)
2326
}
24-
}
27+
}: @nowarn("msg=.*(never used|unused).*")
2528

2629
}

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.2")
99
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.8")
1010
addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
1111
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
12-
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2")
12+
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.0")
1313
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
1414
addDependencyTreePlugin

0 commit comments

Comments
 (0)