Skip to content

Commit f4eecac

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

File tree

6 files changed

+15
-142
lines changed

6 files changed

+15
-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

project/ScalafixBuild.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
241241
)
242242

243243
private val PreviousScalaVersion: Map[String, Option[String]] = Map(
244+
scala37 -> Some("3.7.3")
244245
)
245246

246247
override def buildSettings: Seq[Setting[_]] = List(

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: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,18 @@ trait ExpectSuite extends AnyFunSuite with DiffAssertions {
1515
def obtained(): String
1616

1717
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")
18+
def expectedPath(suffix: String) =
19+
AbsolutePath(s"${BuildInfo.resourceDirectory}-${suffix}")
20+
.resolve("expect")
21+
.resolve(filename.stripSuffix("Test.scala") + ".expect")
22+
23+
val versionPrefixesLongestFirst =
24+
BuildInfo.scalaVersion.split("\\.").inits.map(_.mkString("."))
25+
26+
versionPrefixesLongestFirst
27+
.map(expectedPath)
28+
.find(_.toFile.exists())
29+
.get
2330
}
2431
final implicit lazy val sdoc: SemanticDocument =
2532
BaseSemanticSuite.loadDoc(filename)

0 commit comments

Comments
 (0)