From ad8ae8c44f5a455ff824332c99111bcd0c9a72f1 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Thu, 30 Jan 2025 14:04:03 +0100 Subject: [PATCH] Add support for Scala 3.5.2 (#1606) Fixes #1605 --- .github/workflows/run-tests.yml | 8 ++++---- .../scala/ammonite/interp/script/ScriptCompiler.scala | 2 +- build.mill | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7e5a75bea..906ea99bb 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -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: @@ -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: diff --git a/amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala b/amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala index 4bbf9971e..db8d6994d 100644 --- a/amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala +++ b/amm/interp/src/main/scala/ammonite/interp/script/ScriptCompiler.scala @@ -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]] diff --git a/build.mill b/build.mill index c561b8a62..75e808a54 100644 --- a/build.mill +++ b/build.mill @@ -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