From 843ad45c096db3f023cf9a51a7d66d920074321b Mon Sep 17 00:00:00 2001 From: Andrew Nowak Date: Tue, 14 Jan 2025 15:06:18 +0000 Subject: [PATCH 1/2] upgrade to java 17 --- .github/workflows/ci.yml | 2 +- .java-version | 2 +- build.sbt | 2 +- riff-raff.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec7c29306c..62eee8003e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '17' distribution: 'corretto' cache: 'sbt' - name: SBT diff --git a/.java-version b/.java-version index b4de394767..98d9bcb75a 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -11 +17 diff --git a/build.sbt b/build.sbt index 6347225820..31f90328ec 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ val commonSettings = Seq( description := "grid", organization := "com.gu", version := "0.1", - scalacOptions ++= Seq("-feature", "-deprecation", "-language:higherKinds", "-Xfatal-warnings", "-release:11"), + scalacOptions ++= Seq("-feature", "-deprecation", "-language:higherKinds", "-Xfatal-warnings", "-release:17"), // The Java SDK uses CBOR protocol // We use localstack in TEST. Kinesis in localstack uses kinesislite which requires CBOR to be disabled diff --git a/riff-raff.yaml b/riff-raff.yaml index bc0412d9b8..4b42ac6ccc 100644 --- a/riff-raff.yaml +++ b/riff-raff.yaml @@ -89,11 +89,11 @@ deployments: AmiId: BuiltBy: amigo AmigoStage: PROD - Recipe: editorial-tools-focal-java11-ARM-WITH-cdk-base + Recipe: editorial-tools-focal-java17 ImagingAmiId: BuiltBy: amigo AmigoStage: PROD - Recipe: grid-imaging-java11-ARM + Recipe: grid-imaging-java17-ARM ImgOpsAmiId: BuiltBy: amigo AmigoStage: PROD From 08b73aa89e142123625eb58b99abca840d422ff6 Mon Sep 17 00:00:00 2001 From: Andrew Nowak Date: Tue, 14 Jan 2025 15:25:40 +0000 Subject: [PATCH 2/2] try without updating -release param --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 31f90328ec..6347225820 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ val commonSettings = Seq( description := "grid", organization := "com.gu", version := "0.1", - scalacOptions ++= Seq("-feature", "-deprecation", "-language:higherKinds", "-Xfatal-warnings", "-release:17"), + scalacOptions ++= Seq("-feature", "-deprecation", "-language:higherKinds", "-Xfatal-warnings", "-release:11"), // The Java SDK uses CBOR protocol // We use localstack in TEST. Kinesis in localstack uses kinesislite which requires CBOR to be disabled