diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09da1d4..0ce7820 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.15] + scala: [2.13.18] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -67,7 +67,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.15] + scala: [2.13.18] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -87,12 +87,12 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Download target directories (2.13.15) + - name: Download target directories (2.13.18) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.18-${{ matrix.java }} - - name: Inflate target directories (2.13.15) + - name: Inflate target directories (2.13.18) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 88aa524..34d578b 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.13.15, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.13.18, temurin@11) actions: queue: name: default diff --git a/build.sbt b/build.sbt index fa4d827..058e069 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import _root_.io.github.nafg.mergify.dsl.* -ThisBuild / scalaVersion := "2.13.15" +ThisBuild / scalaVersion := "2.13.18" ThisBuild / scalacOptions += "-Xsource:3" mergifyExtraConditions := Seq(