Skip to content

Commit 75db04c

Browse files
committed
Add scalafix and orginize imports
1 parent 49361e4 commit 75db04c

File tree

5 files changed

+47
-11
lines changed

5 files changed

+47
-11
lines changed

.scalafix.conf

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
rules = [
2+
OrganizeImports,
3+
RemoveUnused
4+
]
5+
6+
RemoveUnused {
7+
imports = false
8+
}
9+
10+
OrganizeImports {
11+
expandRelative = true
12+
groupedImports = Merge
13+
groupExplicitlyImportedImplicitsSeparately = false
14+
groups = [
15+
"re:javax?\\.",
16+
"scala",
17+
"*",
18+
"io.kinoplan"
19+
]
20+
importSelectorsOrder = Ascii
21+
importsOrder = SymbolsFirst
22+
removeUnused = true
23+
}

build.sbt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ lazy val muiColorsGenerator = taskKey[Seq[File]]("mui-colors-generator")
3131
lazy val core = (project in file("core"))
3232
.dependsOn(bridge)
3333
.configure(Settings.publishArtifactSettings)
34-
.settings(commonSettings).settings(
34+
.configure(commonSettings).settings(
3535
name := "scalajs-react-material-ui-core",
3636
scalaJSUseMainModuleInitializer := false,
3737
npmDependencies in Compile ++= Settings.npmDependenciesCore.value,
@@ -42,14 +42,14 @@ lazy val core = (project in file("core"))
4242
(npmInstallDependencies in Compile).value
4343
),
4444
sourceGenerators in Compile += muiColorsGenerator.taskValue
45-
).enablePlugins(ScalaJSBundlerPlugin)
45+
)
4646

4747
lazy val muiIconsGenerator = taskKey[Seq[File]]("mui-icons-generator")
4848

4949
lazy val icons = (project in file("icons"))
5050
.dependsOn(bridge)
5151
.configure(Settings.publishArtifactSettings)
52-
.settings(commonSettings).settings(
52+
.configure(commonSettings).settings(
5353
name := "scalajs-react-material-ui-icons",
5454
scalaJSUseMainModuleInitializer := false,
5555
npmDependencies in Compile ++= Settings.npmDependenciesIcons.value,
@@ -60,21 +60,21 @@ lazy val icons = (project in file("icons"))
6060
(npmInstallDependencies in Compile).value
6161
),
6262
sourceGenerators in Compile += muiIconsGenerator.taskValue
63-
).enablePlugins(ScalaJSBundlerPlugin)
63+
)
6464

6565
lazy val lab = (project in file("lab"))
6666
.dependsOn(bridge)
6767
.configure(Settings.publishArtifactSettings)
68-
.settings(commonSettings).settings(
68+
.configure(commonSettings).settings(
6969
name := "scalajs-react-material-ui-lab",
7070
scalaJSUseMainModuleInitializer := false,
7171
npmDependencies in Compile ++= Settings.npmDependenciesLab.value,
7272
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
7373
libraryDependencies ++= Settings.scalajsDependenciesLib.value
74-
).enablePlugins(ScalaJSBundlerPlugin)
74+
)
7575

7676
lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
77-
.settings(commonSettings).settings(
77+
.configure(commonSettings).settings(
7878
scalaJSUseMainModuleInitializer := true,
7979
scalaJSLinkerConfig ~= (_.withSourceMap(false)),
8080
stUseScalaJsDom := false,
@@ -88,19 +88,20 @@ lazy val demo = (project in file("demo")).dependsOn(core, lab, bridge)
8888
yarnExtraArgs := Seq("--silent"),
8989
webpackConfigFile in fastOptJS := Some(baseDirectory.value / "dev.webpack.config.js"),
9090
skip in publish := true
91-
).enablePlugins(ScalaJSBundlerPlugin, ScalablyTypedConverterPlugin)
91+
).enablePlugins(ScalablyTypedConverterPlugin)
9292

9393
lazy val bridge = (project in file("utils/bridge"))
9494
.configure(Settings.publishArtifactSettings)
95-
.settings(commonSettings).settings(
95+
.configure(commonSettings).settings(
9696
name := "scalajs-react-bridge",
9797
scalaJSUseMainModuleInitializer := false,
9898
npmDependencies in Compile ++= Settings.npmDependenciesBridge.value,
9999
npmResolutions in Compile ++= (npmDependencies in Compile).value.toMap,
100100
libraryDependencies ++= Settings.scalajsDependenciesBridge.value
101-
).enablePlugins(ScalaJSBundlerPlugin, BridgeGeneratorPlugin)
101+
).enablePlugins(BridgeGeneratorPlugin)
102102

103-
lazy val commonSettings = Seq(
103+
lazy val commonSettings: Project => Project =
104+
_.enablePlugins(ScalaJSBundlerPlugin, ScalafixPlugin).settings(
104105
crossScalaVersions := Seq("2.12.11", "2.13.3"),
105106
scalaVersion := crossScalaVersions.value.last,
106107
description := Settings.description,

commands.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
addCommandAlias("fix", "; all compile:scalafix")
12
addCommandAlias("runDev", "; demo/fastOptJS::stopWebpackDevServer; ~demo/fastOptJS::startWebpackDevServer")

project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ addSbtPlugin("ch.epfl.scala" % s"sbt-scalajs-bundler${if (scalaJSVersion.startsW
1010

1111
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.14")
1212

13+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.23")
14+
1315
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.4")

scalafix.sbt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
semanticdbEnabled in ThisBuild := true
2+
3+
semanticdbVersion in ThisBuild := scalafixSemanticdb.revision
4+
5+
scalafixScalaBinaryVersion in ThisBuild := "2.13"
6+
7+
scalafixDependencies in ThisBuild ++= Seq(
8+
"com.github.liancheng" %% "organize-imports" % "0.4.3"
9+
)

0 commit comments

Comments
 (0)