From 5df5c97d3974cbd9111cea7550143a2e0aae1650 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:15 +0000 Subject: [PATCH 01/14] Update sbt-version-policy to 3.2.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3ba8af9c..262d4599 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") -addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.0") +addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5") From 5e2001246427c7759ebfc8882390af0589a1d371 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:15 +0000 Subject: [PATCH 02/14] Update sbt-release to 1.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 262d4599..8cbeb9ec 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5") From 5aa3960bb1fa9355ef8a632e4b5593fcc43736f0 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:15 +0000 Subject: [PATCH 03/14] Update guava to 33.5.0-jre --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index caf745b7..99bb8049 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ val fezziwigVersion = "2.0.0" // dependency versions (for tests only) val scalaTestVersion = "3.0.8" -val guavaVersion = "19.0" +val guavaVersion = "33.5.0-jre" val diffsonVersion = "4.1.1" // support non-production release types @@ -130,7 +130,7 @@ lazy val benchmarks = Project(id = "benchmarks", base = file("benchmarks")) .settings(artifactProductionSettings) .enablePlugins(JmhPlugin) .settings( - libraryDependencies += "com.google.guava" % "guava" % "19.0", + libraryDependencies += "com.google.guava" % "guava" % "33.5.0-jre", Jmh / javaOptions ++= Seq("-server", "-Xms4G", "-Xmx4G", "-XX:+UseG1GC", "-XX:-UseBiasedLocking"), publishArtifact := false ) From 5901a51a6bfa6cf05d89d0bf4ee86bee616c5573 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:15 +0000 Subject: [PATCH 04/14] Update scrooge-core to 22.12.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 99bb8049..9543286a 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ val contentEntityVersion = "3.0.3" val contentAtomVersion = "6.1.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" -val scroogeVersion = "22.1.0" // update plugins too if this version changes +val scroogeVersion = "22.12.0" // update plugins too if this version changes val circeVersion = "0.14.1" val fezziwigVersion = "2.0.0" From 5effba82da8b39ae7d6fcafa80fe54667e547ac4 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:15 +0000 Subject: [PATCH 05/14] Update scrooge-sbt-plugin to 22.12.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8cbeb9ec..4cbe6e59 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5") -addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.1.0") +addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.12.0") addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "1.6.0") From daffa6e498daba714fe209c051ccd13da9185630 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:15 +0000 Subject: [PATCH 06/14] Update circe-core to 0.14.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9543286a..812baed9 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ val contentAtomVersion = "6.1.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" val scroogeVersion = "22.12.0" // update plugins too if this version changes -val circeVersion = "0.14.1" +val circeVersion = "0.14.14" val fezziwigVersion = "2.0.0" // dependency versions (for tests only) From f08d58b759678b40a62bd9ea9efe749afe45fd80 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 07/14] Update libthrift to 0.22.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 812baed9..d7da81eb 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion val contentEntityVersion = "3.0.3" val contentAtomVersion = "6.1.0" val storyPackageVersion = "2.2.0" -val thriftVersion = "0.15.0" +val thriftVersion = "0.22.0" val scroogeVersion = "22.12.0" // update plugins too if this version changes val circeVersion = "0.14.14" val fezziwigVersion = "2.0.0" From 753fe3b143858d4c6c012c010a9f631dea915d93 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 08/14] Update diffson-circe to 4.6.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d7da81eb..37dcbdc8 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ val fezziwigVersion = "2.0.0" // dependency versions (for tests only) val scalaTestVersion = "3.0.8" val guavaVersion = "33.5.0-jre" -val diffsonVersion = "4.1.1" +val diffsonVersion = "4.6.0" // support non-production release types val betaReleaseType = "beta" From c3916f25f8acc7f49e8351c5615a6dda9cee51fa Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 09/14] Update scala-library to 2.12.20 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 37dcbdc8..53cb9c69 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ lazy val artifactProductionSettings = Seq( Compile / scroogeDisableStrict := true, // scrooge 21.3.0: Builds are now only supported for Scala 2.12+ // https://twitter.github.io/scrooge/changelog.html#id11 - crossScalaVersions := Seq("2.12.18", scalaVersion.value), + crossScalaVersions := Seq("2.12.20", scalaVersion.value), organization := "com.gu", licenses := Seq("Apache v2" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")), resolvers ++= Resolver.sonatypeOssRepos("public"), From 5a3e4a9d41b8fc18f26b471257c0dd14b95b3c22 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 10/14] Update scala-library to 2.13.16 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 53cb9c69..cadc146d 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ val snapshotReleaseSuffix = "-SNAPSHOT" lazy val artifactProductionSettings = Seq( - scalaVersion := "2.13.12", + scalaVersion := "2.13.16", // This old attempt to downgrade scrooge reserved word clashes is now insufficient... https://github.com/twitter/scrooge/issues/259#issuecomment-1900743695 Compile / scroogeDisableStrict := true, // scrooge 21.3.0: Builds are now only supported for Scala 2.12+ From 50e0ed79836e190aaa7206efdcfc2ccd1ed7a240 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 11/14] Update sbt to 1.9.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index abbbce5d..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 From 463b25b5e747e10c762e41113481f115c5f4cc83 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 12/14] Update scalatest to 3.0.9 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index cadc146d..adcb1b88 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ val circeVersion = "0.14.14" val fezziwigVersion = "2.0.0" // dependency versions (for tests only) -val scalaTestVersion = "3.0.8" +val scalaTestVersion = "3.0.9" val guavaVersion = "33.5.0-jre" val diffsonVersion = "4.6.0" From c3a8be46cf47b029f1cae879c2d9267698f07a84 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 13/14] Update sbt-sonatype to 3.12.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4cbe6e59..55ba81bb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5") addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.12.0") From 09bce6ce80ebf96c01e40d3ae04df5b65a4177a0 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-private-repos[bot]" <108460179+gu-scala-steward-private-repos[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 09:38:16 +0000 Subject: [PATCH 14/14] Update sbt-jmh to 0.3.7 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 55ba81bb..8c15f897 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") -addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5") +addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7") addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.12.0") addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "1.6.0")