From e301c3b21354efe24b410a1e9560cfda43fc4d13 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 1 Nov 2021 18:17:01 +0100 Subject: [PATCH 1/2] Update scala-library to 2.13.7 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1edaa7b..a82128a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.15, 2.13.6] + scala: [2.12.15, 2.13.7] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: @@ -71,7 +71,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.6] + scala: [2.13.7] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 69692cd..ea0254a 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType} ThisBuild / organization := "io.github.nafg.jewish-date" -ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.6") +ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.7") ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last ThisBuild / scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature") From 0b11ccedcc36dab7350e3e48175f61a240e3a971 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 1 Nov 2021 18:17:37 +0100 Subject: [PATCH 2/2] Regenerate workflow with sbt-github-actions --- .github/workflows/ci.yml | 6 +++--- .mergify.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a82128a..88be881 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,12 +107,12 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.6) + - name: Download target directories (2.13.7) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.6-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }} - - name: Inflate target directories (2.13.6) + - name: Inflate target directories (2.13.7) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 990a222..f803468 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ pull_request_rules: conditions: - author=scala-steward - check-success=Build and Test (ubuntu-latest, 2.12.15, adopt@1.8) - - check-success=Build and Test (ubuntu-latest, 2.13.6, adopt@1.8) + - check-success=Build and Test (ubuntu-latest, 2.13.7, adopt@1.8) actions: merge: strict: true