From 112b4f192ebc6382ab7ba61d221c35fdd8797058 Mon Sep 17 00:00:00 2001
From: Roberto Tyley <52038+rtyley@users.noreply.github.com>
Date: Wed, 18 Sep 2024 12:55:27 +0100
Subject: [PATCH] Update to Java 17

This satisfies one of the updated requirements of Panda v7 - as of
https://github.com/guardian/pan-domain-authentication/pull/150 it
requires Java 11.

See also:

* https://github.com/guardian/maintaining-scala-projects/issues/3
* https://github.com/guardian/maintaining-scala-projects/issues/8
---
 .github/workflows/ci.yml | 2 +-
 .java-version            | 2 +-
 build.sbt                | 2 +-
 riff-raff.yaml           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b2ce2e45..22c607f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'corretto'
           cache: 'sbt'
 
diff --git a/.java-version b/.java-version
index 62593409..98d9bcb7 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.8
+17
diff --git a/build.sbt b/build.sbt
index ac7c6553..a227e53b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,7 @@ lazy val scalaVer = "2.12.19"
 resolvers ++= Resolver.sonatypeOssRepos("releases")
 
 scalacOptions ++= Seq(
-  "-target:jvm-1.8",
+  "-release:17",
   "-encoding", "UTF-8",
   "-unchecked",
   "-deprecation",
diff --git a/riff-raff.yaml b/riff-raff.yaml
index a11f9fbd..7163dd29 100644
--- a/riff-raff.yaml
+++ b/riff-raff.yaml
@@ -15,7 +15,7 @@ deployments:
     parameters:
       amiTags:
         BuiltBy: amigo
-        Recipe: editorial-tools-focal-java8-ARM-WITH-cdk-base
+        Recipe: editorial-tools-focal-java17
         AmigoStage: PROD
       amiEncrypted: true
       prependStackToCloudFormationStackName: false