diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a24c1f3..7f743fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.12, 3.3.1] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -32,12 +32,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 11 cache: sbt - name: Check that workflows are up to date @@ -71,7 +71,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [3.3.1] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -79,12 +79,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java (temurin@8) - if: matrix.java == 'temurin@8' + - name: Setup Java (temurin@11) + if: matrix.java == 'temurin@11' uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 11 cache: sbt - name: Download target directories (2.13.12) diff --git a/.mergify.yml b/.mergify.yml index 68052b2..464e675 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,8 +8,8 @@ pull_request_rules: - or: - author=scala-steward - author=nafg-scala-steward[bot] - - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@8) - - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@8) + - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11) + - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11) actions: queue: name: default diff --git a/ci.sbt b/ci.sbt index 8d28713..4ac1fab 100644 --- a/ci.sbt +++ b/ci.sbt @@ -36,6 +36,7 @@ inThisBuild(List( ), WorkflowStep.Run(List("mkdir -p slick-additions-entity/.js/target")) ), + githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")), githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))), githubWorkflowPublish := Seq( WorkflowStep.Sbt(