From 95b58dcdc973ebd0976bc73271b7ae405b82df98 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Tue, 5 Mar 2024 12:26:18 +0100 Subject: [PATCH] Add support for Scala 2.12.19 and 2.13.13 (#1421) Fix https://github.com/com-lihaoyi/Ammonite/issues/1420 Pull request: https://github.com/com-lihaoyi/Ammonite/pull/1421 --- .github/workflows/actions.yml | 2 +- amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala | 4 ++-- build.sc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 5d207a31b..9f4527746 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -49,7 +49,7 @@ jobs: strategy: fail-fast: false matrix: - scala-version: [2.12.18, 2.13.12, 3.3.3] + scala-version: [2.12.19, 2.13.13, 3.3.3] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala b/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala index 278e3959d..614e4b2de 100644 --- a/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala +++ b/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala @@ -320,7 +320,7 @@ object AdvancedTests extends TestSuite{ check.session(""" @ // Compiler plugins imported without `.$plugin` are not loaded - @ import $ivy.`org.typelevel:::kind-projector:0.13.2` + @ import $ivy.`org.typelevel:::kind-projector:0.13.3` @ trait TC0[F[_]] defined trait TC0 @@ -330,7 +330,7 @@ object AdvancedTests extends TestSuite{ @ // You need to use `import $plugin.$ivy` - @ import $plugin.$ivy.`org.typelevel:::kind-projector:0.13.2` + @ import $plugin.$ivy.`org.typelevel:::kind-projector:0.13.3` @ trait TC[F[_]] defined trait TC diff --git a/build.sc b/build.sc index 8084ef5c7..65dbdb375 100644 --- a/build.sc +++ b/build.sc @@ -38,8 +38,8 @@ val commitsSinceTaggedVersion = { .toInt } -val scala2_12Versions = Seq("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", "2.12.18") -val scala2_13Versions = Seq("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", "2.13.11", "2.13.12") +val scala2_12Versions = 9.to(19).map(v => s"2.12.${v}") +val scala2_13Versions = 2.to(13).map(v => s"2.13.${v}") val scala32Versions = Seq("3.2.0", "3.2.1", "3.2.2") val scala33Versions = Seq("3.3.0", "3.3.1", "3.3.2", "3.3.3") val scala3Versions = scala32Versions ++ scala33Versions