Skip to content

Commit

Permalink
Merge pull request #54 from ahjohannessen/wip-scala3.3
Browse files Browse the repository at this point in the history
build: use scala 3.3.0 lts
  • Loading branch information
ahjohannessen authored May 24, 2023
2 parents 1c58358 + b377eb3 commit 1bf0e45
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 @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.2.2, 2.13.10]
scala: [3.3.0, 2.13.10]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -141,12 +141,12 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (3.2.2)
- name: Download target directories (3.3.0)
uses: actions/download-artifact@v3
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.2
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0

- name: Inflate target directories (3.2.2)
- name: Inflate target directories (3.3.0)
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 @@ -12,7 +12,7 @@ pull_request_rules:
- or:
- body~=labels:.*early-semver-patch
- body~=labels:.*early-semver-minor
- status-success=Build and Test (ubuntu-latest, 3.2.2, temurin@17)
- status-success=Build and Test (ubuntu-latest, 3.3.0, temurin@17)
- status-success=Build and Test (ubuntu-latest, 2.13.10, temurin@17)
actions:
merge: {}
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Global / onChangedBuildSource := ReloadOnSourceChanges
Global / lintUnusedKeysOnLoad := false

lazy val Scala2 = "2.13.10"
lazy val Scala3 = "3.2.2"
lazy val Scala3 = "3.3.0"

lazy val root = project
.in(file("."))
Expand Down

0 comments on commit 1bf0e45

Please sign in to comment.