From 11f5417faf26e45943dee0dd34b98753e4aed609 Mon Sep 17 00:00:00 2001 From: Naftoli Gugenheim <98384+nafg@users.noreply.github.com> Date: Thu, 26 Sep 2024 05:17:46 -0400 Subject: [PATCH] Build on Java 11 --- .github/workflows/ci.yml | 8 ++++---- .mergify.yml | 2 +- build.sbt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 550ec7a..f824990 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.19] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -31,12 +31,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 diff --git a/.mergify.yml b/.mergify.yml index 3a47fa7..1ea4ebe 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,7 +9,7 @@ pull_request_rules: - author=scala-steward - author=slick-scala-steward[bot] - author=renovate[bot] - - check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@8) + - check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@11) actions: queue: name: default diff --git a/build.sbt b/build.sbt index 003a59e..4749a6c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -import _root_.io.github.nafg.mergify.dsl._ +import _root_.io.github.nafg.mergify.dsl.* mergifyExtraConditions := Seq( @@ -20,7 +20,7 @@ libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value Compile / unmanagedClasspath ++= (Compile / unmanagedResources).value libraryDependencies += "com.typesafe.slick" %% "slick" % "3.5.1" -githubWorkflowJavaVersions := JavaSpec.temurin("8") +: githubWorkflowJavaVersions.value +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11")) ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("runAll"), name = Some(s"Run all main classes")))