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 c1d19005..afcdd5a3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,7 +12,9 @@ object Dependencies { val CatsVersion = "2.7.0" val CatsEffectVersion = "3.3.12" val CatsParseVersion = "0.3.7" - val CirceVersion = "0.14.1" + 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(