Skip to content

Commit

Permalink
Bump Scala to 3.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Gedochao committed Aug 14, 2024
1 parent 2c607a3 commit 045ca91
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
java-version: [ 8, 17 ]
scala-binary-version: [ 2.12, 2.13, 3.3, 3.4.3 ]
scala-binary-version: [ 2.12, 2.13, 3.3, 3.4.3, 3.5.0 ]
include:
# Including lowest/highest versions that work with Java 21
- java-version: 21
Expand All @@ -35,6 +35,8 @@ jobs:
scala-version: 3.3.3
- java-version: 21
scala-version: 3.4.3
- java-version: 21
scala-version: 3.5.0
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand All @@ -51,7 +53,7 @@ jobs:
fail-fast: false
matrix:
java-version: [ 8, 17 ]
scala-version: [ 2.12, 2.13, 3.3, 3.4.3 ]
scala-version: [ 2.12, 2.13, 3.3, 3.4.3, 3.5.0 ]
include:
# Including lowest/highest versions that work with Java 21
- java-version: 21
Expand All @@ -68,6 +70,8 @@ jobs:
scala-version: 3.3.3
- java-version: 21
scala-version: 3.4.3
- java-version: 21
scala-version: 3.5.0

runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -99,7 +103,7 @@ jobs:
strategy:
fail-fast: false
matrix:
scala-version: [ 2.12.19, 2.13.14, 3.3.3, 3.4.3 ]
scala-version: [ 2.12.19, 2.13.14, 3.3.3, 3.4.3, 3.5.0 ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
5 changes: 3 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ val scala33Versions = Seq("3.3.0", "3.3.1", "3.3.2", "3.3.3")
// .dropWhile(v => isJava21 && v == "3.3.0")
// TODO: We can't have 3.4.0 & 3.4.1 until we solve https://github.com/com-lihaoyi/Ammonite/issues/1395
val scala34Versions = Seq("3.4.2", "3.4.3")
val scala35Versions = Seq("3.5.0")

val scala2Versions = scala2_12Versions ++ scala2_13Versions
val scala3Versions = scala33Versions ++ scala34Versions
val scala3Versions = scala33Versions ++ scala34Versions ++ scala35Versions

val binCrossScalaVersions =
Seq(scala2_12Versions.last, scala2_13Versions.last, scala33Versions.last)
val assemblyCrossScalaVersions =
Seq(scala2_12Versions.last, scala2_13Versions.last, scala33Versions.last, scala34Versions.last)
Seq(scala2_12Versions.last, scala2_13Versions.last, scala33Versions.last, scala34Versions.last, scala35Versions.last)
def isScala2_12_10OrLater(sv: String): Boolean = {
(sv.startsWith("2.12.") && sv.stripPrefix("2.12.").length > 1) || sv.startsWith("2.13.")
}
Expand Down

0 comments on commit 045ca91

Please sign in to comment.