TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split out separate circe versions

Browse Source
This commit is contained in:
eikek
2022-05-21 14:49:43 +02:00
parent c0301d38a1
commit 7a2491a61e
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/fts-psql/src/test/scala/docspell/ftspsql/PsqlFtsClientTest.scala
View File

@ -7,7 +7,7 @@
package docspell.ftspsql package docspell.ftspsql
import cats.effect._ import cats.effect._
import cats.syntax.all._ import cats.syntax.option._
import docspell.ftsclient.{FtsQuery, TextData} import docspell.ftsclient.{FtsQuery, TextData}
import docspell.logging.{Level, LogConfig, TestLoggingConfig} import docspell.logging.{Level, LogConfig, TestLoggingConfig}
@ -20,6 +20,7 @@ import org.testcontainers.utility.DockerImageName
class PsqlFtsClientTest class PsqlFtsClientTest
extends CatsEffectSuite extends CatsEffectSuite
with DoobieMeta
with PgFixtures with PgFixtures
with TestContainerForAll with TestContainerForAll
with TestLoggingConfig { with TestLoggingConfig {

19
project/Dependencies.scala
View File

@ -13,6 +13,8 @@ object Dependencies {
val CatsEffectVersion = "3.3.11" val CatsEffectVersion = "3.3.11"
val CatsParseVersion = "0.3.7" val CatsParseVersion = "0.3.7"
val CirceVersion = "0.14.2" val CirceVersion = "0.14.2"
val CirceGenericExtrasVersion = "0.14.1"
val CirceYamlVersion = "0.14.1"
val ClipboardJsVersion = "2.0.6" val ClipboardJsVersion = "2.0.6"
val DoobieVersion = "1.0.0-RC2" val DoobieVersion = "1.0.0-RC2"
val EmilVersion = "0.12.0" val EmilVersion = "0.12.0"
@ -261,22 +263,13 @@ object Dependencies {
circeCore ++ circeParser ++ Seq( circeCore ++ circeParser ++ Seq(
"io.circe" %% "circe-generic" % CirceVersion "io.circe" %% "circe-generic" % CirceVersion
) )
val circeGenericExtra = Seq( val circeGenericExtra = circeCore ++ Seq(
"io.circe" %% "circe-generic-extras" % CirceVersion "io.circe" %% "circe-generic-extras" % CirceGenericExtrasVersion
) )
val circeYaml = Seq( val circeYaml = circeCore ++ Seq(
"io.circe" %% "circe-yaml" % CirceVersion "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 // https://github.com/melrief/pureconfig
// MPL 2.0 // MPL 2.0
val pureconfig = Seq( val pureconfig = Seq(