From 2ee6a197ccda0170a26282c8bbd8d11a7d4fa4e6 Mon Sep 17 00:00:00 2001 From: panbingkun <84731559@qq.com> Date: Thu, 2 May 2024 23:00:14 +0800 Subject: [PATCH] Add support for Scala 2.13.14 (#1482) Scala 2.13.14 has been released, let's support it. Pull request: https://github.com/com-lihaoyi/Ammonite/pull/1482 --- .github/workflows/actions.yml | 6 +++--- build.sc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c2b2b0a01..4a1c094e5 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -28,7 +28,7 @@ jobs: - java-version: 21 scala-version: 2.13.11 - java-version: 21 - scala-version: 2.13.13 + scala-version: 2.13.14 - java-version: 21 scala-version: 3.3.1 - java-version: 21 @@ -59,7 +59,7 @@ jobs: - java-version: 21 scala-version: 2.13.11 - java-version: 21 - scala-version: 2.13.13 + scala-version: 2.13.14 - java-version: 21 scala-version: 3.3.1 - java-version: 21 @@ -95,7 +95,7 @@ jobs: strategy: fail-fast: false matrix: - scala-version: [ 2.12.19, 2.13.13, 3.3.3 ] + scala-version: [ 2.12.19, 2.13.14, 3.3.3 ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/build.sc b/build.sc index 6fba4e022..2dcb27458 100644 --- a/build.sc +++ b/build.sc @@ -52,7 +52,7 @@ val commitsSinceTaggedVersion = { val scala2_12Versions = 9.to(19) // .dropWhile(v => isJava21 && v < 18) .map(v => s"2.12.${v}") -val scala2_13Versions = 2.to(13) +val scala2_13Versions = 2.to(14) // .dropWhile(v => isJava21 && v < 11) .map(v => s"2.13.${v}") val scala33Versions = Seq("3.3.0", "3.3.1", "3.3.2", "3.3.3") @@ -89,7 +89,7 @@ val fastparseVersion = "3.0.2" val scalametaVersion = "4.9.1" object Deps { - val acyclic = ivy"com.lihaoyi:::acyclic:0.3.11" + val acyclic = ivy"com.lihaoyi:::acyclic:0.3.12" val bsp4j = ivy"ch.epfl.scala:bsp4j:${bspVersion}" val bcprovJdk15on = ivy"org.bouncycastle:bcprov-jdk18on:1.78" val cask = ivy"com.lihaoyi::cask:0.9.1"