Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion build.mill.scala
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,14 @@ trait BuildMacros extends ScalaCliCrossSbtModule

val sv = scalaVersion()
def compile(extraSources: os.Path*): os.CommandResult =
os.proc("scala-cli", "compile", "-S", sv, cpsSource, extraSources).call(
os.proc(
"scala-cli",
"--cli-default-scala-version",
sv,
"compile",
cpsSource,
extraSources
).call(
check = false,
mergeErrIntoOut = true,
cwd = Task.workspace
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2270,7 +2270,8 @@ abstract class BspTestDefinitions extends ScalaCliSuite
useScalaWrapper <- Seq(false, true)
if actualScalaVersion.coursierVersion >= "3.5.0".coursierVersion
scalaVersion =
if (actualScalaVersion == Constants.scala3NextRc) Constants.scala3NextRcAnnounced
if actualScalaVersion == Constants.scala3NextRc then Constants.scala3NextRcAnnounced
if actualScalaVersion == Constants.scala3Next then Constants.scala3NextAnnounced
else actualScalaVersion
withLauncher = (root: os.Path) =>
(f: Seq[os.Shellable] => Unit) =>
Expand Down
17 changes: 9 additions & 8 deletions project/deps/package.mill.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ object Cli {
}

object Scala {
def scala212 = "2.12.20"
def scala213 = "2.13.17"
def scala3LtsPrefix = "3.3" // used for the LTS version tags
def scala3Lts = s"$scala3LtsPrefix.7" // the LTS version currently used in the build
def runnerScala3 = scala3Lts
def scala3NextPrefix = "3.7"
def scala3Next = s"$scala3NextPrefix.3" // the newest/next version of Scala
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
def scala212 = "2.12.20"
def scala213 = "2.13.17"
def scala3LtsPrefix = "3.3" // used for the LTS version tags
def scala3Lts = s"$scala3LtsPrefix.7" // the LTS version currently used in the build
def runnerScala3 = scala3Lts
def scala3NextPrefix = "3.7"
def scala3Next = s"$scala3NextPrefix.4" // the newest/next version of Scala
def scala3NextAnnounced =
s"$scala3NextPrefix.3" // the newest/next version of Scala that's been announced
def scala3NextRc = s"$scala3NextPrefix.4-RC3" // the latest RC version of Scala Next
def scala3NextRcAnnounced =
s"$scala3NextPrefix.4-RC1" // the latest announced RC version of Scala Next
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -1601,7 +1601,7 @@ Available in commands:

Aliases: `-S`, `--scala`

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

### `--scala-binary-version`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-command/cli-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ Aliases: `-S`, `--scala`

`MUST have` per Scala Runner specification

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

### `--scala-binary-version`

Expand Down
18 changes: 9 additions & 9 deletions website/docs/reference/scala-command/runner-specification.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -882,7 +882,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -1491,7 +1491,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -2114,7 +2114,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -2762,7 +2762,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -3398,7 +3398,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -4053,7 +4053,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -4780,7 +4780,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down Expand Up @@ -5757,7 +5757,7 @@ Aliases: `-P` ,`--plugin`

**--scala-version**

Set the Scala version (3.7.3 by default)
Set the Scala version (3.7.4 by default)

Aliases: `-S` ,`--scala`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/scala-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ it is recommended to update scala-cli.
| 1.8.1 - 1.8.4 | 3.7.1 | 2.13.16 | 2.12.20 |
| 1.8.5 - 1.9.0 | 3.7.2 | 2.13.16 | 2.12.20 |
| 1.9.1 | 3.7.3 | 2.13.16 | 2.12.20 |
| 1.10.0 - current | 3.7.3 | 2.13.17 | 2.12.20 |
| 1.10.0 - current | 3.7.4 | 2.13.17 | 2.12.20 |