Skip to content

Commit 8782247

Browse files
GedochaoGedochao
committed
Update Scala to 3.4.0
1 parent 6b7a100 commit 8782247

File tree

8 files changed

+51
-16
lines changed

8 files changed

+51
-16
lines changed

‎build.sc

+3
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,9 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
955955
| def scala3 = "${Scala.scala3}"
956956
| def defaultScala = "${Scala.defaultUser}"
957957
| def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
958+
| def maxAmmoniteScala212Version = "${Scala.maxAmmoniteScala212Version}"
959+
| def maxAmmoniteScala213Version = "${Scala.maxAmmoniteScala213Version}"
960+
| def maxAmmoniteScala3Version = "${Scala.maxAmmoniteScala3Version}"
958961
| def scalaJsVersion = "${Scala.scalaJs}"
959962
| def scalaJsCliVersion = "${Scala.scalaJsCli}"
960963
| def scalaNativeVersion = "${Deps.nativeTools.dep.version}"

‎modules/integration/src/test/scala/scala/cli/integration/ReplTestDefinitions.scala

+27-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@ abstract class ReplTestDefinitions(val scalaVersionOpt: Option[String])
1414
"scala.util.Properties.versionNumberString"
1515
else "dotty.tools.dotc.config.Properties.simpleVersionString"
1616

17+
def expectedAmmoniteVersion: String =
18+
actualScalaVersion match {
19+
case s
20+
if s.startsWith("2.12") &&
21+
Constants.maxAmmoniteScala212Version.coursierVersion < s.coursierVersion =>
22+
Constants.maxAmmoniteScala212Version
23+
case s
24+
if s.startsWith("2.13") &&
25+
Constants.maxAmmoniteScala213Version.coursierVersion < s.coursierVersion =>
26+
Constants.maxAmmoniteScala213Version
27+
case s
28+
if s.startsWith("3") &&
29+
Constants.maxAmmoniteScala3Version.coursierVersion < s.coursierVersion =>
30+
Constants.maxAmmoniteScala3Version
31+
case s => s
32+
}
33+
1734
test("default dry run") {
1835
TestInputs.empty.fromRoot { root =>
1936
os.proc(TestUtil.cli, "repl", extraOptions, "--repl-dry-run").call(cwd = root)
@@ -38,7 +55,7 @@ abstract class ReplTestDefinitions(val scalaVersionOpt: Option[String])
3855
root
3956
)
4057
val output = res.out.trim()
41-
expect(output == s"Hello from Scala $actualScalaVersion")
58+
expect(output == s"Hello from Scala $expectedAmmoniteVersion")
4259
}
4360
}
4461

@@ -97,7 +114,15 @@ abstract class ReplTestDefinitions(val scalaVersionOpt: Option[String])
97114
ammArgs
98115
).call(cwd = root)
99116
val lines = res.out.trim().linesIterator.toVector
100-
expect(lines == Seq(s"Hello from Scala $actualScalaVersion", "Hello from ScalaPy"))
117+
val actualMaxAmmoniteVersion =
118+
if (actualScalaVersion.startsWith("2.12")) Constants.maxAmmoniteScala212Version
119+
else if (actualScalaVersion.startsWith("2.12")) Constants.maxAmmoniteScala213Version
120+
else Constants.maxAmmoniteScala3Version
121+
val expectedAmmoniteVersion =
122+
if (actualMaxAmmoniteVersion.coursierVersion < actualScalaVersion.coursierVersion)
123+
actualMaxAmmoniteVersion
124+
else actualScalaVersion
125+
expect(lines == Seq(s"Hello from Scala $expectedAmmoniteVersion", "Hello from ScalaPy"))
101126
}
102127
}
103128

‎modules/integration/src/test/scala/scala/cli/integration/package.scala

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package scala.cli
22

3+
import coursier.core.Version
4+
35
import java.util.concurrent.CompletableFuture
46

57
import scala.concurrent.{Future, Promise}
@@ -20,4 +22,8 @@ package object integration {
2022
}
2123
}
2224

25+
implicit class VersionString(private val s: String) {
26+
def coursierVersion: Version = Version(s)
27+
}
28+
2329
}

‎project/deps.sc

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object Scala {
44
def scala212 = "2.12.18"
55
def scala213 = "2.13.12"
66
def runnerScala3 = "3.0.2" // the newest version that is compatible with all Scala 3.x versions
7-
def scala3 = "3.3.1"
7+
def scala3 = "3.4.0"
88
def scala3Lts = "3.3" // the full version should be resolved later
99

1010
// The Scala version used to build the CLI itself.
@@ -41,7 +41,7 @@ object Scala {
4141

4242
def maxAmmoniteScala212Version = scala212
4343
def maxAmmoniteScala213Version = scala213
44-
def maxAmmoniteScala3Version = scala3
44+
def maxAmmoniteScala3Version = "3.3.1"
4545
lazy val listMaxAmmoniteScalaVersion =
4646
Seq(maxAmmoniteScala212Version, maxAmmoniteScala213Version, maxAmmoniteScala3Version)
4747
lazy val listAllAmmonite = {

‎website/docs/reference/cli-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1469,7 +1469,7 @@ Available in commands:
14691469

14701470
Aliases: `-S`, `--scala`
14711471

1472-
Set the Scala version (3.3.1 by default)
1472+
Set the Scala version (3.4.0 by default)
14731473

14741474
### `--scala-binary-version`
14751475

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

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

955955
`MUST have` per Scala Runner specification
956956

957-
Set the Scala version (3.3.1 by default)
957+
Set the Scala version (3.4.0 by default)
958958

959959
### `--scala-binary-version`
960960

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Aliases: `-P` ,`--plugin`
8686

8787
**--scala-version**
8888

89-
Set the Scala version (3.3.1 by default)
89+
Set the Scala version (3.4.0 by default)
9090

9191
Aliases: `-S` ,`--scala`
9292

@@ -835,7 +835,7 @@ Aliases: `-P` ,`--plugin`
835835

836836
**--scala-version**
837837

838-
Set the Scala version (3.3.1 by default)
838+
Set the Scala version (3.4.0 by default)
839839

840840
Aliases: `-S` ,`--scala`
841841

@@ -1406,7 +1406,7 @@ Aliases: `-P` ,`--plugin`
14061406

14071407
**--scala-version**
14081408

1409-
Set the Scala version (3.3.1 by default)
1409+
Set the Scala version (3.4.0 by default)
14101410

14111411
Aliases: `-S` ,`--scala`
14121412

@@ -1991,7 +1991,7 @@ Aliases: `-P` ,`--plugin`
19911991

19921992
**--scala-version**
19931993

1994-
Set the Scala version (3.3.1 by default)
1994+
Set the Scala version (3.4.0 by default)
19951995

19961996
Aliases: `-S` ,`--scala`
19971997

@@ -2601,7 +2601,7 @@ Aliases: `-P` ,`--plugin`
26012601

26022602
**--scala-version**
26032603

2604-
Set the Scala version (3.3.1 by default)
2604+
Set the Scala version (3.4.0 by default)
26052605

26062606
Aliases: `-S` ,`--scala`
26072607

@@ -3199,7 +3199,7 @@ Aliases: `-P` ,`--plugin`
31993199

32003200
**--scala-version**
32013201

3202-
Set the Scala version (3.3.1 by default)
3202+
Set the Scala version (3.4.0 by default)
32033203

32043204
Aliases: `-S` ,`--scala`
32053205

@@ -3816,7 +3816,7 @@ Aliases: `-P` ,`--plugin`
38163816

38173817
**--scala-version**
38183818

3819-
Set the Scala version (3.3.1 by default)
3819+
Set the Scala version (3.4.0 by default)
38203820

38213821
Aliases: `-S` ,`--scala`
38223822

@@ -4496,7 +4496,7 @@ Aliases: `-P` ,`--plugin`
44964496

44974497
**--scala-version**
44984498

4499-
Set the Scala version (3.3.1 by default)
4499+
Set the Scala version (3.4.0 by default)
45004500

45014501
Aliases: `-S` ,`--scala`
45024502

@@ -5401,7 +5401,7 @@ Aliases: `-P` ,`--plugin`
54015401

54025402
**--scala-version**
54035403

5404-
Set the Scala version (3.3.1 by default)
5404+
Set the Scala version (3.4.0 by default)
54055405

54065406
Aliases: `-S` ,`--scala`
54075407

‎website/docs/reference/scala-versions.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@ it is recommended to update scala-cli.
2020
| 0.1.20 - 1.0.0-RC2 | 3.2.2 | 2.13.10 | 2.12.17 |
2121
| 1.0.0 - 1.0.1 | 3.3.0 | 2.13.10 | 2.12.17 |
2222
| 1.0.1 - 1.0.4 | 3.3.0 | 2.13.11 | 2.12.18 |
23-
| 1.0.5 - current | 3.3.1 | 2.13.12 | 2.12.18 |
23+
| 1.0.5 - 1.1.3 | 3.3.1 | 2.13.12 | 2.12.18 |
24+
| 1.2.0 - current | 3.4.0 | 2.13.12 | 2.12.18 |
2425

0 commit comments

Comments
 (0)