Skip to content

build and test against 3.7.4 #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2025
Merged

build and test against 3.7.4 #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/test-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version=$1
scala212=2.12.20
scala213=2.13.17
scala3LTS=3.3.7
scala3Next=3.7.3
scala3Next=3.7.4

cs resolve \
ch.epfl.scala:scalafix-interfaces:$version \
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Dependencies {
val scala33 = "3.3.7"
val scala35 = "3.5.2"
val scala36 = "3.6.4"
val scala37 = "3.7.3"
val scala37 = "3.7.4"
val scala3LTS = scala33
val scala3Next = sys.props.getOrElse("scala3.nightly", scala37)

Expand Down
1 change: 1 addition & 0 deletions project/ScalafixBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
)

private val PreviousScalaVersion: Map[String, Option[String]] = Map(
scala37 -> Some("3.7.3")
)

override def buildSettings: Seq[Setting[_]] = List(
Expand Down
135 changes: 0 additions & 135 deletions scalafix-tests/integration/src/main/resources-3.7/expect/Pretty.expect
View file
Open in desktop

This file was deleted.

0 ...c/main/resources-3.3/expect/Pretty.expect → ...src/main/resources-3/expect/Pretty.expect
View file
Open in desktop
File renamed without changes.
17 changes: 12 additions & 5 deletions scalafix-tests/integration/src/test/scala/scalafix/tests/util/ExpectSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@ trait ExpectSuite extends AnyFunSuite with DiffAssertions {
def obtained(): String

final def path: AbsolutePath = {
val scalaMajorMinorVersion =
BuildInfo.scalaVersion.split('.').take(2).mkString(".")
AbsolutePath(s"${BuildInfo.resourceDirectory}-${scalaMajorMinorVersion}")
.resolve("expect")
.resolve(filename.stripSuffix("Test.scala") + ".expect")
def expectedPath(suffix: String) =
AbsolutePath(s"${BuildInfo.resourceDirectory}-${suffix}")
.resolve("expect")
.resolve(filename.stripSuffix("Test.scala") + ".expect")

val versionPrefixesLongestFirst =
BuildInfo.scalaVersion.split("\\.").inits.map(_.mkString("."))

versionPrefixesLongestFirst
.map(expectedPath)
.find(_.toFile.exists())
.get
}
final implicit lazy val sdoc: SemanticDocument =
BaseSemanticSuite.loadDoc(filename)
Expand Down