Merge branch 'master' into update/testcontainers-scala-postgresql-0.41.0

tminglei · Sep 17, 2023 · 212babc · 212babc
2 parents d585ba9 + 87506be
commit 212babc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         java: [8, 11]
-        scala: [2.12.18, 2.13.11]
+        scala: [2.12.18, 2.13.12]
         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
@@ -1,5 +1,5 @@
 val scala212 = "2.12.18"
-val scala213 = "2.13.11"
+val scala213 = "2.13.12"
 
 lazy val commonSettings = Seq(
   organizationName := "slick-pg",
@@ -68,8 +68,8 @@ def mainDependencies(scalaVersion: String) = {
     "com.typesafe.slick" %% "slick" % "3.5.0-M4",
     "org.postgresql" % "postgresql" % "42.6.0",
     "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
-    "org.slf4j" % "slf4j-simple" % "2.0.7" % "provided",
-    "org.scalatest" %% "scalatest" % "3.2.16" % "test",
+    "org.slf4j" % "slf4j-simple" % "2.0.9" % "provided",
+    "org.scalatest" %% "scalatest" % "3.2.17" % "test",
     "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.17" % "test",
     "com.dimafeng" %% "testcontainers-scala-postgresql" % "0.40.17" % "test"
   )
@@ -167,9 +167,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.5",
-        "io.circe" %% "circe-generic" % "0.14.5",
-        "io.circe" %% "circe-parser" % "0.14.5"
+        "io.circe" %% "circe-core" % "0.14.6",
+        "io.circe" %% "circe-generic" % "0.14.6",
+        "io.circe" %% "circe-parser" % "0.14.6"
       )
   )
   .dependsOn (slickPgCore % "test->test;compile->compile")

diff --git a/src/test/scala/com/github/tminglei/slickpg/PgArraySupportSuite.scala b/src/test/scala/com/github/tminglei/slickpg/PgArraySupportSuite.scala
@@ -98,7 +98,7 @@ class PgArraySupportSuite extends AnyFunSuite with PostgresContainer {
     List("robert}; drop table students--", null, "NULL"), List(Some("[2.3,)"), Some("[0.3.0,)"), None, Some("7.1.0"), None),
     Some(Vector("str1", "str3", "", " ")), List(uuid1, uuid2), List(BigDecimal.decimal(0.5)), List(Institution(113)), None)
   val testRec2 = ArrayBean(37L, "test'", List(101, 103), Buffer(11L, 31L, 5L), List(List(21L, 22L, 23L)), Nil, List(""), Nil,
-    Some(Vector("str11", "str3")), List(uuid1, uuid2, uuid3), Nil, List(Institution(579)), Some(List(MarketFinancialProduct("product1"))))
+    Some(Vector("str11", "str3", "Client's address")), List(uuid1, uuid2, uuid3), Nil, List(Institution(579)), Some(List(MarketFinancialProduct("product1"))))
   val testRec3 = ArrayBean(41L, "haha", List(103, 101), Buffer(11L, 5L, 31L), List(List(31L, 32L, 33L)), List(35,77), Nil, Nil,
     Some(Vector("(s)", "str5", "str3")), List(uuid1, uuid3), Nil, Nil, Some(List(MarketFinancialProduct("product3"), MarketFinancialProduct("product x"))))