Skip to content

Commit

Permalink
Merge pull request #24 from 2m/fix/scala-3.5-2m
Browse files Browse the repository at this point in the history
Support Scala 3.5.0 and 3.4.3
  • Loading branch information
ghik authored Aug 28, 2024
2 parents 16019d7 + 8c3b721 commit 5520ea3
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
24 changes: 23 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
matrix:
os: [ubuntu-latest]
scala:
- 3.5.0
- 3.4.3
- 3.4.2
- 3.4.1
- 3.4.0
Expand Down Expand Up @@ -90,7 +92,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.4.2]
scala: [3.5.0]
java: [temurin@17]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -118,6 +120,26 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

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

- name: Inflate target directories (3.5.0)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.4.3)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.4.3-${{ matrix.java }}

- name: Inflate target directories (3.4.3)
run: |
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.4.2)
uses: actions/download-artifact@v2
with:
Expand Down
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ inThisBuild(Seq(
organization := "com.github.ghik",
scalaVersion := crossScalaVersions.value.head,
crossScalaVersions := Seq(
"3.4.2", "3.4.1", "3.4.0",
"3.5.0",
"3.4.3", "3.4.2", "3.4.1", "3.4.0",
"3.3.3", "3.3.2", "3.3.1", "3.3.0",
"3.2.2", "3.2.1",
"2.13.10", "2.13.11", "2.13.12", "2.13.13", "2.13.14",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ZerowastePlugin extends StandardPlugin {
def name = "zerowaste"
def description = "Scala compiler plugin that disallows discarding of non-Unit expressions"

def init(options: List[String]): List[PluginPhase] =
override def init(options: List[String]): List[PluginPhase] =
new ZerowastePhase :: Nil
}

Expand Down

0 comments on commit 5520ea3

Please sign in to comment.