leverage cli_3.x.y

project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
  val x = List(1) // scalafix:ok
- def scalafixVersion: String = "0.12.1"
+ def scalafixVersion: String = "0.12.1+81-c6766833-SNAPSHOT"
 
  val all = List(
  "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.3.202401111512-r",

src/main/scala/scalafix/internal/sbt/ScalafixInterface.scala

@@ -159,13 +159,7 @@ object ScalafixInterface {
  None
  case None =>
  // cache miss, resolve scalafix artifacts and classload them
- if (scalafixScalaBinaryVersion.startsWith("3"))
- logger.error(
- "To use Scalafix on Scala 3 projects, you must unset `scalafixScalaBinaryVersion`. " +
- "Rules such as ExplicitResultTypes requiring the project version to match the Scalafix " +
- "version are unsupported for the moment."
- )
- else if (scalafixScalaBinaryVersion == "2.11")
+ if (scalafixScalaBinaryVersion == "2.11")
  logger.error(
  "Scala 2.11 is no longer supported. Please downgrade to the final version supporting " +
  "it: sbt-scalafix 0.10.4."

src/main/scala/scalafix/sbt/ScalafixPlugin.scala

@@ -65,14 +65,13 @@ object ScalafixPlugin extends AutoPlugin {
  "Can be set in ThisBuild or at project-level."
  )
  @deprecated(
- "scalafixScalaBinaryVersion now follows scalaBinaryVersion by default",
+ "scalafixScalaBinaryVersion now follows scalaVersion by default",
  "0.12.1"
  )
  val scalafixScalaBinaryVersion: SettingKey[String] =
  settingKey[String](
- "The Scala binary version used for scalafix execution. Must be set at project-level. " +
- "Custom rules must be compiled against that binary version. Defaults to 2.12 for 2.12 projects, " +
- "2.13 otherwise."
+ "The Scala version used for scalafix execution. Must be set at project-level. " +
+ "Custom rules must be compiled against that binary version. Defaults to the project's scalaVersion."
  )
  val scalafixConfig: SettingKey[Option[File]] =
  settingKey[Option[File]](
@@ -268,12 +267,7 @@ object ScalafixPlugin extends AutoPlugin {
  },
  ivyConfigurations += ScalafixConfig,
  scalafixAll := scalafixAllInputTask.evaluated,
- (scalafixScalaBinaryVersion: @nowarn) := {
- scalaBinaryVersion.value match {
- case "2.12" => "2.12"
- case _ => "2.13"
- }
- }
+ (scalafixScalaBinaryVersion: @nowarn) := scalaVersion.value
  )
 
  override lazy val globalSettings: Seq[Def.Setting[_]] = Seq(

src/sbt-test/sbt-scalafix/resolvers/project/plugins.sbt

@@ -1 +1,2 @@
+resolvers += Resolver.sonatypeRepo("public")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("plugin.version"))

src/sbt-test/sbt-scalafix/scalafixEnable/build.sbt

@@ -1,28 +1,35 @@
 val V = _root_.scalafix.sbt.BuildInfo
 
-lazy val config = project
+lazy val config = project.settings(
+ scalafixScalaBinaryVersion := scalaBinaryVersion.value // to support old scalafix-interface
+)
 
 lazy val unsupported = project.settings(
+ scalafixScalaBinaryVersion := scalaBinaryVersion.value, // to support old scalafix-interface
  // 2.11.x is not supported
  scalaVersion := "2.11.12"
 )
 
 lazy val bumpScala = project.settings(
+ scalafixScalaBinaryVersion := scalaBinaryVersion.value, // to support old scalafix-interface
  // semanticdb-scalac_2.12.0 was never available
  scalaVersion := "2.12.0"
 )
 
 lazy val downgradeScalameta = project.settings(
+ scalafixScalaBinaryVersion := scalaBinaryVersion.value, // to support old scalafix-interface
  // semanticdb-scalac_2.12.4 no longer available after 4.1.9
  scalaVersion := "2.12.4"
 )
 
 lazy val upgradeScalameta = project.settings(
+ scalafixScalaBinaryVersion := scalaBinaryVersion.value, // to support old scalafix-interface
  // semanticdb-scalac_2.12.15 not yet available in 4.4.10, became available as of 4.4.28
  scalaVersion := "2.12.15"
 )
 
 lazy val available = project.settings(
+ scalafixScalaBinaryVersion := scalaBinaryVersion.value, // to support old scalafix-interface
  // semanticdb-scalac_2.13.4 available in 4.4.10
  scalaVersion := "2.13.4",
  crossScalaVersions := Seq("2.12.15")

src/sbt-test/skip-windows/caching/test

@@ -341,6 +341,7 @@ $ delete rules/src/main/scala/local/NoOp.scala
 $ delete src/main/scala
 
 # make sure cache is invalidated after changing scalafix version
+> set scalafixScalaBinaryVersion := scalaBinaryVersion.value // to support old scalafix-interface
 > set scalafixConfig := None
 $ mkdir src/main/scala
 $ copy-file files/Valid.scala src/main/scala/Valid.scala
@@ -354,6 +355,7 @@ $ exec chmod 000 src/main/scala/Valid.scala
 $ delete src/main/scala
 
 # make sure cache is invalidated after changing scalafix version when no custom dependency is set
+> set scalafixScalaBinaryVersion := scalaBinaryVersion.value // to support old scalafix-interface
 > set scalafixConfig := None
 $ mkdir src/main/scala
 $ copy-file files/Valid.scala src/main/scala/Valid.scala