Skip to content

Commit 24252dc

Browse files
committed
Bump Scala 3 Next RC to 3.8.4-RC3
1 parent 27f0821 commit 24252dc

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

modules/build/src/test/scala/scala/build/tests/SourceGeneratorTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import scala.Console.println
66
import scala.build.Ops.EitherThrowOps
77
import scala.build.options.{BuildOptions, InternalOptions}
88
import scala.build.tests.util.BloopServer
9-
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position}
9+
import scala.build.{Build, BuildThreads, Directories, LocalRepo}
1010

1111
class SourceGeneratorTests extends TestUtil.ScalaCliBuildSuite {
1212

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ trait FixScalafixRulesTestDefinitions {
262262
}
263263
}
264264

265-
test("explicit-result-types") {
265+
def explicitResultTypes() = {
266266
val original: String =
267267
"""|package foo
268268
|
@@ -295,6 +295,16 @@ trait FixScalafixRulesTestDefinitions {
295295
}
296296
}
297297

298+
if actualScalaVersion.contains("RC")
299+
then // seems to be a no-op for 3.8.4-RC3, specifically
300+
test("explicit-result-types".flaky) {
301+
explicitResultTypes()
302+
}
303+
else
304+
test("explicit-result-types") {
305+
explicitResultTypes()
306+
}
307+
298308
for {
299309
(semanticDbOptions, expectedSuccess) <- Seq(
300310
Nil -> true, // .semanticdb files should be implicitly generated when Scalafix is run

project/deps/package.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object Scala {
2121
def scala3NextPrefix = "3.8"
2222
def scala3Next = s"$scala3NextPrefix.3" // the newest/next version of Scala
2323
def scala3NextAnnounced = s"$scala3NextPrefix.2" // the newest/next version of Scala that's been announced
24-
def scala3NextRc = "3.8.4-RC2" // the latest RC version of Scala Next
24+
def scala3NextRc = "3.8.4-RC3" // the latest RC version of Scala Next
2525
def scala3NextRcAnnounced = "3.8.4-RC2" // the latest announced RC version of Scala Next
2626

2727
// The Scala version used to build the CLI itself.

0 commit comments

Comments
 (0)