Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Scala 3.4.3 & 3.5.0 #1532

Closed
wants to merge 2 commits into from
Closed

Add support for Scala 3.4.3 & 3.5.0 #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c607a3
Bump Scala to 3.4.3
Gedochao Aug 14, 2024
cfe064a
Bump Scala to 3.5.0
Gedochao Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/actions.yml
View file
Open in desktop
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.2 ]
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 @@ -34,7 +34,9 @@ jobs:
- java-version: 21
scala-version: 3.3.3
- java-version: 21
scala-version: 3.4.2
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.2 ]
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 @@ -67,7 +69,9 @@ jobs:
- java-version: 21
scala-version: 3.3.3
- java-version: 21
scala-version: 3.4.2
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.2 ]
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
12 changes: 7 additions & 5 deletions build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@ val scala2_13Versions = 2.to(14)
.map(v => s"2.13.${v}")
val scala33Versions = Seq("3.3.0", "3.3.1", "3.3.2", "3.3.3")
// .dropWhile(v => isJava21 && v == "3.3.0")
val scala34Versions = Seq("3.4.2")
// 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 Expand Up @@ -223,8 +225,8 @@ trait AmmInternalModule extends CrossSbtModule with Bloop.Module {
Seq(PathRef(millSourcePath / "src" / "main" / "scala-2.13-or-3"))
else Nil
val extraDir5 =
if (sv.startsWith("3.4"))
if (sv.stripPrefix("3.4.").toInt < 2)
if (sv.startsWith("3.4") || (sv.startsWith("3.5")))
if (sv.startsWith("3.4.0") || sv.startsWith("3.4.1"))
sys.error("Scala 3.4.0 and 3.4.1 are incompatible with Ammonite")
else
Seq(PathRef(millSourcePath / "src" / "main" / "scala-3.4.2+"))
Expand Down
Loading