Skip to content

Commit f354dae

Browse files
authored
Merge pull request #1993 from bjaglin/scalafixScalaBinaryVersion
remove references to sbt-only, deprecated key
2 parents 33b30fe + b4c5b07 commit f354dae

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

scalafix-reflect/src/main/scala-3/scalafix/internal/reflect/RuleCompiler.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ class RuleCompiler(
6060
val lastError =
6161
"Error compiling rule(s) from source using Scala 3 compiler; " +
6262
"to use the Scala 2.x compiler instead, use the corresponding " +
63-
"scalafix-cli artifact or force scalafixScalaBinaryVersion " +
64-
"to 2.x in your build tool"
63+
"scalafix-cli artifact"
6564
val errors = (reporter.allErrors.map(_.message) :+ lastError)
6665
ConfError.apply(errors.map(ConfError.message)).map(_.notOk).get
6766
}

scalafix-rules/src/main/scala-2/scalafix/internal/rule/ExplicitResultTypes.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ final class ExplicitResultTypes(
7171
) {
7272
Configured.error(
7373
s"The ExplicitResultTypes rule needs to run with the same Scala binary version as the one used to compile target sources ($inputBinaryScalaVersion). " +
74-
s"To fix this problem, either remove ExplicitResultTypes from .scalafix.conf or make sure the scalafixScalaBinaryVersion setting key matches $inputBinaryScalaVersion."
74+
s"To fix this problem, either remove ExplicitResultTypes from .scalafix.conf or make sure Scalafix is loaded with $inputBinaryScalaVersion."
7575
)
7676
} else {
7777
config.conf // Support deprecated explicitReturnTypes config

0 commit comments

Comments
 (0)