From 70e188cd888fc29a32385132661e30f4689ebb9a Mon Sep 17 00:00:00 2001
From: Roberto Tyley <roberto.tyley@gmail.com>
Date: Wed, 26 Jun 2024 12:10:32 +0100
Subject: [PATCH] Updates and fixup for latest
 gha-scala-library-release-workflow

In particular, updating config for:

* https://github.com/guardian/gha-scala-library-release-workflow/pull/23 - Sonatype token authentication
---
 .github/workflows/ci.yml      | 6 +++---
 .github/workflows/release.yml | 6 +++---
 build.sbt                     | 6 +++---
 project/build.properties      | 2 +-
 project/plugins.sbt           | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bad3385..19c186a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,12 +14,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 17 # Currently Java 17 required by `s3mock-testcontainers`
+          java-version: 21 # Currently Java 17 required by `s3mock-testcontainers`
           cache: sbt
       - name: Build and Test
         run: sbt -v +test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 87dd887..fe7671c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,12 +5,12 @@ on:
 
 jobs:
   release:
-    uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@use-sonatype-token-rather-than-username-password-auth
+    uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@main
     permissions: { contents: write, pull-requests: write }
     with:
       SONATYPE_PROFILE_NAME: 'com.madgag'
       SONATYPE_CREDENTIAL_HOST: 's01.oss.sonatype.org'
     secrets:
-      SONATYPE_TOKEN_USERNAME: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN_USERNAME }}
-      SONATYPE_TOKEN_PASSWORD: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN_PASSWORD }}
+      SONATYPE_TOKEN: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN }}
       PGP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_PGP_SECRET }}
+      GITHUB_APP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_GITHUB_APP_PRIVATE_KEY }}
diff --git a/build.sbt b/build.sbt
index b2af9ad..b9572f1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,11 +1,11 @@
 import ReleaseTransformations.*
 import sbtversionpolicy.withsbtrelease.ReleaseVersion
 
-ThisBuild / scalaVersion := "2.13.12"
+ThisBuild / scalaVersion := "2.13.14"
 ThisBuild / crossScalaVersions := Seq(
   scalaVersion.value,
-  "3.3.1",
-  "2.12.18"
+  "3.3.3",
+  "2.12.19"
 )
 ThisBuild / scalacOptions := Seq("-deprecation", "-release:11")
 
diff --git a/project/build.properties b/project/build.properties
index 0aa5c39..be54e77 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.8
+sbt.version = 1.10.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4e0d834..3b90c84 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0")
 
-addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.0")
\ No newline at end of file
+addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
\ No newline at end of file