Skip to content

Commit f649c38

Browse files
committed
Merge remote-tracking branch 'origin/main' into update/gu
# Conflicts: # build.sbt
2 parents aacf4f5 + bd3513a commit f649c38

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ scalacOptions ++= Seq(
6666
)
6767

6868
val jacksonV2Version = "2.22.0"
69-
val circeVersion = "0.14.15"
69+
val circeVersion = "0.14.16"
7070

71-
val awsV2SdkVersion = "2.46.14"
71+
val awsV2SdkVersion = "2.46.17"
7272
val playSecretRotationVersion = "19.0.1"
7373

7474
/*
@@ -88,15 +88,15 @@ val safeTransitiveDependencies = {
8888
"com.fasterxml.jackson.module" %% "jackson-module-scala" % jacksonV2Version,
8989
"tools.jackson.core" % "jackson-core" % jacksonV3Version,
9090
"tools.jackson.core" % "jackson-databind" % jacksonV3Version,
91-
"ch.qos.logback" % "logback-classic" % "1.5.34"
91+
"ch.qos.logback" % "logback-classic" % "1.5.36"
9292
)
9393
}
9494

9595
libraryDependencies ++= Seq(
9696
ws,
9797
"com.fasterxml.jackson.dataformat" % "jackson-dataformat-yaml" % jacksonV2Version,
9898
"org.scanamo" %% "scanamo" % "7.0.0",
99-
"com.beachape" %% "enumeratum" % "1.9.7",
99+
"com.beachape" %% "enumeratum" % "1.9.8",
100100
"com.gu" %% "simple-configuration-ssm" % "12.0.1",
101101
"com.gu.play-secret-rotation" %% "play-v30" % playSecretRotationVersion,
102102
"com.gu.play-secret-rotation" %% "aws-parameterstore-sdk-v2" % playSecretRotationVersion,
@@ -132,7 +132,7 @@ lazy val imageCopier = (project in file("imageCopier"))
132132
JDebPackaging
133133
)
134134
.settings(
135-
scalaVersion := "2.13.16",
135+
scalaVersion := "2.13.18",
136136
Universal / topLevelDirectory := None,
137137
Universal / packageName := normalizedName.value,
138138
libraryDependencies ++= Seq(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.11
1+
sbt.version=1.12.13

0 commit comments

Comments
 (0)