From ede2b865b40b5077448d3606a4fd42c2b9d571d0 Mon Sep 17 00:00:00 2001
From: Dale Wijnand <dale.wijnand@gmail.com>
Date: Mon, 20 Mar 2017 10:58:18 +0000
Subject: [PATCH] Allow disablePlugins(SbtScalariform) to work

SbtScalariform is now an AutoPlugin, so its scalariformSettings are
already added to the project. So don't add it again otherwise
`disablePlugins(SbtScalariform)` won't work.

And miscellaneous cleanups.
---
 project/Formatting.scala | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/project/Formatting.scala b/project/Formatting.scala
index a760af123..30259e009 100644
--- a/project/Formatting.scala
+++ b/project/Formatting.scala
@@ -1,15 +1,13 @@
-import sbt._
-import sbt.Keys._
-import com.typesafe.sbt.SbtScalariform._
-import ScalariformKeys.{ format => scalariformFormat, preferences => scalariformPreferences }
+import sbt._, Keys._
+import com.typesafe.sbt.SbtScalariform._, autoImport._
 
 object Formatting {
-  lazy val BuildConfig = config("build") extend Compile
-  lazy val BuildSbtConfig = config("buildsbt") extend Compile
+  val BuildConfig = config("build") extend Compile
+  val BuildSbtConfig = config("buildsbt") extend Compile
 
   val scalariformCheck = taskKey[Unit]("Checks that the existing code is formatted, via git diff")
 
-  lazy val prefs: Seq[Setting[_]] = {
+  private val prefs: Seq[Setting[_]] = {
     import scalariform.formatter.preferences._
     Seq(
       scalariformPreferences ~= (_
@@ -20,8 +18,8 @@ object Formatting {
     )
   }
 
-  lazy val settings: Seq[Setting[_]] = Seq() ++ scalariformSettings ++ prefs
-  lazy val sbtFilesSettings: Seq[Setting[_]] = Seq() ++ scalariformSettings ++ prefs ++
+  val settings: Seq[Setting[_]] = Seq() ++ prefs
+  val sbtFilesSettings: Seq[Setting[_]] = Seq() ++ prefs ++
     inConfig(BuildConfig)(configScalariformSettings) ++
     inConfig(BuildSbtConfig)(configScalariformSettings) ++
     Seq(