From 9e242a16ede1b6fedd52717dc61fd291612a98e9 Mon Sep 17 00:00:00 2001 From: Grzegorz Bielski Date: Wed, 11 Jun 2025 14:17:47 +0200 Subject: [PATCH 1/2] Update versions of play-json, circe and jsoniter --- .github/workflows/ci.yml | 4 ++-- .gitignore | 5 ++++- build.sbt | 2 +- project/Dependencies.scala | 10 +++++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc0959a..f188379 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: scala: - 2.13.16 - 2.12.20 - - 3.3.5 + - 3.3.6 steps: - uses: actions/checkout@v3 @@ -39,4 +39,4 @@ jobs: with: type: ${{ job.status }} job_name: Build - url: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file + url: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.gitignore b/.gitignore index 7fc07ac..bea1997 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,7 @@ ignore scripts/tmp ignored/ -.java-version \ No newline at end of file +.java-version + +.metals +.vscode diff --git a/build.sbt b/build.sbt index e17f728..eea6503 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import scala.collection.Seq val Scala213 = "2.13.16" val Scala212 = "2.12.20" -val Scala3 = "3.3.5" +val Scala3 = "3.3.6" val commonSettings = Seq( homepage := Some(url("https://github.com/evolution-gaming/play-json-tools")), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 12a2df3..1b82193 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,14 +4,14 @@ object Dependencies { val shapeless = "com.chuusai" %% "shapeless" % "2.3.10" val nel = "com.evolutiongaming" %% "nel" % "1.3.5" - val playJson = "com.typesafe.play" %% "play-json" % "2.10.2" - val scalaTest = "org.scalatest" %% "scalatest" % "3.2.18" - val jsoniter = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % "2.23.0" + val playJson = "org.playframework" %% "play-json" % "3.0.4" + val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" + val jsoniter = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % "2.36.4" val jsonGenerator = "com.github.imrafaelmerino" %% "json-scala-values-generator" % "1.0.0" val collectionCompact = "org.scala-lang.modules" %% "scala-collection-compat" % "2.10.0" object circe { - val version = "0.14.5" + val version = "0.14.13" val core = "io.circe" %% "circe-core" % version val parser = "io.circe" %% "circe-parser" % version } @@ -20,4 +20,4 @@ object Dependencies { ExclusionRule("log4j", "log4j"), ExclusionRule("org.slf4j", "slf4j-log4j12"), ExclusionRule("commons-logging", "commons-logging")) -} \ No newline at end of file +} From 8ec951bfe0f1a9a01b092c9d351385acfb6d8a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mareks=20Ramp=C4=81ns?= <8796159+mr-git@users.noreply.github.com> Date: Wed, 9 Jul 2025 15:08:06 +0300 Subject: [PATCH 2/2] Update project/Dependencies.scala --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c1993e2..dc2b6b3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies { val nel = "com.evolutiongaming" %% "nel" % "1.3.5" val playJson = "com.typesafe.play" %% "play-json" % "2.10.7" val scalaTest = "org.scalatest" %% "scalatest" % "3.2.19" - val jsoniter = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % "2.36.4" + val jsoniter = "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-core" % "2.36.7" val jsonGenerator = "com.github.imrafaelmerino" %% "json-scala-values-generator" % "1.0.0" val collectionCompact = "org.scala-lang.modules" %% "scala-collection-compat" % "2.10.0"