Skip to content

Commit ad8ae8c

Browse files
authored
Add support for Scala 3.5.2 (#1606)
Fixes #1605
1 parent 8098058 commit ad8ae8c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: .github/workflows/run-tests.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ jobs:
2222
command: 'terminal.__.test'
2323

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

2727
- java-version: 11
2828
command: 'amm.repl[2.12.{9,14,20}].__.test'
2929
- java-version: 17
3030
command: 'amm.repl[2.13.{4,9,16}].__.test'
3131
- java-version: 21
32-
command: 'amm.repl[{3.3.5,3.4.3,3.5.1,3.6.3}].__.test'
32+
command: 'amm.repl[{3.3.5,3.4.3,3.5.2,3.6.3}].__.test'
3333

3434
- java-version: 11
3535
command: 'amm[2.12.{9,14,20}].__.test'
3636
- java-version: 17
3737
command: 'amm[2.13.{4,9,16}].__.test'
3838
- java-version: 21
39-
command: 'amm[{3.3.5,3.4.3,3.5.1,3.6.3}].__.test'
39+
command: 'amm[{3.3.5,3.4.3,3.5.2,3.6.3}].__.test'
4040

4141
runs-on: ubuntu-latest
4242
steps:
@@ -59,7 +59,7 @@ jobs:
5959
- java-version: 17
6060
scala-version: '2.13.{4,9,15}'
6161
- java-version: 21
62-
scala-version: '{3.3.5,3.4.3,3.5.1}'
62+
scala-version: '{3.3.5,3.4.3,3.5.2,3.6.3}'
6363

6464
runs-on: ubuntu-latest
6565
steps:

Diff for: amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class ScriptCompiler(
3131
def compile(
3232
module: Script,
3333
processor: ScriptProcessor,
34-
doCompile: (Script, Script.ResolvedDependencies) => ScriptCompileResult = compile(_, _)
34+
doCompile: (Script, Script.ResolvedDependencies) => ScriptCompileResult = compile
3535
): (
3636
Map[Script, Seq[Diagnostic]],
3737
Either[String, Seq[AmmCompiler.Output]]

Diff for: build.mill

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ val scala2_13Versions = 2.to(16)
6363
// TODO: We can't have 3.4.0 & 3.4.1 until we solve https://github.com/com-lihaoyi/Ammonite/issues/1395
6464
val scala33Versions = Seq("3.3.4", "3.3.5")
6565
val scala34Versions = Seq("3.4.2", "3.4.3")
66-
val scala35Versions = Seq("3.5.0", "3.5.1")
66+
val scala35Versions = Seq("3.5.0", "3.5.1", "3.5.2")
6767
val scala36Versions = Seq("3.6.2", "3.6.3")
6868

6969
val scala2Versions = scala2_12Versions ++ scala2_13Versions

0 commit comments

Comments
 (0)