From 4f516ab313cede907f3bcdc38d08c68a352f524d Mon Sep 17 00:00:00 2001 From: Pavel Salamon Date: Thu, 11 Jul 2024 12:20:49 +0200 Subject: [PATCH] make default implicits available via the same package --- .../postgres/circe/implicits/package.scala | 6 ++++++ project/Dependencies.scala | 16 +++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala index d1305228..4cb526bc 100644 --- a/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala +++ b/doobie/src/main/scala/za/co/absa/db/fadb/doobie/postgres/circe/implicits/package.scala @@ -30,6 +30,12 @@ package object implicits { private implicit val showPgArray: Show[PgArray] = Show.fromToString + implicit val jsonPut: Put[Json] = doobie.postgres.circe.json.implicits.jsonPut + implicit val jsonbPut: Put[Json] = doobie.postgres.circe.jsonb.implicits.jsonbPut + + implicit val jsonGet: Get[Json] = doobie.postgres.circe.json.implicits.jsonGet + implicit val jsonbGet: Get[Json] = doobie.postgres.circe.jsonb.implicits.jsonbGet + implicit val jsonArrayPut: Put[List[Json]] = { Put.Advanced .other[PGobject]( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 103a8f71..d3b502f0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -44,10 +44,11 @@ object Dependencies { } def doobieDependencies(scalaVersion: String): Seq[ModuleID] = { - commonDependencies(scalaVersion) ++ jsonSerdeDependencies ++ Seq( + commonDependencies(scalaVersion) ++ Seq( "org.tpolecat" %% "doobie-core" % "1.0.0-RC2", "org.tpolecat" %% "doobie-hikari" % "1.0.0-RC2", - "org.tpolecat" %% "doobie-postgres" % "1.0.0-RC2" + "org.tpolecat" %% "doobie-postgres" % "1.0.0-RC2", + "org.tpolecat" %% "doobie-postgres-circe" % "1.0.0-RC2" ) } @@ -57,15 +58,4 @@ object Dependencies { Seq(postgresql) } - private def jsonSerdeDependencies: Seq[ModuleID] = { - lazy val circeCore = "io.circe" %% "circe-core" % "0.14.7" - lazy val circeParser = "io.circe" %% "circe-parser" % "0.14.7" - lazy val circeGeneric = "io.circe" %% "circe-generic" % "0.14.7" - - Seq( - circeCore, - circeParser, - circeGeneric, - ) - } }