Skip to content

Commit ae9b2c2

Browse files
committed
build and test against 3.7.4
1 parent 57e2c03 commit ae9b2c2

File tree

5 files changed

+17
-142
lines changed

5 files changed

+17
-142
lines changed

bin/test-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version=$1
66
scala212=2.12.20
77
scala213=2.13.17
88
scala3LTS=3.3.7
9-
scala3Next=3.7.3
9+
scala3Next=3.7.4
1010

1111
cs resolve \
1212
ch.epfl.scala:scalafix-interfaces:$version \

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object Dependencies {
1111
val scala33 = "3.3.7"
1212
val scala35 = "3.5.2"
1313
val scala36 = "3.6.4"
14-
val scala37 = "3.7.3"
14+
val scala37 = "3.7.4-RC3"
1515
val scala3LTS = scala33
1616
val scala3Next = sys.props.getOrElse("scala3.nightly", scala37)
1717

scalafix-tests/integration/src/main/resources-3.7/expect/Pretty.expect

Lines changed: 0 additions & 135 deletions
This file was deleted.

scalafix-tests/integration/src/test/scala/scalafix/tests/util/ExpectSuite.scala

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,27 @@ import scalafix.testkit.DiffAssertions
99
import scalafix.tests.BuildInfo
1010
import scalafix.tests.core.BaseSemanticSuite
1111
import scalafix.v1.SemanticDocument
12+
import scala.meta.internal.javacp.BaseType.S
1213

1314
trait ExpectSuite extends AnyFunSuite with DiffAssertions {
1415
def filename: String
1516
def obtained(): String
1617

1718
final def path: AbsolutePath = {
18-
val scalaMajorMinorVersion =
19-
BuildInfo.scalaVersion.split('.').take(2).mkString(".")
20-
AbsolutePath(s"${BuildInfo.resourceDirectory}-${scalaMajorMinorVersion}")
21-
.resolve("expect")
22-
.resolve(filename.stripSuffix("Test.scala") + ".expect")
19+
def expectedPath(suffix: String) =
20+
AbsolutePath(s"${BuildInfo.resourceDirectory}-${suffix}")
21+
.resolve("expect")
22+
.resolve(filename.stripSuffix("Test.scala") + ".expect")
23+
24+
// Seq("x.y.z", "x.y", "x")
25+
val versions: Seq[String] = BuildInfo.scalaVersion
26+
.split("\\.")
27+
.inits
28+
.toSeq
29+
.init
30+
.map(_.mkString("."))
31+
32+
versions.map(expectedPath).find(_.toFile.exists()).get
2333
}
2434
final implicit lazy val sdoc: SemanticDocument =
2535
BaseSemanticSuite.loadDoc(filename)

0 commit comments

Comments
 (0)