From e4612c858c3411e9b4c667a6f1a00daef2a6d462 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Thu, 7 Mar 2019 18:19:12 -0500
Subject: [PATCH] switch to official sbt-scalafmt

---
 .travis.yml         | 2 +-
 build.sbt           | 7 +------
 project/plugins.sbt | 3 ++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8436d27e9..3233c1a4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ scala:
 script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
   ++$TRAVIS_SCALA_VERSION
   mimaReportBinaryIssues
-  scalafmt::test test:scalafmt::test
+  scalafmtCheck
   whitesourceCheckPolicies
   test
 
diff --git a/build.sbt b/build.sbt
index 8b95d524e..1c0b3106f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -55,15 +55,10 @@ lazy val utilRoot: Project = (project in file("."))
         homepage := Some(url("https://github.com/sbt/util")),
         description := "Util module for sbt",
         scmInfo := Some(ScmInfo(url("https://github.com/sbt/util"), "git@github.com:sbt/util.git")),
-        scalafmtOnCompile in Sbt := false,
       )),
     commonSettings,
     name := "Util Root",
-    publish := {},
-    publishLocal := {},
-    publishArtifact in Compile := false,
-    publishArtifact in Test := false,
-    publishArtifact := false,
+    publish / skip := true,
     customCommands
   )
 
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 20afa9ff8..8e37e2155 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,5 @@
-addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.8")
+addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.9")
+addSbtPlugin("com.geirsson"   % "sbt-scalafmt" % "1.5.1")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.1")
 addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")