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

Add support for Scala 3.5.2 #1606

Merged
merged 1 commit into from
Jan 30, 2025
Merged

Add support for Scala 3.5.2 #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ jobs:
command: 'terminal.__.test'

- java-version: 11
command: 'sshd[{2.12.20,2.13.16,3.3.5,3.4.3,3.5.1,3.6.3}].__.test'
command: 'sshd[{2.12.20,2.13.16,3.3.5,3.4.3,3.5.2,3.6.3}].__.test'

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

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

runs-on: ubuntu-latest
steps:
Expand All @@ -59,7 +59,7 @@ jobs:
- java-version: 17
scala-version: '2.13.{4,9,15}'
- java-version: 21
scala-version: '{3.3.5,3.4.3,3.5.1}'
scala-version: '{3.3.5,3.4.3,3.5.2,3.6.3}'

runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ final class ScriptCompiler(
def compile(
module: Script,
processor: ScriptProcessor,
doCompile: (Script, Script.ResolvedDependencies) => ScriptCompileResult = compile(_, _)
doCompile: (Script, Script.ResolvedDependencies) => ScriptCompileResult = compile
): (
Map[Script, Seq[Diagnostic]],
Either[String, Seq[AmmCompiler.Output]]
Expand Down
2 changes: 1 addition & 1 deletion build.mill
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ val scala2_13Versions = 2.to(16)
// TODO: We can't have 3.4.0 & 3.4.1 until we solve https://github.com/com-lihaoyi/Ammonite/issues/1395
val scala33Versions = Seq("3.3.4", "3.3.5")
val scala34Versions = Seq("3.4.2", "3.4.3")
val scala35Versions = Seq("3.5.0", "3.5.1")
val scala35Versions = Seq("3.5.0", "3.5.1", "3.5.2")
val scala36Versions = Seq("3.6.2", "3.6.3")

val scala2Versions = scala2_12Versions ++ scala2_13Versions
Expand Down