From 8a075db29654be20572055ab1527753e648158c3 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 11 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 --- .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..eb1fb630 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: '11' distribution: 'corretto' cache: 'sbt' diff --git a/.java-version b/.java-version index 62593409..b4de3947 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 +11 diff --git a/build.sbt b/build.sbt index ac7c6553..d713242f 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:11", "-encoding", "UTF-8", "-unchecked", "-deprecation", diff --git a/riff-raff.yaml b/riff-raff.yaml index a11f9fbd..7ffe8b47 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-java11-ARM-WITH-cdk-base AmigoStage: PROD amiEncrypted: true prependStackToCloudFormationStackName: false