Skip to content

Commit

Permalink
Update to Java 11
Browse files Browse the repository at this point in the history
This satisfies one of the updated requirements of Panda v7 - as of
guardian/pan-domain-authentication#150 it
requires Java 11.

See also:

* guardian/maintaining-scala-projects#3
  • Loading branch information
rtyley committed Sep 18, 2024
1 parent e5d32b6 commit 21ab1fc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v3
with:
java-version: '8'
java-version: '11'
distribution: 'corretto'
cache: 'sbt'

Expand Down
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8
11
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -59,7 +59,7 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala, SbtWeb, JDebPack
"-Dpidfile.path=/dev/null"
),

debianPackageDependencies := Seq("openjdk-8-jre-headless"),
debianPackageDependencies := Seq("java11-runtime-headless"),
maintainer := "digital tools team <digitalcms.dev@guardian.co.uk>",
packageSummary := "tag manager",
packageDescription := """manage tags""",
Expand Down
2 changes: 1 addition & 1 deletion riff-raff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 21ab1fc

Please sign in to comment.