Skip to content

Commit 932c942

Browse files
authored
Make ammonite repl default to Scala 3.1.3 instead of 3.2.0, temporarily (#1348)
1 parent c7288a6 commit 932c942

File tree

1 file changed

+14
-2
lines changed
  • modules/cli/src/main/scala/scala/cli/commands

1 file changed

+14
-2
lines changed

modules/cli/src/main/scala/scala/cli/commands/Repl.scala

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,21 @@ object Repl extends ScalaCommand[ReplOptions] {
2828
def buildOptions(ops: ReplOptions): BuildOptions = {
2929
import ops._
3030
import ops.sharedRepl._
31-
def ammoniteVersionOpt = ammoniteVersion.map(_.trim).filter(_.nonEmpty)
31+
val ammoniteVersionOpt = ammoniteVersion.map(_.trim).filter(_.nonEmpty)
3232

33-
val baseOptions = shared.buildOptions()
33+
val baseOptions = shared.copy(scalaVersion =
34+
if (
35+
ammonite.contains(true) &&
36+
(shared.scalaVersion.isEmpty || shared.scalaVersion.contains("3.2.0")) &&
37+
ammoniteVersionOpt.isEmpty
38+
) {
39+
// TODO remove this once ammonite adds support for 3.2.0
40+
System.err.println("Scala 3.2.0 is not yet supported with this version of ammonite")
41+
System.err.println("Defaulting to Scala 3.1.3")
42+
Some("3.1.3")
43+
}
44+
else shared.scalaVersion
45+
).buildOptions()
3446
baseOptions.copy(
3547
javaOptions = baseOptions.javaOptions.copy(
3648
javaOpts =

0 commit comments

Comments
 (0)