Skip to content

Commit

Permalink
Merge pull request #187 from nafg/update/scala-library-2.13.14
Browse files Browse the repository at this point in the history
Update scala-library to 2.13.14
  • Loading branch information
nafg authored May 15, 2024
2 parents d5e2174 + 5e961bc commit 3d11656
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.12, 3.3.1]
scala: [2.13.14, 3.3.1]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -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.12)
- name: Download target directories (2.13.14)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }}

- name: Inflate target directories (2.13.12)
- name: Inflate target directories (2.13.14)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.12, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.13.14, temurin@11)
- check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11)
actions:
queue:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.12", (ThisBuild / scalaVersion).value)
ThisBuild / crossScalaVersions := List("2.13.14", (ThisBuild / scalaVersion).value)

ThisBuild / scalacOptions ++=
ScalacOptions.all(scalaVersion.value)(
Expand Down

0 comments on commit 3d11656

Please sign in to comment.