Skip to content

Commit 60227ca

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/cdk/ts-node-10.9.2
2 parents 4109f07 + 3aa527a commit 60227ca

7 files changed

Lines changed: 181 additions & 123 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
release:
8-
uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@main
8+
uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@v1
99
permissions: { contents: write, pull-requests: write }
1010
secrets:
1111
SONATYPE_TOKEN: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN }}

build.sbt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ val catsVersion: String = "2.13.0"
4242
val okHttpVersion: String = "4.12.0"
4343
val paClientVersion: String = "7.0.12"
4444
val apacheThrift: String = "0.15.0"
45-
val jacksonDatabind: String = "2.18.3"
46-
val jacksonCbor: String = "2.18.3"
47-
val jacksonScalaModule: String = "2.18.3"
45+
val jacksonDatabind: String = "2.18.4"
46+
val jacksonCbor: String = "2.18.4"
47+
val jacksonScalaModule: String = "2.18.4"
4848
val simpleConfigurationVersion: String = "1.5.7"
4949
val googleOAuthClient: String = "1.39.0"
50-
val nettyVersion: String = "4.1.119.Final"
50+
val nettyVersion: String = "4.1.121.Final"
5151
val slf4jVersion: String = "1.7.36"
5252
val logbackVersion: String = "1.5.18"
5353

@@ -253,12 +253,12 @@ def lambda(projectName: String, directoryName: String, mainClassName: Option[Str
253253
"snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
254254
),
255255
libraryDependencies ++= Seq(
256-
"com.amazonaws" % "aws-lambda-java-core" % "1.2.3",
256+
"com.amazonaws" % "aws-lambda-java-core" % "1.3.0",
257257
"org.slf4j" % "slf4j-api" % slf4jVersion,
258258
"com.gu" %% "simple-configuration-core" % simpleConfigurationVersion,
259259
"com.gu" %% "simple-configuration-ssm" % simpleConfigurationVersion,
260260
"ch.qos.logback" % "logback-classic" % logbackVersion,
261-
"net.logstash.logback" % "logstash-logback-encoder" % "8.0",
261+
"net.logstash.logback" % "logstash-logback-encoder" % "8.1",
262262
specs2 % Test
263263
),
264264
assemblyJarName := s"$projectName.jar",
@@ -305,7 +305,7 @@ lazy val football = lambda("football", "football")
305305
libraryDependencies ++= Seq(
306306
"org.scanamo" %% "scanamo" % "1.0.0-M12-1",
307307
"org.scanamo" %% "scanamo-testkit" % "1.0.0-M12-1" % "test",
308-
"com.gu" %% "content-api-client-default" % "34.1.0",
308+
"com.gu" %% "content-api-client-default" % "34.1.1",
309309
"com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion,
310310
"com.gu" %% "pa-client" % paClientVersion,
311311
"com.squareup.okhttp3" % "okhttp" % okHttpVersion,
@@ -412,8 +412,8 @@ lazy val notificationworkerlambda = lambda("notificationworkerlambda", "notifica
412412
libraryDependencies ++= Seq(
413413
"com.turo" % "pushy" % "0.13.10",
414414
"com.google.firebase" % "firebase-admin" % "9.2.0",
415-
"com.google.protobuf" % "protobuf-java" % "4.30.2",
416-
"com.google.protobuf" % "protobuf-java-util" % "4.30.2",
415+
"com.google.protobuf" % "protobuf-java" % "4.31.0",
416+
"com.google.protobuf" % "protobuf-java-util" % "4.31.0",
417417
"com.amazonaws" % "aws-lambda-java-events" % "2.2.9",
418418
"com.amazonaws" % "aws-java-sdk-sqs" % awsSdkVersion,
419419
"com.amazonaws" % "aws-java-sdk-s3" % awsSdkVersion,

cdk/package-lock.json

Lines changed: 79 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"@guardian/eslint-config-typescript": "1.0.1",
1616
"@guardian/prettier": "1.0.0",
1717
"@types/jest": "^29.5.12",
18-
"@types/node": "17.0.42",
18+
"@types/node": "22.15.29",
1919
"aws-cdk": "^2.178.1",
2020
"aws-cdk-lib": "^2.185.0",
2121
"constructs": "^10.0.0",
2222
"eslint": "^8.16.0",
2323
"jest": "^29.7",
2424
"prettier": "^2.7.0",
2525
"source-map-support": "^0.5.20",
26-
"ts-jest": "^29.2.3",
26+
"ts-jest": "^29.3.4",
2727
"ts-node": "^10.9.2",
2828
"typescript": "~4.7.2"
2929
},

0 commit comments

Comments
 (0)