Skip to content

Commit

Permalink
Merge pull request #1407 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
akash1810 authored Jan 2, 2025
2 parents 4d566e4 + e23b8b6 commit fdb5324
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ a538fda77c86a371c80891851432d7fca3aa78cc

# Scala Steward: Reformat with scalafmt 3.8.2
c3c7edb40313eecefe157f89e4f218d269c16d0a

# Scala Steward: Reformat with scalafmt 3.8.3
80662885638c62108ba5c88640f4890b9fc67fb8
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.2
version = 3.8.3

runner.dialect = scala213
maxColumn = 80
2 changes: 1 addition & 1 deletion magenta-lib/src/main/scala/magenta/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ object `package` extends Loggable {
/** This can be used when you have high confidence it will never be reached.
* An example might be exhaustive cases in a match statement.
*/
def `wtf?` : Nothing = throw new IllegalStateException("WTF?")
def `wtf?`: Nothing = throw new IllegalStateException("WTF?")
}
30 changes: 15 additions & 15 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ object Dependencies {

object Versions {
val aws = "2.29.40"
val jackson = "2.17.2"
val jackson = "2.17.3"
val awsRds = "1.12.780"
val enumeratumPlay = "1.8.1"
val enumeratumPlay = "1.8.2"
}

// https://github.com/orgs/playframework/discussions/11222
Expand Down Expand Up @@ -49,8 +49,8 @@ object Dependencies {
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % Versions.jackson,
"com.beachape" %% "enumeratum-play-json" % Versions.enumeratumPlay,
"com.google.apis" % "google-api-services-deploymentmanager" % "v2-rev20241122-2.0.0",
"com.google.cloud" % "google-cloud-storage" % "2.40.1",
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
"com.google.cloud" % "google-cloud-storage" % "2.46.0",
"org.scala-lang.modules" %% "scala-parallel-collections" % "1.1.0"
).map((m: ModuleID) =>
// don't even ask why I need to do this
m.excludeAll(
Expand All @@ -65,33 +65,33 @@ object Dependencies {
commonDeps ++ jacksonOverrides ++ Seq(
evolutions,
jdbc,
"com.gu.play-googleauth" %% "play-v30" % "10.0.1",
"com.gu.play-secret-rotation" %% "play-v30" % "8.4.5",
"com.gu.play-secret-rotation" %% "aws-parameterstore-sdk-v2" % "8.4.5",
"com.gu.play-googleauth" %% "play-v30" % "17.1.0",
"com.gu.play-secret-rotation" %% "play-v30" % "13.1.1",
"com.gu.play-secret-rotation" %% "aws-parameterstore-sdk-v2" % "13.1.1",
"org.pegdown" % "pegdown" % "1.6.0",
"com.adrianhurt" %% "play-bootstrap" % "1.6.1-P28-B3", // scala-steward:off,
"org.scanamo" %% "scanamo" % "1.1.1",
"org.scanamo" %% "scanamo" % "3.0.0",
"software.amazon.awssdk" % "dynamodb" % Versions.aws,
"software.amazon.awssdk" % "sns" % Versions.aws,
"org.quartz-scheduler" % "quartz" % "2.3.2",
"org.quartz-scheduler" % "quartz" % "2.5.0",
"com.gu" %% "anghammarad-client" % "4.0.0",
"org.webjars" %% "webjars-play" % "3.0.1",
"org.webjars" %% "webjars-play" % "3.0.2",
"org.webjars" % "jquery" % "3.7.1",
"org.webjars" % "jquery-ui" % "1.13.3",
"org.webjars" % "jquery-ui" % "1.14.1",
"org.webjars" % "bootstrap" % "3.4.1", // scala-steward:off
"org.webjars" % "jasny-bootstrap" % "3.1.3-2", // scala-steward:off
"org.webjars" % "momentjs" % "2.30.1",
"net.logstash.logback" % "logstash-logback-encoder" % "7.4",
"net.logstash.logback" % "logstash-logback-encoder" % "8.0",
"org.scalikejdbc" %% "scalikejdbc" % "3.5.0", // scala-steward:off
"org.postgresql" % "postgresql" % "42.7.3",
"org.postgresql" % "postgresql" % "42.7.4",
"com.beachape" %% "enumeratum-play" % Versions.enumeratumPlay,
filters,
ws,
"org.apache.pekko" %% "pekko-testkit" % "1.0.2" % Test,
"org.apache.pekko" %% "pekko-testkit" % "1.0.3" % Test,
"com.amazonaws" % "aws-java-sdk-rds" % Versions.awsRds,
"org.scala-stm" %% "scala-stm" % "0.11.1",
// Play 3.0 currently uses logback-classic 1.4.11 which is vulnerable to CVE-2023-45960
"ch.qos.logback" % "logback-classic" % "1.5.6"
"ch.qos.logback" % "logback-classic" % "1.5.15"
).map((m: ModuleID) =>
// don't even ask why I need to do this
m.excludeAll(
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.10.1
sbt.version=1.10.7
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// keep in sync with the play version in Dependencies
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6")

addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.0.1")

Expand All @@ -8,8 +8,8 @@ addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.0.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2") // scala-steward:off
addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.0.0")

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

Expand Down

0 comments on commit fdb5324

Please sign in to comment.