From df243e14dff4b514801a719c1c14cc71aca0b42d Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 15 Nov 2022 16:46:12 +0100 Subject: [PATCH] Update Scala to 3.2.1 (#1311) --- .github/workflows/actions.yml | 4 ++-- build.sc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 18208ef42..ac31b76c0 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: java-version: [8, 11] - scala-version: [2.12.17, 2.13.10, 3.2.0] + scala-version: [2.12.17, 2.13.10, 3.2.1] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: java-version: [8, 11] - scala-version: [2.12.17, 2.13.10, 3.2.0] + scala-version: [2.12.17, 2.13.10, 3.2.1] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/build.sc b/build.sc index f2b1a6f93..14ed111c9 100644 --- a/build.sc +++ b/build.sc @@ -36,15 +36,15 @@ val commitsSinceTaggedVersion = { // version. For example, 2.13.4 and 3.0.0-M1 do, while 2.13.4 and 3.0.0-M{2,3} // don't. val cross2_3Version = (scala3Ver: String) => - if (scala3Ver == "3.2.0") "2.13.10" - else "2.13.7" + if (scala3Ver.startsWith("3.0.") || scala3Ver.startsWith("3.1.")) "2.13.7" + else "2.13.10" val scala2_12Versions = Seq("2.12.8", "2.12.9", "2.12.10", "2.12.11", "2.12.12", "2.12.13", "2.12.14", "2.12.15", "2.12.16", "2.12.17") val scala2_13Versions = Seq("2.13.0", "2.13.1", "2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10") val scala30Versions = Seq("3.0.0", "3.0.1", "3.0.2") val scala31Versions = Seq("3.1.0", "3.1.1", "3.1.2", "3.1.3") -val scala32Versions = Seq("3.2.0") +val scala32Versions = Seq("3.2.0", "3.2.1") val scala3Versions = scala30Versions ++ scala31Versions ++ scala32Versions val binCrossScalaVersions = Seq(scala2_12Versions.last, scala2_13Versions.last, scala30Versions.last, scala31Versions.last, scala32Versions.last)