diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa5e1eea..6b6588e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10, 2.12.15] + scala: [2.13.10, 2.12.17] java: [temurin@8, temurin@11] runs-on: ${{ matrix.os }} steps: @@ -124,12 +124,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.15) + - name: Download target directories (2.12.17) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }} - - name: Inflate target directories (2.12.15) + - name: Inflate target directories (2.12.17) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index f7a2b48b..12ba5dcd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,8 +3,8 @@ queue_rules: conditions: - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@8) - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) - - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@8) - - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) + - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8) + - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11) pull_request_rules: - name: assign and label scala-steward's PRs @@ -27,8 +27,8 @@ pull_request_rules: - author=dwolla-oss-scala-steward[bot] - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@8) - status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) - - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@8) - - status-success=Build and Test (ubuntu-latest, 2.12.15, temurin@11) + - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@8) + - status-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11) actions: queue: method: squash diff --git a/build.sbt b/build.sbt index f1940743..0dd3fce9 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ inThisBuild(List( url("https://dwolla.com") ) ), - crossScalaVersions := Seq("2.13.10", "2.12.15"), + crossScalaVersions := Seq("2.13.10", "2.12.17"), scalaVersion := crossScalaVersions.value.head, startYear := Option(2018), resolvers += Resolver.sonatypeRepo("releases"),