From 4ad58b32e3925742064342f7c088fd670f65ef68 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:02:22 +0000 Subject: [PATCH 1/5] Update jackson-module-scala to 2.18.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8ea58c0e..71bf893a 100644 --- a/build.sbt +++ b/build.sbt @@ -67,7 +67,7 @@ lazy val root = (project in file(".")) ), // Transient dependency of Play. No newer version of Play 3.0.5 with this vulnerability fixed. "ch.qos.logback" % "logback-classic" % "1.5.12", - "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.18.1" + "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.18.2" ), scalacOptions ++= List( "-encoding", From 0ee40e30c501faf9190a06779048272ab3bea609 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:02:23 +0000 Subject: [PATCH 2/5] Update play-ahc-ws to 3.0.6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 71bf893a..87b2e628 100644 --- a/build.sbt +++ b/build.sbt @@ -65,7 +65,7 @@ lazy val root = (project in file(".")) "com.fasterxml.jackson.core", "jackson-databind" ), - // Transient dependency of Play. No newer version of Play 3.0.5 with this vulnerability fixed. + // Transient dependency of Play. No newer version of Play 3.0.6 with this vulnerability fixed. "ch.qos.logback" % "logback-classic" % "1.5.12", "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.18.2" ), From 05d372b1b8d9c9760e8586eb21fb580fe45cfd58 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:02:24 +0000 Subject: [PATCH 3/5] Update sbt-plugin to 3.0.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e868addc..7fe3f16d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ // Comment to get more information during initialization logLevel := Level.Warn -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.5") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.6") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") From 3ae2c6b712656d670ae917df4032df01005fff36 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:02:25 +0000 Subject: [PATCH 4/5] Update sbt to 1.10.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index db1723b0..e88a0d81 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6 From c5948c7f21825d704a81fceafdfc1c3deb0ff9fc Mon Sep 17 00:00:00 2001 From: akash1810 Date: Mon, 16 Dec 2024 16:47:34 +0000 Subject: [PATCH 5/5] ci: Use `guardian/setup-scala` GitHub Action This action will provide Java and SBT to the runner. This is a mitigation against the incoming changes from GitHub where the `ubuntu-latest` runner will stop providing `sbt` by default. See: - https://github.com/guardian/setup-scala - https://github.blog/changelog/2024-11-05-notice-of-breaking-changes-for-github-actions/ - https://github.com/actions/runner-images#10636 --- .github/workflows/ci.yml | 8 ++------ .github/workflows/sbt-dependency-graph.yaml | 10 +--------- .tool-versions | 1 + 3 files changed, 4 insertions(+), 15 deletions(-) create mode 100644 .tool-versions diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71d9ef5c..a48f428d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,12 +26,8 @@ jobs: cache: 'npm' cache-dependency-path: 'cdk/package-lock.json' - # Java is needed for the Scala Play app - - name: Set up Java - uses: actions/setup-java@v4 - with: - java-version: '11' # TODO read this from the `.java-version` file in the repository - distribution: 'corretto' + - uses: guardian/setup-scala@v1 + - run: ./scripts/ci - uses: guardian/actions-riff-raff@v4 diff --git a/.github/workflows/sbt-dependency-graph.yaml b/.github/workflows/sbt-dependency-graph.yaml index acb125d6..07f19595 100644 --- a/.github/workflows/sbt-dependency-graph.yaml +++ b/.github/workflows/sbt-dependency-graph.yaml @@ -11,15 +11,7 @@ jobs: - name: Checkout branch id: checkout uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - - name: Install Java - id: java - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.2.0 - with: - distribution: corretto - java-version: 17 - - name: Install sbt - id: sbt - uses: sbt/setup-sbt@50a38cca700907fb9df65ecabcefb85ebaa424a7 # v1.1.4 + - uses: guardian/setup-scala@v1 - name: Submit dependencies id: submit uses: scalacenter/sbt-dependency-submission@64084844d2b0a9b6c3765f33acde2fbe3f5ae7d3 # v3.1.0 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 00000000..58dcdfd2 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +java corretto-11.0.25.9.1