diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4919b23327..8740ddae2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,25 +29,25 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12, 2.13, 3] - java: [temurin@8, temurin@17, graalvm@17] + java: [temurin@8, temurin@17, graalvm@21] project: [catsNative, catsJS, catsJVM] exclude: - scala: 2.12 java: temurin@17 - scala: 2.12 - java: graalvm@17 + java: graalvm@21 - scala: 3 java: temurin@17 - scala: 3 - java: graalvm@17 + java: graalvm@21 - project: catsNative java: temurin@17 - project: catsNative - java: graalvm@17 + java: graalvm@21 - project: catsJS java: temurin@17 - project: catsJS - java: graalvm@17 + java: graalvm@21 runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: @@ -85,17 +85,17 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (graalvm@17) - id: setup-java-graalvm-17 - if: matrix.java == 'graalvm@17' + - name: Setup Java (graalvm@21) + id: setup-java-graalvm-21 + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v4 with: distribution: graalvm - java-version: 17 + java-version: 21 cache: sbt - name: sbt update - if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' + if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false' run: sbt +update - name: Check that workflows are up to date @@ -183,17 +183,17 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (graalvm@17) - id: setup-java-graalvm-17 - if: matrix.java == 'graalvm@17' + - name: Setup Java (graalvm@21) + id: setup-java-graalvm-21 + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v4 with: distribution: graalvm - java-version: 17 + java-version: 21 cache: sbt - name: sbt update - if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' + if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false' run: sbt +update - name: Download target directories (2.12, catsNative) @@ -353,17 +353,17 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (graalvm@17) - id: setup-java-graalvm-17 - if: matrix.java == 'graalvm@17' + - name: Setup Java (graalvm@21) + id: setup-java-graalvm-21 + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v4 with: distribution: graalvm - java-version: 17 + java-version: 21 cache: sbt - name: sbt update - if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' + if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false' run: sbt +update - name: Submit Dependencies @@ -439,17 +439,17 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (graalvm@17) - id: setup-java-graalvm-17 - if: matrix.java == 'graalvm@17' + - name: Setup Java (graalvm@21) + id: setup-java-graalvm-21 + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v4 with: distribution: graalvm - java-version: 17 + java-version: 21 cache: sbt - name: sbt update - if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' + if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false' run: sbt +update - name: Generate site @@ -505,17 +505,17 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup Java (graalvm@17) - id: setup-java-graalvm-17 - if: matrix.java == 'graalvm@17' + - name: Setup Java (graalvm@21) + id: setup-java-graalvm-21 + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v4 with: distribution: graalvm - java-version: 17 + java-version: 21 cache: sbt - name: sbt update - if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false' + if: matrix.java == 'graalvm@21' && steps.setup-java-graalvm-21.outputs.cache-hit == 'false' run: sbt +update - name: Scalafix tests diff --git a/build.sbt b/build.sbt index 44fc00755c..8dfba21b7e 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ val munitVersion = "1.0.2" val PrimaryJava = JavaSpec.temurin("8") val LTSJava = JavaSpec.temurin("17") -val GraalVM = JavaSpec.graalvm("17") +val GraalVM = JavaSpec.graalvm("21") ThisBuild / githubWorkflowJavaVersions := Seq(PrimaryJava, LTSJava, GraalVM)