Bump scalafmt

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 2.0.0
+version = 2.2.1
 maxColumn = 100
 project.git = true
 project.excludeFilters = [ "\\Wsbt-test\\W", "\\Winput_sources\\W", "\\Wcontraband-scala\\W" ]

.travis.yml

@@ -8,7 +8,7 @@ env:
     # WHITESOURCE_PASSWORD=
     - secure: d3bu2KNwsVHwfhbGgO+gmRfDKBJhfICdCJFGWKf2w3Gv86AJZX9nuTYRxz0KtdvEHO5Xw8WTBZLPb2thSJqhw9OCm4J8TBAVqCP0ruUj4+aqBUFy4bVexQ6WKE6nWHs4JPzPk8c6uC1LG3hMuzlC8RGETXtL/n81Ef1u7NjyXjs=
   matrix:
-    - SBT_CMD=";mimaReportBinaryIssues ;scalafmtCheckAll ;headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile; publishLocal ;mainSettingsProj/test ;safeUnitTests ;otherUnitTests; doc"
+    - SBT_CMD="mimaReportBinaryIssues ;scalafmtCheckAll ; scalafmtSbtCheck; headerCheck ;test:headerCheck ;whitesourceOnPush ;test:compile; publishLocal ;mainSettingsProj/test ;safeUnitTests ;otherUnitTests; doc"
     - SBT_CMD="scripted actions/* apiinfo/* compiler-project/* ivy-deps-management/* reporter/* tests/* watch/* classloader-cache/* package/*"
     - SBT_CMD="scripted dependency-management/* plugins/* project-load/* java/* run/* nio/*"
     - SBT_CMD="repoOverrideTest:scripted dependency-management/*; scripted source-dependencies/* project/*"

main/src/main/scala/sbt/Project.scala

@@ -354,8 +354,9 @@ object Project extends ProjectExtra {
     validProjectID(id).foreach(errMsg => sys.error(s"Invalid project ID: $errMsg"))
     val plugins = Plugins.empty
     val origin = ProjectOrigin.GenericRoot
-    new ProjectDef(id, base, aggregate, Nil, Nil, Nil, plugins, Nil, origin) with Project
-    with GeneratedRootProject
+    new ProjectDef(id, base, aggregate, Nil, Nil, Nil, plugins, Nil, origin)
+      with Project
+      with GeneratedRootProject
   }
 
   /** Returns None if `id` is a valid Project ID or Some containing the parser error message if it is not.*/

main/src/main/scala/sbt/internal/SettingsGraph.scala

@@ -148,7 +148,8 @@ private[sbt] object SettingsGraph {
                   case _          => Some(Left(s))
                 }
               case _ => None
-            } else {
+            }
+          else {
             None
           }
       }.toSeq

main/src/main/scala/sbt/internal/server/Definition.scala

@@ -111,7 +111,8 @@ private[sbt] object Definition {
                 case h :: _ if h.length < fragment.length  => fragment :: Nil
                 case h :: _ if h.length == fragment.length => fragment :: z
                 case _                                     => z
-              } else z
+              }
+            else z
         }
         .headOption
     }

project/plugins.sbt

@@ -3,7 +3,7 @@ scalacOptions ++= Seq("-feature", "-language:postfixOps", "-Ywarn-unused:_,-impo
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.2")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")

protocol/src/main/scala/sbt/protocol/Serialization.scala

@@ -176,7 +176,8 @@ object Serialization {
             Converter.fromJson[JsonRpcRequestMessage](json) match {
               case Success(request) => Right(request)
               case Failure(e)       => Left(s"Conversion error: ${e.getMessage}")
-            } else
+            }
+          else
             Converter.fromJson[JsonRpcNotificationMessage](json) match {
               case Success(notification) => Right(notification)
               case Failure(e)            => Left(s"Conversion error: ${e.getMessage}")

scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala

@@ -179,7 +179,8 @@ final class ScriptedTests(
           case ("nio", "make-clone") => true // uses gcc which isn't set up on all systems
           case _                     => false
         }
-    } else _ => false
+    }
+    else _ => false
   private def determineRemoteSbtCreatorKind(testName: (String, String)): RemoteSbtCreatorKind = {
     import RemoteSbtCreatorKind._
     val (group, name) = testName