From ef6932b55eeed81f128682639b35f3d41b6fa4f2 Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Fri, 9 Jun 2017 11:41:08 -0700
Subject: Try out new-sbt-scalafmt

---
 build.sbt                                       |  3 +-
 project/plugins.sbt                             |  2 +-
 src/main/scala/xyz.driver.sbt/SbtSettings.scala | 64 ++++++++++++-------------
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/build.sbt b/build.sbt
index 2d780fb..6e8eb6e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,7 +7,8 @@ scalaVersion := "2.10.6"
 publishMavenStyle := true
 
 // Code style plugins
-addSbtPlugin("com.geirsson"    % "sbt-scalafmt"           % "0.6.8")
+// addSbtPlugin("com.geirsson"    % "sbt-scalafmt"           % "0.6.8")
+addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "0.4")
 addSbtPlugin("org.wartremover" % "sbt-wartremover"        % "2.0.3")
 addSbtPlugin("org.scalastyle"  %% "scalastyle-sbt-plugin" % "0.8.0")
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 58f7a7f..2cfaba0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 // Code style plugins
-addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.6")
+// addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "0.6.6")
 
 addSbtPlugin("org.wartremover" % "sbt-wartremover"        % "2.0.3")
 addSbtPlugin("org.scalastyle"  %% "scalastyle-sbt-plugin" % "0.8.0")
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index eedc8b9..a6f4bf2 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -31,38 +31,38 @@ object SbtSettings extends AutoPlugin {
   val JMX_PORT = 8686
 
   object autoImport {
-
-    lazy val scalafmtTest = taskKey[Unit]("scalafmtTest")
-
-    lazy val formatSettings = {
-      val generateScalafmtConfTask = Def.task {
-        val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf")
-        val formatConfFile     = file(".scalafmt.conf")
-        IO.write(formatConfFile, IO.readBytes(scalafmtConfStream))
-        Seq(formatConfFile)
-      }
-      val generateScalafmtTask = Def.task {
-        val scalafmtStream = getClass.getClassLoader.getResourceAsStream("scalafmt")
-        val formatFile     = file("scalafmt")
-        IO.write(formatFile, IO.readBytes(scalafmtStream))
-        Seq(formatFile)
-      }
-      Seq(
-        resourceGenerators in Compile += generateScalafmtConfTask.taskValue,
-        resourceGenerators in Compile += generateScalafmtTask.taskValue,
-        scalafmtTest := {
-          s"chmod +x ${baseDirectory.value.getPath}/scalafmt".!
-          Thread.sleep(200L)
-          s"${baseDirectory.value.getPath}/scalafmt --test".!
-        },
-        scalafmtTest in (Test, test) <<=
-          (scalafmtTest in (Test, test))
-            .dependsOn(generateScalafmtConfTask, generateScalafmtTask),
-        testExecution in (Test, test) <<=
-          (testExecution in (Test, test))
-            .dependsOn(generateScalafmtConfTask, generateScalafmtTask, scalafmtTest in Compile, scalafmtTest in Test)
-      )
-    }
+    //
+    // lazy val scalafmtTest = taskKey[Unit]("scalafmtTest")
+    //
+    // lazy val formatSettings = {
+    //   val generateScalafmtConfTask = Def.task {
+    //     val scalafmtConfStream = getClass.getClassLoader.getResourceAsStream("scalafmt.conf")
+    //     val formatConfFile     = file(".scalafmt.conf")
+    //     IO.write(formatConfFile, IO.readBytes(scalafmtConfStream))
+    //     Seq(formatConfFile)
+    //   }
+    //   val generateScalafmtTask = Def.task {
+    //     val scalafmtStream = getClass.getClassLoader.getResourceAsStream("scalafmt")
+    //     val formatFile     = file("scalafmt")
+    //     IO.write(formatFile, IO.readBytes(scalafmtStream))
+    //     Seq(formatFile)
+    //   }
+    //   Seq(
+    //     resourceGenerators in Compile += generateScalafmtConfTask.taskValue,
+    //     resourceGenerators in Compile += generateScalafmtTask.taskValue,
+    //     scalafmtTest := {
+    //       s"chmod +x ${baseDirectory.value.getPath}/scalafmt".!
+    //       Thread.sleep(200L)
+    //       s"${baseDirectory.value.getPath}/scalafmt --test".!
+    //     },
+    //     scalafmtTest in (Test, test) <<=
+    //       (scalafmtTest in (Test, test))
+    //         .dependsOn(generateScalafmtConfTask, generateScalafmtTask),
+    //     testExecution in (Test, test) <<=
+    //       (testExecution in (Test, test))
+    //         .dependsOn(generateScalafmtConfTask, generateScalafmtTask, scalafmtTest in Compile, scalafmtTest in Test)
+    //   )
+    // }
 
     lazy val testScalastyle = taskKey[Unit]("testScalastyle")
 
-- 
cgit v1.2.3