From 118513bc2cbb7856c4fd70de2e53bbe0623361ce 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 01/17] 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 547fe22d6fd4b987da1b9b03eb71c20af78f726e 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 02/17] 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 7e895d079fc975da2a144a03595a12f937d136e6 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 03/17] Update guava to 33.3.0-jre --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8d4e9dee..e1aba6a1 100644 --- a/build.sbt +++ b/build.sbt @@ -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.3.0-jre", Jmh / javaOptions ++= Seq("-server", "-Xms4G", "-Xmx4G", "-XX:+UseG1GC", "-XX:-UseBiasedLocking"), publishArtifact := false ) From 822510d3443b2845504c8910cee57130459096b8 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 04/17] Update content-atom-model-thrift to 6.0.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e1aba6a1..e2eb7109 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions val contentEntityVersion = "3.0.3" -val contentAtomVersion = "4.0.4" +val contentAtomVersion = "6.0.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" val scroogeVersion = "22.1.0" // update plugins too if this version changes From d52d1eec7f4fa0aaa0fefa17b46a02f5dd578203 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 05/17] Update content-entity-thrift to 4.0.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e2eb7109..7d75701c 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import sbtrelease.ReleaseStateTransformations.* import sbtversionpolicy.withsbtrelease.ReleaseVersion // dependency versions -val contentEntityVersion = "3.0.3" +val contentEntityVersion = "4.0.0" val contentAtomVersion = "6.0.0" val storyPackageVersion = "2.2.0" val thriftVersion = "0.15.0" From cb5a9c13c19dd41d0ea7597cb50c4f4b522546fa 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 06/17] Update sbt-scrooge-typescript to 3.0.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8cbeb9ec..4a0cd089 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ 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.gu" % "sbt-scrooge-typescript" % "1.6.0") +addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "3.0.3") From a0b67f0b427270b420d26bff90c0d3f7eb6d66bc 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 07/17] 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 7d75701c..3afec60a 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ val contentEntityVersion = "4.0.0" val contentAtomVersion = "6.0.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 dce5457bb362361b5153ee51230fe9892e8eda2e 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 08/17] 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 4a0cd089..ea93b368 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" % "3.0.3") From 1de6910d0e82aa06285f9c2535614517e6ae2918 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 09/17] Update circe-core to 0.14.10 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3afec60a..ee61d38d 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ val contentAtomVersion = "6.0.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.10" val fezziwigVersion = "2.0.0" // dependency versions (for tests only) From bbaf7463dd027197bc6aa1fe40f3c8db7d79872f 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: Fri, 6 Sep 2024 15:55:13 +0000 Subject: [PATCH 10/17] Update libthrift to 0.20.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ee61d38d..fe34b6de 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import sbtversionpolicy.withsbtrelease.ReleaseVersion val contentEntityVersion = "4.0.0" val contentAtomVersion = "6.0.0" val storyPackageVersion = "2.2.0" -val thriftVersion = "0.15.0" +val thriftVersion = "0.20.0" val scroogeVersion = "22.12.0" // update plugins too if this version changes val circeVersion = "0.14.10" val fezziwigVersion = "2.0.0" From 71ce8bbc52d37bddf74be54d6b28c6b559989f6a 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 11/17] 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 fe34b6de..10c974ea 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 = "19.0" -val diffsonVersion = "4.1.1" +val diffsonVersion = "4.6.0" // support non-production release types val betaReleaseType = "beta" From 9264cc9cb69623f8d936591c155fc9db3b4340fb 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 12/17] 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 10c974ea..9d06bd20 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 b213d8fac27c9ee6c9360d540ff0b8681410327e 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 13/17] Update scala-library to 2.13.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9d06bd20..1cb948d1 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.14", // 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 64715b4ae94cf6dcee4184770fc176bcd20bdb56 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 14/17] 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 5a37f27a423055eab8548f4a8a95759eb293e3e4 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 15/17] 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 1cb948d1..f5617c76 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ val circeVersion = "0.14.10" val fezziwigVersion = "2.0.0" // dependency versions (for tests only) -val scalaTestVersion = "3.0.8" +val scalaTestVersion = "3.0.9" val guavaVersion = "19.0" val diffsonVersion = "4.6.0" From aa3a0d3dd7a5f2527cdb8e7a9a1f66aeb36b3dc9 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 16/17] Update sbt-sonatype to 3.11.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index ea93b368..af8a76c1 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.11.3") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5") addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.12.0") From 6b926a8778e6df47f70b6656a05730ec17dc0d57 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: Fri, 6 Sep 2024 15:55:14 +0000 Subject: [PATCH 17/17] 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 af8a76c1..9d1beb9e 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.11.3") -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" % "3.0.3")