Skip to content

Commit 3688473

Browse files
authored
Merge pull request #981 from guardian/update/non_aws
chore(deps): Non-AWS dependency updates
2 parents e8cd966 + c5948c7 commit 3688473

File tree

6 files changed

+8
-19
lines changed

6 files changed

+8
-19
lines changed

.github/workflows/ci.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ jobs:
2626
cache: 'npm'
2727
cache-dependency-path: 'cdk/package-lock.json'
2828

29-
# Java is needed for the Scala Play app
30-
- name: Set up Java
31-
uses: actions/setup-java@v4
32-
with:
33-
java-version: '11' # TODO read this from the `.java-version` file in the repository
34-
distribution: 'corretto'
29+
- uses: guardian/setup-scala@v1
30+
3531
- run: ./scripts/ci
3632

3733
- uses: guardian/actions-riff-raff@v4

.github/workflows/sbt-dependency-graph.yaml

+1-9
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,7 @@ jobs:
1111
- name: Checkout branch
1212
id: checkout
1313
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
14-
- name: Install Java
15-
id: java
16-
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.2.0
17-
with:
18-
distribution: corretto
19-
java-version: 17
20-
- name: Install sbt
21-
id: sbt
22-
uses: sbt/setup-sbt@50a38cca700907fb9df65ecabcefb85ebaa424a7 # v1.1.4
14+
- uses: guardian/setup-scala@v1
2315
- name: Submit dependencies
2416
id: submit
2517
uses: scalacenter/sbt-dependency-submission@64084844d2b0a9b6c3765f33acde2fbe3f5ae7d3 # v3.1.0

.tool-versions

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
java corretto-11.0.25.9.1

build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ lazy val root = (project in file("."))
6565
"com.fasterxml.jackson.core",
6666
"jackson-databind"
6767
),
68-
// Transient dependency of Play. No newer version of Play 3.0.5 with this vulnerability fixed.
68+
// Transient dependency of Play. No newer version of Play 3.0.6 with this vulnerability fixed.
6969
"ch.qos.logback" % "logback-classic" % "1.5.12",
70-
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.18.1"
70+
"com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.18.2"
7171
),
7272
scalacOptions ++= List(
7373
"-encoding",

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.5
1+
sbt.version=1.10.6

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Comment to get more information during initialization
22
logLevel := Level.Warn
33

4-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5")
4+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6")
55

66
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
77

0 commit comments

Comments
 (0)