Skip to content

Commit

Permalink
Add support for Scala 2.13.15 (#1561)
Browse files Browse the repository at this point in the history
https://contributors.scala-lang.org/t/scala-2-13-15-release-planning/6649/10
<img width="775" alt="image"
src="https://github.com/user-attachments/assets/338b022e-468b-4cdf-a927-2aaaa4eb1348">

`Scala 2.13.15` has been released, let's support it.

Depends on

- [] com-lihaoyi/acyclic#138
- [] typelevel/kind-projector#291

---------

Co-authored-by: Li Haoyi <haoyi.sg@gmail.com>
  • Loading branch information
panbingkun and lihaoyi authored Sep 23, 2024
1 parent b8879c5 commit 93cf415
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ jobs:
command: 'terminal.__.test'

- java-version: 11
command: 'sshd[{2.12.20,2.13.14,3.4.3,3.5.1}].__.test'
command: 'sshd[{2.12.20,2.13.15,3.4.3,3.5.1}].__.test'

- java-version: 11
command: 'amm.repl[2.12.{9,14,20}].__.test'
- java-version: 17
command: 'amm.repl[2.13.{4,9,14}].__.test'
command: 'amm.repl[2.13.{4,9,15}].__.test'
- java-version: 21
command: 'amm.repl[{3.4.3,3.5.1}].__.test'

- java-version: 11
command: 'amm[2.12.{9,14,20}].__.test'
- java-version: 17
command: 'amm[2.13.{4,9,14}].__.test'
command: 'amm[2.13.{4,9,15}].__.test'
- java-version: 21
command: 'amm[{3.4.3,3.5.1}].__.test'

Expand All @@ -55,7 +55,7 @@ jobs:
- java-version: 11
scala-version: '2.12.{9,14,20}'
- java-version: 17
scala-version: '2.13.{4,9,14}'
scala-version: '2.13.{4,9,15}'
- java-version: 21
scala-version: '{3.4.3,3.5.1}'

Expand Down
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ val commitsSinceTaggedVersion = latestTaggedVersion match{
val scala2_12Versions = 9.to(20)
// .dropWhile(v => isJava21 && v < 18)
.map(v => s"2.12.${v}")
val scala2_13Versions = 2.to(14)
val scala2_13Versions = 2.to(15)
// .dropWhile(v => isJava21 && v < 11)
.map(v => s"2.13.${v}")
// TODO: We can't have 3.4.0 & 3.4.1 until we solve https://github.com/com-lihaoyi/Ammonite/issues/1395
Expand Down Expand Up @@ -102,7 +102,7 @@ val fastparseVersion = "3.1.1"
val scalametaVersion = "4.9.7"

object Deps {
val acyclic = ivy"com.lihaoyi:::acyclic:0.3.13"
val acyclic = ivy"com.lihaoyi:::acyclic:0.3.14"
val bsp4j = ivy"ch.epfl.scala:bsp4j:${bspVersion}"
val bcprovJdk15on = ivy"org.bouncycastle:bcprov-jdk18on:1.78.1"
val cask = ivy"com.lihaoyi::cask:0.9.1"
Expand Down

0 comments on commit 93cf415

Please sign in to comment.