Skip to content

Commit

Permalink
Add scalafix and organize-imports rule
Browse files Browse the repository at this point in the history
  • Loading branch information
eikek committed Jun 28, 2020
1 parent 5bad157 commit 672ed44
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 2 deletions.
13 changes: 13 additions & 0 deletions .scalafix.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
rules = [
ProcedureSyntax
OrganizeImports
]
OrganizeImports {
coalesceToWildcardImportThreshold = 3
expandRelative = true
groupedImports = Keep
importsOrder = Ascii
groups = ["re:javax?\\.", "scala.", "re:(cats|fs2)\\.", "docspell.", "*"]
importSelectorsOrder = Ascii
removeUnused = true
}
9 changes: 7 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ val elmCompileMode = settingKey[ElmCompileMode]("How to compile elm sources")

// --- Settings

val scalafixSettings = Seq(
semanticdbEnabled := true, // enable SemanticDB
semanticdbVersion := scalafixSemanticdb.revision, //"4.3.10", // use Scalafix compatible version
ThisBuild / scalafixDependencies ++= Dependencies.organizeImports
)

val sharedSettings = Seq(
organization := "com.github.eikek",
scalaVersion := "2.13.2",
Expand All @@ -37,7 +43,7 @@ val sharedSettings = Seq(
(scalacOptions.value.filter(o => !o.contains("Xlint")) ++ Seq("-Xlint:_,-unused")),
scalacOptions in (Test, console) :=
(scalacOptions.value.filter(o => !o.contains("Xlint")) ++ Seq("-Xlint:_,-unused"))
)
) ++ scalafixSettings

val testSettings = Seq(
testFrameworks += new TestFramework("minitest.runner.Framework"),
Expand Down Expand Up @@ -143,7 +149,6 @@ val openapiScalaSettings = Seq(
)



// --- Modules

// Base module, everything depends on this – including restapi and
Expand Down
5 changes: 5 additions & 0 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ object Dependencies {
val LogbackVersion = "1.2.3"
val MariaDbVersion = "2.6.1"
val MiniTestVersion = "2.8.2"
val OrganizeImportsVersion = "0.3.1-RC3"
val PdfboxVersion = "2.0.20"
val PoiVersion = "4.1.2"
val PostgresVersion = "42.2.14"
Expand Down Expand Up @@ -253,4 +254,8 @@ object Dependencies {
val icu4j = Seq(
"com.ibm.icu" % "icu4j" % Icu4jVersion
)

val organizeImports = Seq(
"com.github.liancheng" %% "organize-imports" % OrganizeImportsVersion
)
}
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.17")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.2.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("com.github.eikek" % "sbt-openapi-schema" % "0.6.1")
Expand Down

0 comments on commit 672ed44

Please sign in to comment.