From 5d4616b8bd590aa4b9c3fb29a13c208c0073e27f Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Sat, 9 Oct 2021 09:26:27 +0200 Subject: [PATCH] Stop using `adopt` JDK Based on https://github.com/scala/scala3-cross.g8/pull/36#issuecomment-933476500 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4eb4da8..a5284e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.15] - java: [adopt@1.8, adopt@1.11, adopt@1.15] + java: [8, 11, 15] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) diff --git a/build.sbt b/build.sbt index d6df131..bc6412c 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ lazy val root = project crossScalaVersions := scalaVersions ) -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11", "adopt@1.15") +ThisBuild / githubWorkflowJavaVersions := Seq("8", "11", "15") ThisBuild / githubWorkflowScalaVersions := scalaVersions ThisBuild / githubWorkflowBuildPostamble := Seq( // This runs the template with the default parameters, and runs test within the templated app.