From 3863d03a8d1487590a0c595043944ca93c30a6ab Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Wed, 7 Feb 2018 14:21:26 -0800
Subject: [PATCH] unfork sbinary

---
 configs/community.dbuild  | 15 +++++++--------
 configs/project-refs.conf |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 83bd4b9cc..3c0f053bc 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -458,18 +458,17 @@ build += {
     ]
   }
 
-  // forked (October 2017) to work around unfriendliness between dbuild
-  // and sbt-houserules 0.3.4; details at
-  // https://github.com/scala/community-builds/issues/603 . we should
-  // be able to unfork now that sbt 0.13.17 is out, once a new sbt-houserules
-  // removes the offending workaround code
   ${vars.base} {
     name: "sbinary"
     uri:  ${vars.uris.sbinary-uri}
     extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
-    // may be needed again once we're on current sbt-houserules again
-    // extra.commands: ${vars.default-commands} ["set every scalafmtOnCompile := false"]
-    // check-missing: false  // ignore missing scalafmt
+    // we have to disable this early (extra.commands isn't soon enough)
+    // or scalafmt will run `update` and `cloc-plugin` won't be found
+    extra.settings: ${vars.base.extra.settings} [
+      "scalafmtOnCompile in ThisBuild := false"
+      "scalafmtOnCompile in Sbt := false"
+    ]
+    check-missing: false  // ignore missing scalafmt
   }
 
   ${vars.base} {
diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 4e1151e1d..4376a0c5a 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -76,7 +76,7 @@ vars.uris: {
   play-ws-uri:                  "https://github.com/playframework/play-ws.git"
   pprint-uri:                   "https://github.com/lihaoyi/pprint.git"
   pureconfig-uri:               "https://github.com/SethTisue/pureconfig.git#community-build-2.12"  # was pureconfig, master
-  sbinary-uri:                  "https://github.com/scalacommunitybuild/sbinary.git#community-build-2.12"  # was sbt, master
+  sbinary-uri:                  "https://github.com/sbt/sbinary.git"
   sbt-io-uri:                   "https://github.com/sbt/io.git#v1.1.3"
   sbt-librarymanagement-uri:    "https://github.com/sbt/librarymanagement.git#v1.1.2"
   sbt-testng-uri:               "https://github.com/sbt/sbt-testng.git"