From 2437e5405bfed67970f8514308c82e15a6702704 Mon Sep 17 00:00:00 2001 From: Andy Gallagher Date: Wed, 3 Jul 2024 11:13:48 +0100 Subject: [PATCH 1/3] update the Thrift library --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8d4e9de..a2d9744 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion val contentEntityVersion = "3.0.3" val contentAtomVersion = "4.0.4" val storyPackageVersion = "2.2.0" -val thriftVersion = "0.15.0" +val thriftVersion = "0.20.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes val circeVersion = "0.14.1" val fezziwigVersion = "2.0.0" From 9b369b3063833ca0c0463a3afb00ba754ce011d6 Mon Sep 17 00:00:00 2001 From: Andy Gallagher Date: Thu, 4 Jul 2024 12:43:35 +0100 Subject: [PATCH 2/3] update dependencies for Thrift, also update Circe json --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index a2d9744..bd7a619 100644 --- a/build.sbt +++ b/build.sbt @@ -4,12 +4,12 @@ import sbtrelease.ReleaseStateTransformations.* import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions -val contentEntityVersion = "3.0.3" -val contentAtomVersion = "4.0.4" +val contentEntityVersion = "4.0.0" +val contentAtomVersion = "5.0.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.20.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes -val circeVersion = "0.14.1" +val circeVersion = "0.14.9" val fezziwigVersion = "2.0.0" // dependency versions (for tests only) @@ -117,7 +117,7 @@ lazy val json = Project(id = "content-api-models-json", base = file("json")) "io.circe" %% "circe-core" % circeVersion, "io.circe" %% "circe-generic" % circeVersion, "io.circe" %% "circe-parser" % circeVersion, - "io.circe" %% "circe-optics" % circeVersion, + "io.circe" %% "circe-optics" % "0.14.1", //circe-optics is now released at a difference cadence to circe main project - https://github.com/circe/circe-optics "org.scalatest" %% "scalatest" % scalaTestVersion % Test, "com.google.guava" % "guava" % guavaVersion % Test, "org.gnieh" %% "diffson-circe" % diffsonVersion % Test From 0144ace47148a2f80e48477238e83f2965df4d7e Mon Sep 17 00:00:00 2001 From: Andy Gallagher Date: Thu, 4 Jul 2024 13:33:28 +0100 Subject: [PATCH 3/3] damn there was a subdependency problem --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index bd7a619..ce8c32c 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions val contentEntityVersion = "4.0.0" -val contentAtomVersion = "5.0.0" +val contentAtomVersion = "6.0.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.20.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes