diff --git a/build.sbt b/build.sbt index 7558160b8..77a648cac 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd} val projectVersion = "1.0-latest" organization := "com.gu" -ThisBuild / scalaVersion := "2.13.12" +ThisBuild / scalaVersion := "2.13.13" val compilerOptions = Seq( "-deprecation", @@ -25,7 +25,7 @@ val awsSdkVersion: String = "1.12.662" val doobieVersion: String = "0.13.4" val catsVersion: String = "2.10.0" val okHttpVersion: String = "4.12.0" -val paClientVersion: String = "7.0.8" +val paClientVersion: String = "7.0.9" val apacheThrift: String = "0.15.0" val jacksonDatabind: String = "2.16.1" val jacksonCbor: String = "2.16.1" @@ -34,7 +34,7 @@ val simpleConfigurationVersion: String = "1.5.7" val googleOAuthClient: String = "1.35.0" val nettyVersion: String = "4.1.107.Final" val slf4jVersion: String = "1.7.36" -val logbackVersion: String = "1.5.0" +val logbackVersion: String = "1.5.1" val standardSettings = Seq[Setting[_]]( // We should remove this when all transitive dependencies use the same version of scala-xml @@ -108,7 +108,7 @@ lazy val common = project "io.netty" % "netty-codec-http" % nettyVersion, "io.netty" % "netty-codec-http2" % nettyVersion, "io.netty" % "netty-common" % nettyVersion, - "org.postgresql" % "postgresql" % "42.7.1", + "org.postgresql" % "postgresql" % "42.7.2", "ch.qos.logback" % "logback-core" % logbackVersion, "ch.qos.logback" % "logback-classic" % logbackVersion, ), @@ -307,7 +307,7 @@ lazy val football = lambda("football", "football") libraryDependencies ++= Seq( "org.scanamo" %% "scanamo" % "1.0.0-M12-1", "org.scanamo" %% "scanamo-testkit" % "1.0.0-M12-1" % "test", - "com.gu" %% "content-api-client-default" % "20.0.2", + "com.gu" %% "content-api-client-default" % "22.0.0", "com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion, "com.gu" %% "pa-client" % paClientVersion, "com.squareup.okhttp3" % "okhttp" % okHttpVersion, diff --git a/project/build.properties b/project/build.properties index abbbce5da..04267b14a 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 04aa92e54..69640b691 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -28,7 +28,7 @@ addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.10.0-RC1") /* Without setting VersionScheme.Always here on `scala-xml`, sbt 1.8.0 will raise fatal 'version conflict' errors when used with sbt plugins like `sbt-native-packager`, which currently use sort-of-incompatible versions of the `scala-xml` - library. sbt 1.8.0 has upgraded to Scala 2.12.18, which has itself upgraded to `scala-xml` 2.1.0 + library. sbt 1.8.0 has upgraded to Scala 2.12.19, which has itself upgraded to `scala-xml` 2.1.0 (see https://github.com/sbt/sbt/releases/tag/v1.8.0), but `sbt-native-packager` is currently using `scala-xml` 1.1.1, and the `scala-xml` library declares that it uses specifically 'early-semver' version compatibility (see https://www.scala-lang.org/blog/2021/02/16/preventing-version-conflicts-with-versionscheme.html#versionscheme-librarydependencyschemes-and-sbt-150 ),