From df7190091609cde602211e211bc1b62026f7f137 Mon Sep 17 00:00:00 2001 From: Patryk Kowalcze Date: Fri, 13 Oct 2023 10:35:34 +0200 Subject: [PATCH] use graalvm 21 --- .github/workflows/ci.yml | 26 +++++++++++++------------- build.sbt | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec404dbe..9fd65128 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.12] - java: [graalvm@20] + java: [graalvm@21] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -37,16 +37,16 @@ jobs: with: fetch-depth: 0 - - name: Download Java (graalvm@20) + - name: Download Java (graalvm@21) id: download-java-graalvm-20 - if: matrix.java == 'graalvm@20' + if: matrix.java == 'graalvm@21' uses: typelevel/download-java@v2 with: distribution: graalvm java-version: 20 - - name: Setup Java (graalvm@20) - if: matrix.java == 'graalvm@20' + - name: Setup Java (graalvm@21) + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v3 with: distribution: jdkfile @@ -69,18 +69,18 @@ jobs: run: sbt githubWorkflowCheck - name: Check headers and formatting - if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck - name: Test run: sbt '++ ${{ matrix.scala }}' test - name: Check binary compatibility - if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues - name: Generate API documentation - if: matrix.java == 'graalvm@20' && matrix.os == 'ubuntu-latest' + if: matrix.java == 'graalvm@21' && matrix.os == 'ubuntu-latest' run: sbt '++ ${{ matrix.scala }}' doc - name: Integration tests @@ -108,7 +108,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [graalvm@20] + java: [graalvm@21] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -116,16 +116,16 @@ jobs: with: fetch-depth: 0 - - name: Download Java (graalvm@20) + - name: Download Java (graalvm@21) id: download-java-graalvm-20 - if: matrix.java == 'graalvm@20' + if: matrix.java == 'graalvm@21' uses: typelevel/download-java@v2 with: distribution: graalvm java-version: 20 - - name: Setup Java (graalvm@20) - if: matrix.java == 'graalvm@20' + - name: Setup Java (graalvm@21) + if: matrix.java == 'graalvm@21' uses: actions/setup-java@v3 with: distribution: jdkfile diff --git a/build.sbt b/build.sbt index b39dc494..fc5708eb 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ ThisBuild / versionScheme := Some("early-semver") ThisBuild / homepage := Some(url("https://github.com/ocadotechnology/sttp-oauth2")) val Scala213 = "2.13.12" ThisBuild / scalaVersion := Scala213 -ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("20")) +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.graalvm("21")) ThisBuild / githubWorkflowBuild ++= Seq( WorkflowStep.Sbt( commands = List("IntegrationTest/test"),