Skip to content

Commit 8faa13e

Browse files
committed
Ensure Scalafix respects Scala version passed via directive
1 parent ec75351 commit 8faa13e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

modules/cli/src/main/scala/scala/cli/commands/fix/ScalafixRules.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@ object ScalafixRules extends CommandHelpers {
5656
)
5757
else buildOptions
5858

59-
val scalaVersion =
60-
buildOptions.scalaParams.orExit(logger).map(_.scalaVersion)
61-
.getOrElse(Constants.defaultScalaVersion)
62-
6359
val shouldBuildTestScope = sharedOptions.scope.test.getOrElse(true)
6460
if !shouldBuildTestScope then
6561
logger.message(
@@ -89,6 +85,13 @@ object ScalafixRules extends CommandHelpers {
8985
successfulBuilds.headOption.toSeq
9086
.flatMap(_.options.scalaOptions.scalacOptions.toSeq.map(_.value.value))
9187

88+
val scalaVersion = {
89+
for {
90+
b <- successfulBuilds.headOption
91+
scalaParams <- b.scalaParams
92+
} yield scalaParams.scalaVersion
93+
}.getOrElse(Constants.defaultScalaVersion)
94+
9295
either {
9396
val artifacts =
9497
value(

0 commit comments

Comments
 (0)