Merge pull request #131 from armanbilge/pr/organize-imports

Organize imports with scalafix
armanbilge · Jan 14, 2023 · a05a0e3 · a05a0e3
2 parents bc9b5cb + b4fad3d
commit a05a0e3
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,6 +80,10 @@ jobs:
       - name: Test
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
 
+      - name: Check scalafix lints
+        if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' 'scalafixAll --check'
+
       - name: Check binary compatibility
         if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
         run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues

diff --git a/.scalafix.conf b/.scalafix.conf
@@ -0,0 +1,3 @@
+rules = [OrganizeImports]
+
+OrganizeImports.removeUnused = false
diff --git a/build.sbt b/build.sbt
@@ -13,6 +13,7 @@ ThisBuild / tlSonatypeUseLegacyHost := false
 
 ThisBuild / crossScalaVersions := Seq("3.2.1")
 ThisBuild / scalacOptions ++= Seq("-new-syntax", "-indent", "-source:future")
+ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"
 
 ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
 ThisBuild / tlJdkRelease := Some(8)

diff --git a/calico/src/main/scala/calico/html.scala b/calico/src/main/scala/calico/html.scala
@@ -50,8 +50,8 @@ import org.scalajs.dom
 import shapeless3.deriving.K0
 
 import scala.collection.mutable
-import scala.scalajs.js
 import scala.collection.mutable.ListBuffer
+import scala.scalajs.js
 
 object io extends Html[IO]
 

diff --git a/calico/src/main/scala/calico/unsafe/MicrotaskExecutor.scala b/calico/src/main/scala/calico/unsafe/MicrotaskExecutor.scala
@@ -16,9 +16,9 @@
 
 package calico.unsafe
 
+import scala.concurrent.ExecutionContext
 import scala.scalajs.js
 import scala.scalajs.js.annotation.JSGlobal
-import scala.concurrent.ExecutionContext
 
 private[calico] object MicrotaskExecutor extends ExecutionContext:
 

diff --git a/frp/src/main/scala/calico/frp/SignallingSortedMapRef.scala b/frp/src/main/scala/calico/frp/SignallingSortedMapRef.scala
@@ -23,8 +23,8 @@ import cats.kernel.Order
 import cats.syntax.all.*
 import fs2.Stream
 import fs2.concurrent.Signal
-import fs2.concurrent.SignallingRef
 import fs2.concurrent.SignallingMapRef
+import fs2.concurrent.SignallingRef
 
 import scala.collection.immutable.LongMap
 import scala.collection.immutable.SortedMap

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,6 @@
 val sbtTypelevelVersion = "0.4.18"
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
+addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % sbtTypelevelVersion)
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.6")

diff --git a/todo-mvc/src/main/scala/todomvc/TodoMvc.scala b/todo-mvc/src/main/scala/todomvc/TodoMvc.scala
@@ -17,8 +17,10 @@
 package todomvc
 
 import calico.*
-import calico.frp.{*, given}
-import calico.html.io.{*, given}
+import calico.frp.*
+import calico.frp.given
+import calico.html.io.*
+import calico.html.io.given
 import calico.router.*
 import calico.syntax.*
 import cats.data.*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		rules = [OrganizeImports]

		OrganizeImports.removeUnused = false