diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22f402e9..bd071ae3 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.14, 3.3.1] + scala: [2.12.20, 2.13.15, 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 64510d8a..d434eace 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ -val scala212 = "2.12.19" -val scala213 = "2.13.14" +val scala212 = "2.12.20" +val scala213 = "2.13.15" val scala3 = "3.3.1" lazy val commonSettings = Seq( @@ -68,10 +68,10 @@ 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.10", - "com.typesafe.slick" %% "slick" % "3.5.1", - "org.postgresql" % "postgresql" % "42.7.3", + "com.typesafe.slick" %% "slick" % "3.5.2", + "org.postgresql" % "postgresql" % "42.7.4", "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0", - "org.slf4j" % "slf4j-simple" % "2.0.13" % "provided", + "org.slf4j" % "slf4j-simple" % "2.0.16" % "provided", "org.scalatest" %% "scalatest" % "3.2.19" % "test", "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.41.3" % "test", "com.dimafeng" %% "testcontainers-scala-postgresql" % "0.41.3" % "test" @@ -102,7 +102,7 @@ lazy val slickPgJoda = (project in file("./addons/joda-time")) name := "slick-pg_joda-time", description := "Slick extensions for PostgreSQL - joda time module", libraryDependencies := mainDependencies(scalaVersion.value) ++ Seq( - "joda-time" % "joda-time" % "2.12.7" + "joda-time" % "joda-time" % "2.13.0" ) ) .dependsOn (slickPgCore % "test->test;compile->compile") @@ -137,13 +137,13 @@ lazy val slickPgJtsLt = (project in file("./addons/jts_lt")) name := "slick-pg_jts_lt", description := "Slick extensions for PostgreSQL - (locationtech) jts module", libraryDependencies := mainDependencies(scalaVersion.value) ++ Seq( - "org.locationtech.jts" % "jts-core" % "1.19.0" + "org.locationtech.jts" % "jts-core" % "1.20.0" ) ) .dependsOn (slickPgCore % "test->test;compile->compile") def playJsonDependencies(scalaVersion: String) = { - if (scalaVersion.startsWith("3")) Seq("org.playframework" %% "play-json" % "3.0.3") + if (scalaVersion.startsWith("3")) Seq("org.playframework" %% "play-json" % "3.0.4") else Seq("com.typesafe.play" %% "play-json" % "2.10.6") } 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.9", - "io.circe" %% "circe-generic" % "0.14.9", - "io.circe" %% "circe-parser" % "0.14.9" + "io.circe" %% "circe-core" % "0.14.10", + "io.circe" %% "circe-generic" % "0.14.10", + "io.circe" %% "circe-parser" % "0.14.10" ) ) .dependsOn (slickPgCore % "test->test;compile->compile") @@ -197,7 +197,7 @@ lazy val slickPgArgonaut = (project in file("./addons/argonaut")) name := "slick-pg_argonaut", description := "Slick extensions for PostgreSQL - argonaut module", libraryDependencies := mainDependencies(scalaVersion.value) ++ - Seq("io.argonaut" %% "argonaut" % "6.3.10") + Seq("io.github.argonaut-io" %% "argonaut" % "6.3.11") ) .dependsOn (slickPgCore % "test->test;compile->compile") diff --git a/project/build.properties b/project/build.properties index ee4c672c..e88a0d81 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.6 diff --git a/project/plugins.sbt b/project/plugins.sbt index 3b328829..c48411e9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,4 +5,4 @@ logLevel := Level.Warn resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" // Add sbt PGP Plugin -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")