Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Non-AWS dependency updates #252

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ 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 = "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 circeVersion = "0.14.1"
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"

// dependency versions (for tests only)
val scalaTestVersion = "3.0.8"
val scalaTestVersion = "3.0.9"
val guavaVersion = "19.0"
val diffsonVersion = "4.1.1"
val diffsonVersion = "4.6.0"

// support non-production release types
val betaReleaseType = "beta"
Expand All @@ -25,12 +25,12 @@ 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+
// 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"),
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
12 changes: 6 additions & 6 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.5")
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.7")

addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.1.0")
addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "1.6.0")
addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "22.12.0")
addSbtPlugin("com.gu" % "sbt-scrooge-typescript" % "3.0.3")
Loading