Skip to content

Commit d4afcd1

Browse files
committed
build with and test against Scala 3.6
Keep building for Scala 3.5 until the next minor version for backward compatibility.
1 parent 17d3fd7 commit d4afcd1

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

project/Dependencies.scala

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ import sbt._
77
object Dependencies {
88
val scala212 = sys.props.getOrElse("scala212.nightly", "2.12.20")
99
val scala213 = sys.props.getOrElse("scala213.nightly", "2.13.15")
10-
val scala3Next = sys.props.getOrElse("scala3.nightly", "3.5.1")
11-
val scala3LTS = "3.3.4"
10+
val scala36 = sys.props.getOrElse("scala3.nightly", "3.6.0")
11+
val scala35 = "3.5.1"
12+
val scala33 = "3.3.4"
13+
14+
val scala3Next = scala36
15+
val scala3LTS = scala33
1216

1317
val bijectionCoreV = "0.9.7"
1418
val collectionCompatV = "2.12.0"

project/ScalafixBuild.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
3333

3434
// https://github.com/scalameta/scalameta/issues/2485
3535
lazy val coreScalaVersions = Seq(scala212, scala213)
36-
lazy val cliScalaVersions = Seq(scala212, scala213, scala3LTS, scala3Next)
36+
lazy val cliScalaVersions =
37+
Seq(scala212, scala213, scala33, scala35, scala36)
3738
lazy val cliScalaVersionsWithTargets: Seq[(String, TargetAxis)] =
3839
cliScalaVersions.map(sv => (sv, TargetAxis(sv))) ++
3940
Seq(scala213, scala212).flatMap { sv =>
@@ -279,6 +280,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
279280
Compile / console / scalacOptions :=
280281
compilerOptions.value :+ "-Yrepl-class-based",
281282
Compile / doc / scalacOptions ++= scaladocOptions,
283+
// TODO: tweak unmanagedSourceDirectories to support scala-3.3 directory
282284
// Don't package sources & docs when publishing locally as it adds a significant
283285
// overhead when testing because of publishLocalTransitive. Tweaking publishArtifact
284286
// would more readable, but it would also affect remote (sonatype) publishing.

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

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ static Scalafix fetchAndClassloadInstance(String requestedScalaVersion, List<Rep
135135
requestedScalaMajorMinorOrMajorVersion.equals("3.1") ||
136136
requestedScalaMajorMinorOrMajorVersion.equals("3.2") ||
137137
requestedScalaMajorMinorOrMajorVersion.equals("3.3")) {
138+
// TODO: support Scala 3.5
138139
scalaVersionKey = "scala3LTS";
139140
} else if (requestedScalaMajorMinorOrMajorVersion.startsWith("3")) {
140141
scalaVersionKey = "scala3Next";

0 commit comments

Comments
 (0)