Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scalafix 0.11.0 #5304

Merged
merged 2 commits into from
Jun 5, 2023
Merged

Scalafix 0.11.0 #5304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb6d1f3
Scalafix 0.11.0
bjaglin Jun 3, 2023
bbf9af2
OrganizeImports is now built-in
bjaglin Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 1 addition & 7 deletions metals/src/main/scala/scala/meta/internal/metals/ScalafixProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
3 changes: 1 addition & 2 deletions project/V.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down