Skip to content

Commit 8650e59

Browse files
committed
Bump Scala 3 Next to 3.7.0
1 parent b80cf3e commit 8650e59

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

project/deps.sc

+9-7
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ 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.5" // the LTS version currently used in the build
11-
def scala3NextPrefix = "3.6"
12-
def scala3Next = s"$scala3NextPrefix.4" // the newest/next version of Scala
13-
def scala3NextAnnounced = scala3Next // the newest/next version of Scala that's been announced
14-
def scala3NextRc = "3.7.0-RC4" // the latest RC version of Scala Next
15-
def scala3NextRcAnnounced = "3.7.0-RC3" // the latest announced RC version of Scala Next
11+
def scala3NextPrefix = "3.7"
12+
def scala3Next = s"$scala3NextPrefix.0" // the newest/next version of Scala
13+
def scala3NextAnnounced = "3.6.4" // the newest/next version of Scala that's been announced
14+
def scala3NextRc = "3.7.0-RC4" // the latest RC version of Scala Next
15+
def scala3NextRcAnnounced = scala3NextRc // the latest announced RC version of Scala Next
1616

1717
// The Scala version used to build the CLI itself.
1818
def defaultInternal = sys.props.get("scala.version.internal").getOrElse(scala3Lts)
@@ -43,7 +43,8 @@ object Scala {
4343
val max33 = patchVer(scala3Lts)
4444
val max34 = 3
4545
val max35 = 2
46-
val max36 = patchVer(scala3Next)
46+
val max36 = 4
47+
val max37 = patchVer(scala3Next)
4748
(8 until max212).map(i => s"2.12.$i") ++ Seq(scala212) ++
4849
(0 until max213).map(i => s"2.13.$i") ++ Seq(scala213) ++
4950
(0 to max30).map(i => s"3.0.$i") ++
@@ -52,7 +53,8 @@ object Scala {
5253
(0 to max33).map(i => s"3.3.$i") ++
5354
(0 to max34).map(i => s"3.4.$i") ++
5455
(0 to max35).map(i => s"3.5.$i") ++
55-
(0 until max36).map(i => s"3.6.$i") ++ Seq(scala3Next)
56+
(0 to max36).map(i => s"3.6.$i") ++
57+
(0 until max37).map(i => s"3.7.$i") ++ Seq(scala3Next)
5658
}
5759

5860
def maxAmmoniteScala212Version = scala212

website/docs/reference/cli-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ Available in commands:
15891589

15901590
Aliases: `-S`, `--scala`
15911591

1592-
Set the Scala version (3.6.4 by default)
1592+
Set the Scala version (3.7.0 by default)
15931593

15941594
### `--scala-binary-version`
15951595

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ Aliases: `-S`, `--scala`
10041004

10051005
`MUST have` per Scala Runner specification
10061006

1007-
Set the Scala version (3.6.4 by default)
1007+
Set the Scala version (3.7.0 by default)
10081008

10091009
### `--scala-binary-version`
10101010

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

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

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

@@ -874,7 +874,7 @@ Aliases: `-P` ,`--plugin`
874874

875875
**--scala-version**
876876

877-
Set the Scala version (3.6.4 by default)
877+
Set the Scala version (3.7.0 by default)
878878

879879
Aliases: `-S` ,`--scala`
880880

@@ -1475,7 +1475,7 @@ Aliases: `-P` ,`--plugin`
14751475

14761476
**--scala-version**
14771477

1478-
Set the Scala version (3.6.4 by default)
1478+
Set the Scala version (3.7.0 by default)
14791479

14801480
Aliases: `-S` ,`--scala`
14811481

@@ -2090,7 +2090,7 @@ Aliases: `-P` ,`--plugin`
20902090

20912091
**--scala-version**
20922092

2093-
Set the Scala version (3.6.4 by default)
2093+
Set the Scala version (3.7.0 by default)
20942094

20952095
Aliases: `-S` ,`--scala`
20962096

@@ -2730,7 +2730,7 @@ Aliases: `-P` ,`--plugin`
27302730

27312731
**--scala-version**
27322732

2733-
Set the Scala version (3.6.4 by default)
2733+
Set the Scala version (3.7.0 by default)
27342734

27352735
Aliases: `-S` ,`--scala`
27362736

@@ -3358,7 +3358,7 @@ Aliases: `-P` ,`--plugin`
33583358

33593359
**--scala-version**
33603360

3361-
Set the Scala version (3.6.4 by default)
3361+
Set the Scala version (3.7.0 by default)
33623362

33633363
Aliases: `-S` ,`--scala`
33643364

@@ -4005,7 +4005,7 @@ Aliases: `-P` ,`--plugin`
40054005

40064006
**--scala-version**
40074007

4008-
Set the Scala version (3.6.4 by default)
4008+
Set the Scala version (3.7.0 by default)
40094009

40104010
Aliases: `-S` ,`--scala`
40114011

@@ -4724,7 +4724,7 @@ Aliases: `-P` ,`--plugin`
47244724

47254725
**--scala-version**
47264726

4727-
Set the Scala version (3.6.4 by default)
4727+
Set the Scala version (3.7.0 by default)
47284728

47294729
Aliases: `-S` ,`--scala`
47304730

@@ -5693,7 +5693,7 @@ Aliases: `-P` ,`--plugin`
56935693

56945694
**--scala-version**
56955695

5696-
Set the Scala version (3.6.4 by default)
5696+
Set the Scala version (3.7.0 by default)
56975697

56985698
Aliases: `-S` ,`--scala`
56995699

website/docs/reference/scala-versions.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@ it is recommended to update scala-cli.
2929
| 1.5.1 | 3.5.1 | 2.13.15 | 2.12.20 |
3030
| 1.5.2 - 1.5.4 | 3.5.2 | 2.13.15 | 2.12.20 |
3131
| 1.6.0 - 1.7.0 | 3.6.3 | 2.13.16 | 2.12.20 |
32-
| 1.7.1 - current | 3.6.4 | 2.13.16 | 2.12.20 |
32+
| 1.7.1 | 3.6.4 | 2.13.16 | 2.12.20 |
33+
| 1.8.0 - current | 3.7.0 | 2.13.16 | 2.12.20 |
3334

0 commit comments

Comments
 (0)