diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0697f6f..fd4ebdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,15 +5,23 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + include: + - java: 17 + scala: 3.x + - java: 8 + scala: 2.12.x steps: - uses: actions/checkout@v6 - uses: actions/setup-java@v5 with: distribution: temurin - java-version: 8 + java-version: "${{ matrix.java }}" cache: sbt - uses: sbt/setup-sbt@v1 - - run: sbt +test + - run: sbt "++ ${{ matrix.scala }}" test format: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8054bf7..bea142a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-java@v5 with: distribution: temurin - java-version: 8 + java-version: 17 cache: sbt - uses: sbt/setup-sbt@v1 - run: sbt ci-release diff --git a/build.sbt b/build.sbt index 191721d..effe9b5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ lazy val scala212 = "2.12.21" -lazy val scala3 = "3.7.3" +lazy val scala3 = "3.8.1" inThisBuild( List( @@ -30,14 +30,14 @@ lazy val plugin = project crossScalaVersions := Seq(scala212, scala3), scalacOptions ++= { scalaBinaryVersion.value match { - case "2.12" => "-Xsource:3" :: Nil + case "2.12" => "-Xsource:3" :: "-release:8" :: Nil case _ => Nil } }, (pluginCrossBuild / sbtVersion) := { scalaBinaryVersion.value match { case "2.12" => "1.5.8" - case _ => "2.0.0-RC3" + case _ => "2.0.0-RC9" } }, libraryDependencies += "org.scalameta" %% "munit" % "1.2.2" % Test,