Merge branch 'master' into update/play-json-2.10.5

tminglei · May 18, 2024 · 3039755 · 3039755
2 parents f1ccbe1 + 8879bf4
commit 3039755
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git 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/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)
   }
 }
diff --git 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(
@@ -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",
@@ -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.5")
 }
 lazy val slickPgPlayJson = (project in file("./addons/play-json"))
@@ -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")

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.9
+sbt.version=1.10.0