Skip to content

Commit

Permalink
Merge pull request #1557 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 Nov 7, 2024
2 parents bfd07e1 + a3bb518 commit 7b3f112
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
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
22 changes: 11 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import java.time.{ZoneId, ZonedDateTime}

name := "amigo"
version := "1.0-latest"
scalaVersion := "2.13.14"
scalaVersion := "2.13.15"

Universal / javaOptions ++= Seq(
s"-Dpidfile.path=/dev/null",
Expand Down Expand Up @@ -73,8 +73,8 @@ scalacOptions ++= Seq(
"-Xfatal-warnings"
)

val jacksonVersion = "2.17.2"
val circeVersion = "0.14.9"
val jacksonVersion = "2.18.0"
val circeVersion = "0.14.10"

// These can live in the same codebase, see: https://aws.amazon.com/blogs/developer/aws-sdk-for-java-2-x-released/
val awsV1SdkVersion = "1.12.777"
Expand All @@ -86,13 +86,13 @@ libraryDependencies ++= Seq(
"com.fasterxml.jackson.core" % "jackson-databind" % jacksonVersion,
"com.fasterxml.jackson.core" % "jackson-annotations" % jacksonVersion,
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonVersion,
"org.scanamo" %% "scanamo" % "1.1.1",
"org.scanamo" %% "scanamo" % "2.0.0",
"com.beachape" %% "enumeratum" % "1.7.4",
"org.apache.pekko" %% "pekko-actor-typed" % "1.0.2",
"org.apache.pekko" %% "pekko-actor-typed" % "1.0.3",
"com.gu" %% "simple-configuration-ssm" % "2.0.0",
"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" % "8.0.4",
"com.gu.play-secret-rotation" %% "play-v30" % "11.2.0",
"com.gu.play-secret-rotation" %% "aws-parameterstore-sdk-v2" % "11.2.0",
"com.gu.play-googleauth" %% "play-v30" % "13.2.0",
// Pin play-bootstrap because it is tied to the bootstrap version
"com.adrianhurt" %% "play-bootstrap" % "1.6.1-P28-B3", // scala-steward:off
"org.quartz-scheduler" % "quartz" % "2.3.2",
Expand All @@ -102,9 +102,9 @@ libraryDependencies ++= Seq(
"com.amazonaws" % "aws-java-sdk-dynamodb" % awsV1SdkVersion,
"com.amazonaws" % "aws-java-sdk-sts" % awsV1SdkVersion,
"com.amazonaws" % "aws-java-sdk-kinesis" % awsV1SdkVersion,
"net.logstash.logback" % "logstash-logback-encoder" % "7.4",
"net.logstash.logback" % "logstash-logback-encoder" % "8.0",
// Transient dependency of Play. No newer version of Play with this vulnerability fixed.
"ch.qos.logback" % "logback-classic" % "1.5.6",
"ch.qos.logback" % "logback-classic" % "1.5.8",
"software.amazon.awssdk" % "dynamodb" % awsV2SdkVersion,
"software.amazon.awssdk" % "auth" % awsV2SdkVersion,
"software.amazon.awssdk" % "regions" % awsV2SdkVersion,
Expand All @@ -120,7 +120,7 @@ routesImport += "models._"
lazy val imageCopier = (project in file("imageCopier"))
.enablePlugins(JavaAppPackaging)
.settings(
scalaVersion := "2.13.14",
scalaVersion := "2.13.15",
Universal / topLevelDirectory := None,
Universal / packageName := normalizedName.value,
libraryDependencies ++= Seq(
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.2
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.4")
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")

// sbt-native-packager cannot be updated to >1.9.9 until Play supports scala-xml 2
addSbtPlugin(
"com.github.sbt" % "sbt-native-packager" % "1.10.0"
"com.github.sbt" % "sbt-native-packager" % "1.10.4"
) // scala-steward:off
addSbtPlugin("com.gu" % "sbt-riffraff-artifact" % "1.1.18")
libraryDependencies += "org.vafer" % "jdeb" % "1.10" artifacts Artifact(
libraryDependencies += "org.vafer" % "jdeb" % "1.11" artifacts Artifact(
"jdeb",
"jar",
"jar"
Expand Down

0 comments on commit 7b3f112

Please sign in to comment.