Skip to content

Commit e299a44

Browse files
committed
Update Scala 3 Next to 3.5.0
1 parent c0382e8 commit e299a44

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

project/deps.sc

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ object Scala {
88
def runnerScala3 = "3.0.2" // the newest version that is compatible with all Scala 3.x versions
99
def scala3LtsPrefix = "3.3" // used for the LTS version tags
1010
def scala3Lts = s"$scala3LtsPrefix.3" // the LTS version currently used in the build
11-
def scala3Next = "3.4.2" // the newest/next version of Scala
12-
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
11+
def scala3Next = "3.5.0" // the newest/next version of Scala
12+
def scala3NextAnnounced = "3.4.2" // the newest/next version of Scala that's been announced
1313
def scala3NextRc = "3.5.0-RC7" // the latest RC version of Scala Next
1414

1515
// The Scala version used to build the CLI itself.
@@ -39,19 +39,21 @@ object Scala {
3939
val max31 = 3
4040
val max32 = 2
4141
val max33 = patchVer(scala3Lts)
42-
val max34 = patchVer(scala3Next)
42+
val max34 = 3
43+
val max35 = patchVer(scala3Next)
4344
(8 until max212).map(i => s"2.12.$i") ++ Seq(scala212) ++
4445
(0 until max213).map(i => s"2.13.$i") ++ Seq(scala213) ++
4546
(0 to max30).map(i => s"3.0.$i") ++
4647
(0 to max31).map(i => s"3.1.$i") ++
4748
(0 to max32).map(i => s"3.2.$i") ++
48-
(0 until max33).map(i => s"3.3.$i") ++
49-
(0 until max34).map(i => s"3.4.$i") ++ Seq(scala3Next)
49+
(0 to max33).map(i => s"3.3.$i") ++
50+
(0 to max34).map(i => s"3.4.$i") ++
51+
(0 until max35).map(i => s"3.5.$i") ++ Seq(scala3Next)
5052
}
5153

5254
def maxAmmoniteScala212Version = scala212
5355
def maxAmmoniteScala213Version = scala213
54-
def maxAmmoniteScala3Version = scala3Next
56+
def maxAmmoniteScala3Version = scala3NextAnnounced
5557
lazy val listMaxAmmoniteScalaVersion =
5658
Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
5759
lazy val listAllAmmonite = {

website/docs/reference/cli-options.md

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

15341534
Aliases: `-S`, `--scala`
15351535

1536-
Set the Scala version (3.4.2 by default)
1536+
Set the Scala version (3.5.0 by default)
15371537

15381538
### `--scala-binary-version`
15391539

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

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

997997
`MUST have` per Scala Runner specification
998998

999-
Set the Scala version (3.4.2 by default)
999+
Set the Scala version (3.5.0 by default)
10001000

10011001
### `--scala-binary-version`
10021002

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.4.2 by default)
95+
Set the Scala version (3.5.0 by default)
9696

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

@@ -861,7 +861,7 @@ Aliases: `-P` ,`--plugin`
861861

862862
**--scala-version**
863863

864-
Set the Scala version (3.4.2 by default)
864+
Set the Scala version (3.5.0 by default)
865865

866866
Aliases: `-S` ,`--scala`
867867

@@ -1450,7 +1450,7 @@ Aliases: `-P` ,`--plugin`
14501450

14511451
**--scala-version**
14521452

1453-
Set the Scala version (3.4.2 by default)
1453+
Set the Scala version (3.5.0 by default)
14541454

14551455
Aliases: `-S` ,`--scala`
14561456

@@ -2059,7 +2059,7 @@ Aliases: `-P` ,`--plugin`
20592059

20602060
**--scala-version**
20612061

2062-
Set the Scala version (3.4.2 by default)
2062+
Set the Scala version (3.5.0 by default)
20632063

20642064
Aliases: `-S` ,`--scala`
20652065

@@ -2687,7 +2687,7 @@ Aliases: `-P` ,`--plugin`
26872687

26882688
**--scala-version**
26892689

2690-
Set the Scala version (3.4.2 by default)
2690+
Set the Scala version (3.5.0 by default)
26912691

26922692
Aliases: `-S` ,`--scala`
26932693

@@ -3303,7 +3303,7 @@ Aliases: `-P` ,`--plugin`
33033303

33043304
**--scala-version**
33053305

3306-
Set the Scala version (3.4.2 by default)
3306+
Set the Scala version (3.5.0 by default)
33073307

33083308
Aliases: `-S` ,`--scala`
33093309

@@ -3938,7 +3938,7 @@ Aliases: `-P` ,`--plugin`
39383938

39393939
**--scala-version**
39403940

3941-
Set the Scala version (3.4.2 by default)
3941+
Set the Scala version (3.5.0 by default)
39423942

39433943
Aliases: `-S` ,`--scala`
39443944

@@ -4636,7 +4636,7 @@ Aliases: `-P` ,`--plugin`
46364636

46374637
**--scala-version**
46384638

4639-
Set the Scala version (3.4.2 by default)
4639+
Set the Scala version (3.5.0 by default)
46404640

46414641
Aliases: `-S` ,`--scala`
46424642

@@ -5569,7 +5569,7 @@ Aliases: `-P` ,`--plugin`
55695569

55705570
**--scala-version**
55715571

5572-
Set the Scala version (3.4.2 by default)
5572+
Set the Scala version (3.5.0 by default)
55735573

55745574
Aliases: `-S` ,`--scala`
55755575

website/docs/reference/scala-versions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ it is recommended to update scala-cli.
2424
| 1.2.0 - 1.2.1 | 3.4.0 | 2.13.13 | 2.12.19 |
2525
| 1.2.1 - 1.3.0 | 3.4.1 | 2.13.13 | 2.12.19 |
2626
| 1.3.1 | 3.4.1 | 2.13.14 | 2.12.19 |
27-
| 1.3.2 - current | 3.4.2 | 2.13.14 | 2.12.19 |
27+
| 1.3.2 - 1.4.3 | 3.4.2 | 2.13.14 | 2.12.19 |
28+
| 1.5.0 - current | 3.5.0 | 2.13.14 | 2.12.19 |
2829

0 commit comments

Comments
 (0)