Skip to content

Commit 61cc86c

Browse files
authored
Fix Scala 2.13 nightly tests (#4063)
1 parent c903bbe commit 61cc86c

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

build.mill.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,6 @@ trait CliIntegration extends SbtModule
10531053
| def defaultJvmVersion = ${Java.defaultJava}
10541054
| def scala212 = "${Scala.scala212}"
10551055
| def scala213 = "${Scala.scala213}"
1056-
| def scalaSnapshot213 = "${TestDeps.scalaSnapshot213}"
10571056
| def scala3LtsPrefix = "${Scala.scala3LtsPrefix}"
10581057
| def scala3Lts = "${Scala.scala3Lts}"
10591058
| def scala3NextPrefix = "${Scala.scala3NextPrefix}"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package scala.cli.integration
33
class ReplTests213 extends ReplTestDefinitions with ReplAmmoniteTestDefinitions with Test213 {
44
for {
55
withExplicitScala2SnapshotRepo <- Seq(true, false)
6-
snapshotVersion = Constants.scalaSnapshot213
7-
scalaVersionOptions = Seq("--scala", snapshotVersion)
6+
nightlyVersion = "2.13.nightly"
7+
scalaVersionOptions = Seq("--scala", nightlyVersion)
88
repoOptions =
99
if withExplicitScala2SnapshotRepo then
1010
Seq(
@@ -15,7 +15,7 @@ class ReplTests213 extends ReplTestDefinitions with ReplAmmoniteTestDefinitions
1515
Seq.empty
1616
repoString = if withExplicitScala2SnapshotRepo then " with Scala 2 snapshot repo" else ""
1717
}
18-
test(s"$dryRunPrefix repl Scala 2 snapshots: $snapshotVersion$repoString") {
18+
test(s"$dryRunPrefix repl Scala 2 snapshots: $nightlyVersion$repoString") {
1919
dryRun(
2020
cliOptions = scalaVersionOptions ++ repoOptions,
2121
useExtraOptions = false

project/deps/package.mill.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,8 @@ object Java {
109109

110110
// Dependencies used in integration test fixtures
111111
object TestDeps {
112-
def pprint: Dep = Deps.pprint
113-
def munit: Dep = Deps.munit
114-
def scalaSnapshot213: String = "2.13.19-bin-efb7184"
112+
def pprint: Dep = Deps.pprint
113+
def munit: Dep = Deps.munit
115114

116115
def archLinuxImage: String =
117116
"archlinux@sha256:b15db21228c7cd5fd3ab364a97193ba38abfad0e8b9593c15b71850b74738153"

0 commit comments

Comments
 (0)