Add scalafix

.scalafix.conf

@@ -0,0 +1,8 @@
+rule = SortImports
+SortImports.blocks = [
+  "java.",
+  "scala.",
+  "akka.",
+  "*",
+  "lt.dvim.authors.",
+]

.travis.yml

@@ -12,6 +12,8 @@ jobs:
        name: "Code style check (fixed with `sbt Test/compile`)"
      - script: sbt scalafmtSbtCheck || { echo "[error] Unformatted sbt code found. Please run 'scalafmtSbt' and commit the reformatted code."; false; }
        name: "Build code style check (fixed with `sbt scalafmtSbt`)"
+     - script: sbt "scalafix --check" || { echo "[error] Unformatted code found. Please run 'scalafix' and commit the reformatted code."; false; }
+       name: "Code style check (fixed with `sbt scalafix`)"
 
      - stage: test
        script: sbt test

build.sbt

@@ -56,8 +56,8 @@ lazy val cli = project
     name := "authors-cli",
     scalaVersion := ScalaVersion,
     libraryDependencies ++= Seq(
-      "org.rogach" %% "scallop" % "3.3.2"
-    )
+        "org.rogach" %% "scallop" % "3.3.2"
+      )
   )
 
 inThisBuild(
@@ -76,6 +76,9 @@ inThisBuild(
       ),
     bintrayOrganization := Some("2m"),
     scalafmtOnCompile := true,
+    scalafixDependencies ++= Seq(
+        "com.nequissimus" %% "sort-imports" % "0.3.1"
+      ),
     // show full stack traces and test case durations
     testOptions in Test += Tests.Argument("-oDF")
   )

cli/src/main/scala/AuthorsCli.scala

@@ -16,10 +16,10 @@
 
 package lt.dvim.authors
 
-import org.rogach.scallop._
-
-import scala.concurrent.duration._
 import scala.concurrent.Await
+import scala.concurrent.duration._
+
+import org.rogach.scallop._
 
 object AuthorsCli {
   import ScallopOpts._

core/src/main/scala/Authors.scala

@@ -18,6 +18,9 @@ package lt.dvim.authors
 
 import java.io.File
 
+import scala.collection.JavaConverters._
+import scala.concurrent.{ExecutionContext, Future}
+
 import akka.NotUsed
 import akka.actor.ActorSystem
 import akka.event.{Logging, LoggingAdapter}
@@ -27,16 +30,15 @@ import akka.http.scaladsl.marshalling.PredefinedToRequestMarshallers._
 import akka.http.scaladsl.model.{HttpRequest, Uri}
 import akka.stream.scaladsl.{Flow, Source}
 import akka.util.ByteString
+
+import com.madgag.git._
 import com.tradeshift.reaktive.marshal.stream.{ActsonReader, ProtocolReader}
 import org.eclipse.jgit.diff.DiffFormatter
 import org.eclipse.jgit.internal.storage.file.FileRepository
-import org.eclipse.jgit.util.io.DisabledOutputStream
-import com.madgag.git._
-import lt.dvim.authors.GithubProtocol.{AuthorStats, Commit, Stats}
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
+import org.eclipse.jgit.util.io.DisabledOutputStream
 
-import scala.collection.JavaConverters._
-import scala.concurrent.{ExecutionContext, Future}
+import lt.dvim.authors.GithubProtocol.{AuthorStats, Commit, Stats}
 
 object Authors {
   final val MaxAuthors = 1024

core/src/main/scala/GithubProtocol.scala

@@ -18,8 +18,8 @@ package lt.dvim.authors
 
 import com.tradeshift.reaktive.json.JSONProtocol._
 import com.tradeshift.reaktive.marshal.Protocol._
-import lt.dvim.scala.compat.vavr.OptionConverters._
 import io.vavr.control.{Option => VavrOption}
+import lt.dvim.scala.compat.vavr.OptionConverters._
 
 object GithubProtocol {
   final case class GithubAuthor(login: String, url: String, avatar: String)

plugin/src/main/scala/AuthorsPlugin.scala

@@ -16,13 +16,13 @@
 
 package lt.dvim.authors
 
-import sbt._
+import scala.concurrent.duration._
+import scala.concurrent.{Await, Future}
+
 import sbt.Keys._
+import sbt._
 import sbt.complete.DefaultParsers._
 
-import scala.concurrent.{Await, Future}
-import scala.concurrent.duration._
-
 object AuthorsPlugin extends AutoPlugin {
   object autoImport extends AuthorsKeys
   import autoImport._

project/plugins.sbt

@@ -3,3 +3,4 @@ addSbtPlugin("org.scalameta"             % "sbt-scalafmt" % "2.3.1")
 addSbtPlugin("org.foundweekends"         % "sbt-bintray"  % "0.5.6")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11")
 addSbtPlugin("de.heikoseeberger"         % "sbt-header"   % "5.4.0")
+addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix" % "0.9.11")