Skip to content

Commit adcfb05

Browse files
committed
build and test against scala 3.7.0
1 parent b2e3121 commit adcfb05

File tree

9 files changed

+24
-8
lines changed

9 files changed

+24
-8
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.16
88
scala3LTS=3.3.5
9-
scala3Next=3.6.4
9+
scala3Next=3.7.0
1010

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

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ lazy val properties = project
3535
props.put("scala33", scala33)
3636
props.put("scala35", scala35)
3737
props.put("scala36", scala36)
38+
props.put("scala37", scala37)
3839
props.put("scala3LTS", scala3LTS)
3940
props.put("scala3Next", scala3Next)
4041
val out =

project/Dependencies.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ object Dependencies {
1010
val scala33 = "3.3.5"
1111
val scala35 = "3.5.2"
1212
val scala36 = "3.6.4"
13+
val scala37 = "3.7.0"
1314
val scala3LTS = scala33
14-
val scala3Next = sys.props.getOrElse("scala3.nightly", scala36)
15+
val scala3Next = sys.props.getOrElse("scala3.nightly", scala37)
1516

1617
val bijectionCoreV = "0.9.8"
1718
val collectionCompatV = "2.13.0"

project/Mima.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ object Mima {
1212
ProblemFilters.exclude[DirectMissingMethodProblem]("scalafix.v0.Signature#Self.syntax"),
1313
ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.Scalafix.scala33"),
1414
ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.Scalafix.scala35"),
15-
ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.Scalafix.scala36")
15+
ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.Scalafix.scala36"),
16+
ProblemFilters.exclude[ReversedMissingMethodProblem]("scalafix.interfaces.Scalafix.scala37")
1617
)
1718
}
1819
}

project/ScalafixBuild.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
3737
val jdk = System.getProperty("java.specification.version").toDouble
3838
val scala3Versions =
3939
// Scala 3.5 will never support JDK 23
40-
if (jdk >= 23) Seq(scala33, scala36)
41-
else Seq(scala33, scala35, scala36)
40+
if (jdk >= 23) Seq(scala33, scala36, scala37)
41+
else Seq(scala33, scala35, scala36, scala37)
4242
(coreScalaVersions ++ scala3Versions :+ scala3Next).distinct
4343
}
4444
lazy val cliScalaVersionsWithTargets: Seq[(String, TargetAxis)] =
@@ -144,6 +144,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
144144
"scala33" -> scala33,
145145
"scala35" -> scala35,
146146
"scala36" -> scala36,
147+
"scala37" -> scala37,
147148
"scala3LTS" -> scala3LTS,
148149
"scala3Next" -> scala3Next,
149150
sbtVersion
@@ -239,7 +240,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
239240
)
240241

241242
private val PreviousScalaVersion: Map[String, Option[String]] = Map(
242-
"3.6.4" -> Some("3.6.3")
243+
"3.6.4" -> Some("3.6.3"),
244+
scala37 -> None
243245
)
244246

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

scalafix-cli/src/main/scala/scalafix/internal/interfaces/ScalafixImpl.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ final class ScalafixImpl extends Scalafix {
4040
Versions.scala35
4141
override def scala36(): String =
4242
Versions.scala36
43+
override def scala37(): String =
44+
Versions.scala37
4345
override def scala3LTS(): String =
4446
Versions.scala3LTS
4547
override def scala3Next(): String =

scalafix-interfaces/src/main/java/scalafix/interfaces/Scalafix.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ public interface Scalafix {
8585
*/
8686
String scala36();
8787

88+
/**
89+
* The Scala 3.7 version in {@link #supportedScalaVersions()}
90+
*/
91+
String scala37();
92+
8893
/**
8994
* The Scala 3 LTS version in {@link #supportedScalaVersions()}
9095
*/
@@ -155,6 +160,8 @@ static Scalafix fetchAndClassloadInstance(String requestedScalaVersion, List<Rep
155160
scalaVersionKey = "scala35";
156161
} else if (requestedScalaMajorMinorOrMajorVersion.equals("3.6")) {
157162
scalaVersionKey = "scala36";
163+
} else if (requestedScalaMajorMinorOrMajorVersion.equals("3.7")) {
164+
scalaVersionKey = "scala37";
158165
} else if (requestedScalaMajorMinorOrMajorVersion.startsWith("3")) {
159166
scalaVersionKey = "scala3Next";
160167
} else {

scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixSuite.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class ScalafixSuite extends AnyFunSuite {
4848
assert(api.scala33() == Versions.scala33)
4949
assert(api.scala35() == Versions.scala35)
5050
assert(api.scala36() == Versions.scala36)
51+
assert(api.scala37() == Versions.scala37)
5152
assert(api.scala3LTS() == Versions.scala3LTS)
5253
assert(api.scala3Next() == Versions.scala3Next)
5354
assert(
@@ -131,12 +132,12 @@ class ScalafixSuite extends AnyFunSuite {
131132
}
132133

133134
test("classload Scala 3 Next with full version") {
134-
val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.6.2", repositories)
135+
val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.7.0", repositories)
135136
assert(scalafixAPI.scalaVersion() == Versions.scala3Next)
136137
}
137138

138139
test("classload Scala 3 Next with major.minor version") {
139-
val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.6", repositories)
140+
val scalafixAPI = Scalafix.fetchAndClassloadInstance("3.7", repositories)
140141
assert(scalafixAPI.scalaVersion() == Versions.scala3Next)
141142
}
142143

scalafix-tests/unit/src/test/scala/scalafix/tests/cli/InterfacesPropertiesSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class InterfacesPropertiesSuite extends AnyFunSuite with BeforeAndAfterAll {
2828
check("scala33", Versions.scala33)
2929
check("scala35", Versions.scala35)
3030
check("scala36", Versions.scala36)
31+
check("scala37", Versions.scala37)
3132
check("scala3LTS", Versions.scala3LTS)
3233
check("scala3Next", Versions.scala3Next)
3334

0 commit comments

Comments
 (0)