From c0301d38a19339ae1df46b8331fc506d51b7e994 Mon Sep 17 00:00:00 2001
From: Scala Steward <me@scala-steward.org>
Date: Fri, 20 May 2022 06:31:19 +0200
Subject: [PATCH 1/2] Update circe-core, circe-generic, ... to 0.14.2

---
 project/Dependencies.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 278345c4..1af8a43d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -12,7 +12,7 @@ object Dependencies {
   val CatsVersion = "2.7.0"
   val CatsEffectVersion = "3.3.11"
   val CatsParseVersion = "0.3.7"
-  val CirceVersion = "0.14.1"
+  val CirceVersion = "0.14.2"
   val ClipboardJsVersion = "2.0.6"
   val DoobieVersion = "1.0.0-RC2"
   val EmilVersion = "0.12.0"

From 7a2491a61efe88dd1fc190719f53119bc6d83036 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Sat, 21 May 2022 14:49:43 +0200
Subject: [PATCH 2/2] Split out separate circe versions

---
 .../docspell/ftspsql/PsqlFtsClientTest.scala  |  3 ++-
 project/Dependencies.scala                    | 19 ++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala b/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
index 370b6045..55873e10 100644
--- a/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
+++ b/modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
@@ -7,7 +7,7 @@
 package docspell.ftspsql
 
 import cats.effect._
-import cats.syntax.all._
+import cats.syntax.option._
 
 import docspell.ftsclient.{FtsQuery, TextData}
 import docspell.logging.{Level, LogConfig, TestLoggingConfig}
@@ -20,6 +20,7 @@ import org.testcontainers.utility.DockerImageName
 
 class PsqlFtsClientTest
     extends CatsEffectSuite
+    with DoobieMeta
     with PgFixtures
     with TestContainerForAll
     with TestLoggingConfig {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1af8a43d..3f142486 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -13,6 +13,8 @@ object Dependencies {
   val CatsEffectVersion = "3.3.11"
   val CatsParseVersion = "0.3.7"
   val CirceVersion = "0.14.2"
+  val CirceGenericExtrasVersion = "0.14.1"
+  val CirceYamlVersion = "0.14.1"
   val ClipboardJsVersion = "2.0.6"
   val DoobieVersion = "1.0.0-RC2"
   val EmilVersion = "0.12.0"
@@ -261,22 +263,13 @@ object Dependencies {
     circeCore ++ circeParser ++ Seq(
       "io.circe" %% "circe-generic" % CirceVersion
     )
-  val circeGenericExtra = Seq(
-    "io.circe" %% "circe-generic-extras" % CirceVersion
+  val circeGenericExtra = circeCore ++ Seq(
+    "io.circe" %% "circe-generic-extras" % CirceGenericExtrasVersion
   )
-  val circeYaml = Seq(
-    "io.circe" %% "circe-yaml" % CirceVersion
+  val circeYaml = circeCore ++ Seq(
+    "io.circe" %% "circe-yaml" % CirceYamlVersion
   )
 
-  // // https://github.com/Log4s/log4s;ASL 2.0
-  // val loggingApi = Seq(
-  //   "org.log4s" %% "log4s" % Log4sVersion
-  // )
-
-  // val logging = Seq(
-  //   "ch.qos.logback" % "logback-classic" % LogbackVersion
-  // )
-
   // https://github.com/melrief/pureconfig
   // MPL 2.0
   val pureconfig = Seq(