diff --git a/build.sbt b/build.sbt index 5217d297d08..607ce4bc18c 100644 --- a/build.sbt +++ b/build.sbt @@ -46,7 +46,6 @@ inThisBuild( }, scalaVersion := V.scala213, crossScalaVersions := List(V.scala213), - scalafixDependencies += "com.github.liancheng" %% "organize-imports" % V.organizeImportRule, organization := "org.scalameta", licenses := Seq( "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0") @@ -483,7 +482,6 @@ lazy val metals = project "scalafmtVersion" -> V.scalafmt, "ammoniteVersion" -> V.ammonite, "scalaCliVersion" -> V.scalaCli, - "organizeImportVersion" -> V.organizeImportRule, "millVersion" -> V.mill, "debugAdapterVersion" -> V.debugAdapter, "sbtJdiToolsVersion" -> V.sbtJdiTools, diff --git a/metals/src/main/scala/scala/meta/internal/metals/ScalafixProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/ScalafixProvider.scala index 1cff78c6ff1..45e43513293 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/ScalafixProvider.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/ScalafixProvider.scala @@ -559,13 +559,7 @@ object ScalafixProvider { } val builtInRuleDeps = builtInRules(scalaBinaryVersion) - val allDeps = List( - Dependency.of( - "com.github.liancheng", - s"organize-imports_$scalaBinaryVersion", - BuildInfo.organizeImportVersion, - ) - ) ++ fromSettings ++ rules.flatMap(builtInRuleDeps.get) + val allDeps = fromSettings ++ rules.flatMap(builtInRuleDeps.get) // only get newest versions for each dependency allDeps .sortBy(_.getVersion()) diff --git a/project/V.scala b/project/V.scala index 78cab6b200f..ac52fe06e05 100644 --- a/project/V.scala +++ b/project/V.scala @@ -31,12 +31,11 @@ object V { val mill = "0.10.12" val mdoc = "2.3.7" val munit = "1.0.0-M7" - val organizeImportRule = "0.6.0" val pprint = "0.7.3" val sbtBloop = bloop val sbtJdiTools = "1.1.1" val scalaCli = "0.2.1" - val scalafix = "0.10.4" + val scalafix = "0.11.0" val scalafmt = "3.7.4" val scalameta = "4.7.8" val scribe = "3.11.5" diff --git a/project/plugins.sbt b/project/plugins.sbt index d90f69afa82..bb345012a4f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")