diff --git a/build.sbt b/build.sbt index 8d4e9dee..f5617c76 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -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"), @@ -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 ) 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index 3ba8af9c..9d1beb9e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")