Skip to content

Commit e68b9bd

Browse files
authored
Bump Scala 3 Next to 3.7.4 (#3942)
* Bump Scala 3 Next to 3.7.4 * Work around Scala 3.7.4 missing from `maven-metadata.xml` * Don't run integration tests with scala wrapper on unannounced Scala 3 Next versions
1 parent 8046be1 commit e68b9bd

File tree

7 files changed

+31
-22
lines changed

7 files changed

+31
-22
lines changed

build.mill.scala

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,14 @@ trait BuildMacros extends ScalaCliCrossSbtModule
326326

327327
val sv = scalaVersion()
328328
def compile(extraSources: os.Path*): os.CommandResult =
329-
os.proc("scala-cli", "compile", "-S", sv, cpsSource, extraSources).call(
329+
os.proc(
330+
"scala-cli",
331+
"--cli-default-scala-version",
332+
sv,
333+
"compile",
334+
cpsSource,
335+
extraSources
336+
).call(
330337
check = false,
331338
mergeErrIntoOut = true,
332339
cwd = Task.workspace

modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2270,7 +2270,8 @@ abstract class BspTestDefinitions extends ScalaCliSuite
22702270
useScalaWrapper <- Seq(false, true)
22712271
if actualScalaVersion.coursierVersion >= "3.5.0".coursierVersion
22722272
scalaVersion =
2273-
if (actualScalaVersion == Constants.scala3NextRc) Constants.scala3NextRcAnnounced
2273+
if actualScalaVersion == Constants.scala3NextRc then Constants.scala3NextRcAnnounced
2274+
if actualScalaVersion == Constants.scala3Next then Constants.scala3NextAnnounced
22742275
else actualScalaVersion
22752276
withLauncher = (root: os.Path) =>
22762277
(f: Seq[os.Shellable] => Unit) =>

project/deps/package.mill.scala

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ object Cli {
1010
}
1111

1212
object Scala {
13-
def scala212 = "2.12.20"
14-
def scala213 = "2.13.17"
15-
def scala3LtsPrefix = "3.3" // used for the LTS version tags
16-
def scala3Lts = s"$scala3LtsPrefix.7" // the LTS version currently used in the build
17-
def runnerScala3 = scala3Lts
18-
def scala3NextPrefix = "3.7"
19-
def scala3Next = s"$scala3NextPrefix.3" // the newest/next version of Scala
20-
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
13+
def scala212 = "2.12.20"
14+
def scala213 = "2.13.17"
15+
def scala3LtsPrefix = "3.3" // used for the LTS version tags
16+
def scala3Lts = s"$scala3LtsPrefix.7" // the LTS version currently used in the build
17+
def runnerScala3 = scala3Lts
18+
def scala3NextPrefix = "3.7"
19+
def scala3Next = s"$scala3NextPrefix.4" // the newest/next version of Scala
20+
def scala3NextAnnounced =
21+
s"$scala3NextPrefix.3" // the newest/next version of Scala that's been announced
2122
def scala3NextRc = s"$scala3NextPrefix.4-RC3" // the latest RC version of Scala Next
2223
def scala3NextRcAnnounced =
2324
s"$scala3NextPrefix.4-RC1" // the latest announced RC version of Scala Next

website/docs/reference/cli-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,7 @@ Available in commands:
16011601

16021602
Aliases: `-S`, `--scala`
16031603

1604-
Set the Scala version (3.7.3 by default)
1604+
Set the Scala version (3.7.4 by default)
16051605

16061606
### `--scala-binary-version`
16071607

website/docs/reference/scala-command/cli-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ Aliases: `-S`, `--scala`
10161016

10171017
`MUST have` per Scala Runner specification
10181018

1019-
Set the Scala version (3.7.3 by default)
1019+
Set the Scala version (3.7.4 by default)
10201020

10211021
### `--scala-binary-version`
10221022

website/docs/reference/scala-command/runner-specification.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Aliases: `-P` ,`--plugin`
9292

9393
**--scala-version**
9494

95-
Set the Scala version (3.7.3 by default)
95+
Set the Scala version (3.7.4 by default)
9696

9797
Aliases: `-S` ,`--scala`
9898

@@ -882,7 +882,7 @@ Aliases: `-P` ,`--plugin`
882882

883883
**--scala-version**
884884

885-
Set the Scala version (3.7.3 by default)
885+
Set the Scala version (3.7.4 by default)
886886

887887
Aliases: `-S` ,`--scala`
888888

@@ -1491,7 +1491,7 @@ Aliases: `-P` ,`--plugin`
14911491

14921492
**--scala-version**
14931493

1494-
Set the Scala version (3.7.3 by default)
1494+
Set the Scala version (3.7.4 by default)
14951495

14961496
Aliases: `-S` ,`--scala`
14971497

@@ -2114,7 +2114,7 @@ Aliases: `-P` ,`--plugin`
21142114

21152115
**--scala-version**
21162116

2117-
Set the Scala version (3.7.3 by default)
2117+
Set the Scala version (3.7.4 by default)
21182118

21192119
Aliases: `-S` ,`--scala`
21202120

@@ -2762,7 +2762,7 @@ Aliases: `-P` ,`--plugin`
27622762

27632763
**--scala-version**
27642764

2765-
Set the Scala version (3.7.3 by default)
2765+
Set the Scala version (3.7.4 by default)
27662766

27672767
Aliases: `-S` ,`--scala`
27682768

@@ -3398,7 +3398,7 @@ Aliases: `-P` ,`--plugin`
33983398

33993399
**--scala-version**
34003400

3401-
Set the Scala version (3.7.3 by default)
3401+
Set the Scala version (3.7.4 by default)
34023402

34033403
Aliases: `-S` ,`--scala`
34043404

@@ -4053,7 +4053,7 @@ Aliases: `-P` ,`--plugin`
40534053

40544054
**--scala-version**
40554055

4056-
Set the Scala version (3.7.3 by default)
4056+
Set the Scala version (3.7.4 by default)
40574057

40584058
Aliases: `-S` ,`--scala`
40594059

@@ -4780,7 +4780,7 @@ Aliases: `-P` ,`--plugin`
47804780

47814781
**--scala-version**
47824782

4783-
Set the Scala version (3.7.3 by default)
4783+
Set the Scala version (3.7.4 by default)
47844784

47854785
Aliases: `-S` ,`--scala`
47864786

@@ -5757,7 +5757,7 @@ Aliases: `-P` ,`--plugin`
57575757

57585758
**--scala-version**
57595759

5760-
Set the Scala version (3.7.3 by default)
5760+
Set the Scala version (3.7.4 by default)
57615761

57625762
Aliases: `-S` ,`--scala`
57635763

website/docs/reference/scala-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ it is recommended to update scala-cli.
3434
| 1.8.1 - 1.8.4 | 3.7.1 | 2.13.16 | 2.12.20 |
3535
| 1.8.5 - 1.9.0 | 3.7.2 | 2.13.16 | 2.12.20 |
3636
| 1.9.1 | 3.7.3 | 2.13.16 | 2.12.20 |
37-
| 1.10.0 - current | 3.7.3 | 2.13.17 | 2.12.20 |
37+
| 1.10.0 - current | 3.7.4 | 2.13.17 | 2.12.20 |
3838

0 commit comments

Comments
 (0)