From c5c1ab98bd862cfa36956e42a464daf956e31cd7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Dec 2023 17:12:19 +0000 Subject: [PATCH 1/2] Update scala-library to 2.13.12 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 223b9e5..414f7a5 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, 3.3.1] + scala: [2.13.12, 3.3.1] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 4ee7b00..18d4148 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{CrossType, crossProject} ThisBuild / organization := "io.github.nafg.jewish-date" ThisBuild / scalaVersion := "3.3.1" -ThisBuild / crossScalaVersions := List("2.13.10", (ThisBuild / scalaVersion).value) +ThisBuild / crossScalaVersions := List("2.13.12", (ThisBuild / scalaVersion).value) ThisBuild / scalacOptions ++= ScalacOptions.all(scalaVersion.value)( From 28cb73ee6ddb37f69bf890a8ee69c0b082719684 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 7 Dec 2023 17:12:56 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .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 414f7a5..6f22419 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,12 +101,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.10) + - name: Download target directories (2.13.12) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} - - name: Inflate target directories (2.13.10) + - name: Inflate target directories (2.13.12) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 2a4ecf5..8e7df71 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,7 +6,7 @@ pull_request_rules: - name: Automatically merge successful Scala Steward PRs conditions: - author=scala-steward - - check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) + - 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: