Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f19180a

Browse files
committedNov 4, 2024
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 f19180a

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
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

+6-2
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 =>
@@ -244,7 +245,9 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
244245
// https://github.com/scalacenter/scalafix/pull/2025#issuecomment-2264188708
245246
"com.geirsson" %% "metaconfig-core",
246247
"com.geirsson" %% "metaconfig-pprint",
247-
"com.geirsson" %% "metaconfig-typesafe-config"
248+
"com.geirsson" %% "metaconfig-typesafe-config",
249+
// Scala 3 compiler
250+
"org.scala-lang.modules" %% "scala-asm"
248251
),
249252
versionPolicyIgnoredInternalDependencyVersions :=
250253
Some("^\\d+\\.\\d+\\.\\d+\\+\\d+".r),
@@ -279,6 +282,7 @@ object ScalafixBuild extends AutoPlugin with GhpagesKeys {
279282
Compile / console / scalacOptions :=
280283
compilerOptions.value :+ "-Yrepl-class-based",
281284
Compile / doc / scalacOptions ++= scaladocOptions,
285+
// TODO: tweak unmanagedSourceDirectories to support scala-3.3 directory
282286
// Don't package sources & docs when publishing locally as it adds a significant
283287
// overhead when testing because of publishLocalTransitive. Tweaking publishArtifact
284288
// 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)
Please sign in to comment.