Skip to content

Commit 46ba805

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

File tree

4 files changed

+14
-150
lines changed

4 files changed

+14
-150
lines changed

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.3/expect/Pretty.expect

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

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,25 @@ 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+
val versionPrefixesLongestFirst =
25+
BuildInfo.scalaVersion.split("\\.").inits.map(_.mkString("."))
26+
27+
versionPrefixesLongestFirst
28+
.map(expectedPath)
29+
.find(_.toFile.exists())
30+
.get
2331
}
2432
final implicit lazy val sdoc: SemanticDocument =
2533
BaseSemanticSuite.loadDoc(filename)

0 commit comments

Comments
 (0)