Skip to content

Commit 8bbcd9d

Browse files
authored
Merge pull request #1438 from tpolecat/circe-scala3
Enable circe module for Scala 3
2 parents a28a1e5 + 7455114 commit 8bbcd9d

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

build.sbt

+14-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import sbt.dsl.LinterLevel.Ignore
44
// Library versions all in one place, for convenience and sanity.
55
lazy val catsVersion = "2.6.0"
66
lazy val catsEffectVersion = "2.5.0"
7-
lazy val circeVersion = "0.13.0"
7+
lazy val circeVersion = settingKey[String]("Circe version.")
88
lazy val fs2Version = "2.5.5"
99
lazy val h2Version = "1.4.200"
1010
lazy val hikariVersion = "3.4.5" // N.B. Hikari v4 introduces a breaking change via slf4j v2
@@ -121,6 +121,14 @@ lazy val commonSettings =
121121
old
122122
},
123123

124+
circeVersion := {
125+
scalaVersion.value match {
126+
case `scala30Version` => "0.14.0-M6"
127+
case `scala30VersionOld` => "0.14.0-M5"
128+
case _ => "0.13.0"
129+
}
130+
}
131+
124132
)
125133

126134
lazy val publishSettings = Seq(
@@ -324,11 +332,10 @@ lazy val `postgres-circe` = project
324332
name := "doobie-postgres-circe",
325333
description := "Postgres circe support for doobie.",
326334
libraryDependencies ++= Seq(
327-
"io.circe" %% "circe-core" % circeVersion,
328-
"io.circe" %% "circe-parser" % circeVersion
335+
"io.circe" %% "circe-core" % circeVersion.value,
336+
"io.circe" %% "circe-parser" % circeVersion.value
329337
)
330338
)
331-
.settings(noDottySettings)
332339

333340
lazy val h2 = project
334341
.in(file("modules/h2"))
@@ -411,9 +418,9 @@ lazy val docs = project
411418
scalacOptions := Nil,
412419

413420
libraryDependencies ++= Seq(
414-
"io.circe" %% "circe-core" % circeVersion,
415-
"io.circe" %% "circe-generic" % circeVersion,
416-
"io.circe" %% "circe-parser" % circeVersion,
421+
"io.circe" %% "circe-core" % circeVersion.value,
422+
"io.circe" %% "circe-generic" % circeVersion.value,
423+
"io.circe" %% "circe-parser" % circeVersion.value,
417424
"io.monix" %% "monix-eval" % monixVersion,
418425
),
419426
fork in Test := true,

0 commit comments

Comments
 (0)