From 8d4327b52e782e2430b4c66fb8f7d6832002a73b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 May 2024 03:40:26 +0000 Subject: [PATCH 1/6] Update circe-core, circe-generic, ... to 0.14.7 --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 6943809c..36f6edf0 100644 --- a/build.sbt +++ b/build.sbt @@ -174,9 +174,9 @@ lazy val slickPgCirceJson = (project in file("./addons/circe-json")) description := "Slick extensions for PostgreSQL - circe module", libraryDependencies := mainDependencies(scalaVersion.value) ++ Seq( - "io.circe" %% "circe-core" % "0.14.6", - "io.circe" %% "circe-generic" % "0.14.6", - "io.circe" %% "circe-parser" % "0.14.6" + "io.circe" %% "circe-core" % "0.14.7", + "io.circe" %% "circe-generic" % "0.14.7", + "io.circe" %% "circe-parser" % "0.14.7" ) ) .dependsOn (slickPgCore % "test->test;compile->compile") From 2b8d2f62d67942bc65d7a1c7a3246fda3c838275 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 May 2024 03:40:28 +0000 Subject: [PATCH 2/6] Update play-json to 3.0.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6943809c..b052bcff 100644 --- a/build.sbt +++ b/build.sbt @@ -143,7 +143,7 @@ lazy val slickPgJtsLt = (project in file("./addons/jts_lt")) .dependsOn (slickPgCore % "test->test;compile->compile") def playJsonDependencies(scalaVersion: String) = { - if (scalaVersion.startsWith("3")) Seq("org.playframework" %% "play-json" % "3.0.2") + if (scalaVersion.startsWith("3")) Seq("org.playframework" %% "play-json" % "3.0.3") else Seq("com.typesafe.play" %% "play-json" % "2.10.4") } lazy val slickPgPlayJson = (project in file("./addons/play-json")) From cdb78ed34d2eee707b49ecb1952292c8278c5a7d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 May 2024 03:40:30 +0000 Subject: [PATCH 3/6] Update scala-reflect to 2.13.14 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b35cd692..22f402e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: java: [8, 21] - scala: [2.12.19, 2.13.13, 3.3.1] + scala: [2.12.19, 2.13.14, 3.3.1] postgres: [11, 12, 13, 14] name: Test (Postgres ${{ matrix.postgres }} Scala ${{ matrix.scala }} Java ${{ matrix.java }}) runs-on: ubuntu-latest diff --git a/build.sbt b/build.sbt index 6943809c..3c1cdc5c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ val scala212 = "2.12.19" -val scala213 = "2.13.13" +val scala213 = "2.13.14" val scala3 = "3.3.1" lazy val commonSettings = Seq( From d61fc9ce27661481143545c3eb3e3ae38a9f1aef Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 May 2024 03:40:33 +0000 Subject: [PATCH 4/6] Update sbt to 1.10.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04267b14..081fdbbc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 From 7c7edebb886b499eb53ea36f1d82a81b60b9a6a9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 9 May 2024 20:25:16 +0000 Subject: [PATCH 5/6] Update izumi-reflect to 2.3.9 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6943809c..8145606f 100644 --- a/build.sbt +++ b/build.sbt @@ -67,7 +67,7 @@ def mainDependencies(scalaVersion: String) = { Seq ( "org.scala-lang.modules" %% "scala-parser-combinators" % (if (isScala3) "2.3.0" else "1.1.2"), - "dev.zio" %% "izumi-reflect" % "2.3.8", + "dev.zio" %% "izumi-reflect" % "2.3.9", "com.typesafe.slick" %% "slick" % "3.5.1", "org.postgresql" % "postgresql" % "42.7.3", "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0", From d92a5f2c89a832dce61461ae675215f3f9a9744f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cardoso?= Date: Thu, 16 May 2024 17:43:21 +0100 Subject: [PATCH 6/6] Use compact JSON representation --- .../com/github/tminglei/slickpg/PgCirceJsonSupport.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala b/addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala index d7d93067..6a182eef 100644 --- a/addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala +++ b/addons/circe-json/src/main/scala/com/github/tminglei/slickpg/PgCirceJsonSupport.scala @@ -31,7 +31,7 @@ trait PgCirceJsonSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTy new GenericJdbcType[Json]( pgjson, (v) => parse(v).getOrElse(Json.Null), - (v) => clean(v.asJson.spaces2), + (v) => clean(v.asJson.noSpaces), hasLiteralForm = false ) @@ -54,7 +54,7 @@ trait PgCirceJsonSupport extends json.PgJsonExtensions with utils.PgCommonJdbcTy implicit val getJson: GetResult[Json] = mkGetResult(_.nextJson()) implicit val getJsonOption: GetResult[Option[Json]] = mkGetResult(_.nextJsonOption()) - implicit val setJson: SetParameter[Json] = mkSetParameter[Json](pgjson, _.asJson.spaces2) - implicit val setJsonOption: SetParameter[Option[Json]] = mkOptionSetParameter[Json](pgjson, _.asJson.spaces2) + implicit val setJson: SetParameter[Json] = mkSetParameter[Json](pgjson, _.asJson.noSpaces) + implicit val setJsonOption: SetParameter[Option[Json]] = mkOptionSetParameter[Json](pgjson, _.asJson.noSpaces) } }