Skip to content

Commit

Permalink
Merge pull request #1305 from guardian/update/non_aws
Browse files Browse the repository at this point in the history
chore(deps): Non-AWS dependency updates
  • Loading branch information
waisingyiu authored Sep 18, 2024
2 parents 67bf316 + dfc65af commit 5f8bfcd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ val jacksonCbor: String = "2.17.2"
val jacksonScalaModule: String = "2.17.2"
val simpleConfigurationVersion: String = "1.5.7"
val googleOAuthClient: String = "1.36.0"
val nettyVersion: String = "4.1.112.Final"
val nettyVersion: String = "4.1.113.Final"
val slf4jVersion: String = "1.7.36"
val logbackVersion: String = "1.5.7"
val logbackVersion: String = "1.5.8"

val standardSettings = Seq[Setting[_]](
// We should remove this when all transitive dependencies use the same version of scala-xml
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
/*
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.19, which has itself upgraded to `scala-xml` 2.1.0
library. sbt 1.8.0 has upgraded to Scala 2.12.20, 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 ),
Expand Down

0 comments on commit 5f8bfcd

Please sign in to comment.