From 07746bb466861c676257dc0f25981cb0d82e2c51 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 13 Nov 2017 17:15:31 -0800
Subject: [PATCH 01/18] wip: do the spaces split (without adding stuff yet)

---
 configs/community.dbuild  | 177 +++++++++++++++++++++++---------------
 configs/project-refs.conf |   2 +-
 2 files changed, 109 insertions(+), 70 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 040f9011d..ce465799f 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1,12 +1,19 @@
 //// about spaces
 
-// currently we have three spaces: default, jawn_0_10, jawn_0_11.
-// the split is because sbt 1 uses jawn 0.10.x (via its dependency
+// currently we have five spaces.
+
+// the jawn split is because sbt 1 uses jawn 0.10.x (via its dependency
 //   on sjson-new) and the sbt team is worried about the possible
 //   impact of upgrading on binary compatibility of sbt plugins.
 // but in the meantime the whole Typelevel ecosystem is moving onto
 //   jawn 0.11, and the two versions are source-incompatible.
 
+// the scalameta split is because we want to have both scalafmt
+//   and scalafix, but the latter uses scalameta 2.x while the
+//   former is stuck in scalameta 1.x land.  (this is easy to
+//   keep segregated since scalafmt and scalafix tend to be
+//   build-level dependencies, not project-level dependencies.)
+
 //// from environment
 
 vars: {
@@ -95,7 +102,7 @@ build += {
   cross-version: disabled
 
   space.from: default
-  space.to: [ default, jawn_0_10, jawn_0_11 ]
+  space.to: [ default, jawn_0_10, jawn_0_11, scalameta_1, scalameta_2 ]
 
   projects: [
   {
@@ -147,7 +154,7 @@ build += {
 build += {
 
   space.from: default
-  space.to: [ default, jawn_0_10, jawn_0_11 ]
+  space.to: [ default, jawn_0_10, jawn_0_11, scalameta_1, scalameta_2 ]
 
   check-missing: [ true, false ]
   cross-version: [ disabled, standard ]
@@ -970,71 +977,6 @@ build += {
     extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
   }
 
-  // forked (updated September 2017) to remove coursier.
-  // refreshing the fork should be approached with caution;
-  // see Olafur's remarks at
-  // https://github.com/scala/community-builds/issues/499#issuecomment-287307613
-  // about the instability of both scalameta and scalafix.
-  ${vars.base} {
-    name: "scalameta"
-    uri:  ${vars.uris.scalameta-uri}
-    // else, bintray stuff goes boom
-    extra.options: ["-Dsbt.prohibit.publish=true"]
-    extra.projects: ["scalametaJVM", "contribJVM", "semanticdbScalac"]  // no Scala.js
-    extra.exclude: [
-      // we never build sbt plugins or benchmarks
-      "benchmarks"
-    ]
-    // use right version-specific source directories regardless of our weird dbuild Scala version numbers
-    extra.commands: ${vars.default-commands} [
-      "set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
-      "set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
-      "set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""
-      "set unmanagedSourceDirectories in (semanticdbScalac, Compile) += (baseDirectory in semanticdbScalac).value / \"src\" / \"main\" / \"scala-2.12.4\""
-    ]
-  }
-
-  // forked (refreshed September 2017) to remove coursier
-  // caution, refreshing the fork any further can be problematic;
-  // see Olafur's remarks at
-  // https://github.com/scala/community-builds/issues/499#issuecomment-287307613
-  // about the instability of both scalameta and scalafix
-  ${vars.base} {
-    name: "scalafix"
-    uri:  ${vars.uris.scalafix-uri}
-    extra.exclude: [
-      // we never build sbt plugins
-      "scalafix-sbt"
-      // requires scalatex-site which requires Scala.js
-      "readme"
-      // no Scala.js please
-      "coreJS", "diffJS"
-      // Scala 2.10 based
-      "testsInputSbt"
-      // do I *look* like Dotty?
-      "testsOutputDotty"
-      // can't expand macros compiled by previous versions of Scala
-      "testsOutputSbt"
-    ]
-  }
-
-  // dependency of scalafix
-  // (we use allanrenucci's fork because that's where `organization` is set
-  // as scalafix expects; it's where 0.1.4 was apparently published from,
-  // which is the version scalafix declares a dependency on)
-  ${vars.base} {
-    name: "scala-xml-quote"
-    uri:  ${vars.uris.scala-xml-quote-uri}
-  }
-
-  // dependency of scalafmt
-  // forked (July 2017) to remove coursier
-  ${vars.base} {
-    name: "metaconfig"
-    uri:  ${vars.uris.metaconfig-uri}
-    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
-  }
-
   ${vars.base} {
     name: "scalatex"
     uri:  ${vars.uris.scalatex-uri}
@@ -1418,3 +1360,100 @@ build += {
   }
 
 ]}
+
+//// space: scalameta_1
+
+build += {
+
+  space.from: scalameta_1
+  space.to: [ scalameta_1 ]
+
+  check-missing: [ true, false ]
+  cross-version: [ disabled, standard ]
+  extraction-version: ${vars.scala-version}
+  sbt-version: ${vars.sbt-version}
+
+  projects: [
+
+  // dependency of scalafmt
+  // forked (July 2017) to remove coursier
+  ${vars.base} {
+    name: "metaconfig"
+    uri:  ${vars.uris.metaconfig-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
+]}
+
+//// space: scalameta_2
+
+build += {
+
+  space.from: scalameta_2
+  space.to: [ scalameta_2 ]
+
+  check-missing: [ true, false ]
+  cross-version: [ disabled, standard ]
+  extraction-version: ${vars.scala-version}
+  sbt-version: ${vars.sbt-version}
+
+  projects: [
+
+  // forked (updated September 2017) to remove coursier.
+  // refreshing the fork should be approached with caution;
+  // see Olafur's remarks at
+  // https://github.com/scala/community-builds/issues/499#issuecomment-287307613
+  // about the instability of both scalameta and scalafix.
+  ${vars.base} {
+    name: "scalameta-2"
+    uri:  ${vars.uris.scalameta-2-uri}
+    // else, bintray stuff goes boom
+    extra.options: ["-Dsbt.prohibit.publish=true"]
+    extra.projects: ["scalametaJVM", "contribJVM", "semanticdbScalac"]  // no Scala.js
+    extra.exclude: [
+      // we never build sbt plugins or benchmarks
+      "benchmarks"
+    ]
+    // use right version-specific source directories regardless of our weird dbuild Scala version numbers
+    extra.commands: ${vars.default-commands} [
+      "set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
+      "set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
+      "set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""
+      "set unmanagedSourceDirectories in (semanticdbScalac, Compile) += (baseDirectory in semanticdbScalac).value / \"src\" / \"main\" / \"scala-2.12.4\""
+    ]
+  }
+
+  // forked (refreshed September 2017) to remove coursier
+  // caution, refreshing the fork any further can be problematic;
+  // see Olafur's remarks at
+  // https://github.com/scala/community-builds/issues/499#issuecomment-287307613
+  // about the instability of both scalameta and scalafix
+  ${vars.base} {
+    name: "scalafix"
+    uri:  ${vars.uris.scalafix-uri}
+    extra.exclude: [
+      // we never build sbt plugins
+      "scalafix-sbt"
+      // requires scalatex-site which requires Scala.js
+      "readme"
+      // no Scala.js please
+      "coreJS", "diffJS"
+      // Scala 2.10 based
+      "testsInputSbt"
+      // do I *look* like Dotty?
+      "testsOutputDotty"
+      // can't expand macros compiled by previous versions of Scala
+      "testsOutputSbt"
+    ]
+  }
+
+  // dependency of scalafix
+  // (we use allanrenucci's fork because that's where `organization` is set
+  // as scalafix expects; it's where 0.1.4 was apparently published from,
+  // which is the version scalafix declares a dependency on)
+  ${vars.base} {
+    name: "scala-xml-quote"
+    uri:  ${vars.uris.scala-xml-quote-uri}
+  }
+
+]}
diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 043616358..7dc5c9607 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -92,7 +92,7 @@ vars.uris: {
   scalaj-http-uri:              "https://github.com/scalaj/scalaj-http.git"
   scalachess-uri:               "https://github.com/ornicar/scalachess.git"
   scalalib-uri:                 "https://github.com/ornicar/scalalib.git"
-  scalameta-uri:                "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
+  scalameta-2-uri:              "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
   scalameter-uri:               "https://github.com/scalameter/scalameter.git"
   scalamock-uri:                "https://github.com/paulbutcher/ScalaMock.git#1e84ffe"  # was master
   scalapb-lenses-uri:           "https://github.com/scalapb/Lenses.git"

From 35ed963190bc4795cfec77cdd72ae0fda8b76785 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 13 Nov 2017 19:27:12 -0800
Subject: [PATCH 02/18] wip

---
 configs/community.dbuild | 42 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 79e290881..608e647e1 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1058,19 +1058,6 @@ build += {
     extra.projects: ["lensesJVM"]  // no Scala.js plz
   }
 
-  // adding (September 2017) because scalafix's "cli" subproject uses it.
-  // forked to remove coursier and upgrade sbt-bintray
-  ${vars.base} {
-    name: "semanticdb-sbt"
-    uri:  ${vars.uris.semanticdb-sbt-uri}
-    extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
-    extra.commands: ${vars.default-commands} [
-      "set every bintrayReleaseOnPublish := false"
-    ]
-    // this is enough for scalafix
-    extra.projects: ["runtime"]
-  }
-
   // adding (September 2017) because scalafix's "cli" subproject uses it.
   // forked to modify some version number manipulation code to be
   // dbuild-friendly; we can unfork once
@@ -1373,14 +1360,6 @@ build += {
 
   projects: [
 
-  // dependency of scalafmt
-  // forked (July 2017) to remove coursier
-  ${vars.base} {
-    name: "metaconfig"
-    uri:  ${vars.uris.metaconfig-uri}
-    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
-  }
-
 ]}
 
 //// space: scalameta_2
@@ -1421,6 +1400,19 @@ build += {
     ]
   }
 
+  // adding (September 2017) because scalafix's "cli" subproject uses it.
+  // forked to remove coursier and upgrade sbt-bintray
+  ${vars.base} {
+    name: "semanticdb-sbt"
+    uri:  ${vars.uris.semanticdb-sbt-uri}
+    extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
+    extra.commands: ${vars.default-commands} [
+      "set every bintrayReleaseOnPublish := false"
+    ]
+    // this is enough for scalafix
+    extra.projects: ["runtime"]
+  }
+
   // forked (refreshed September 2017) to remove coursier
   // caution, refreshing the fork any further can be problematic;
   // see Olafur's remarks at
@@ -1454,4 +1446,12 @@ build += {
     uri:  ${vars.uris.scala-xml-quote-uri}
   }
 
+  // dependency of scalafmt
+  // forked (July 2017) to remove coursier
+  ${vars.base} {
+    name: "metaconfig"
+    uri:  ${vars.uris.metaconfig-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
 ]}

From 32c2522916933b0f3cb10844dc84e38ba9aa2238 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Nov 2017 12:15:11 -0800
Subject: [PATCH 03/18] wip

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

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 8a650c3b6..30dc26305 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1367,6 +1367,57 @@ build += {
 
   projects: [
 
+  // forked (July 2017) to disable coursier, bintray stuff, IntelliJ stuff
+  ${vars.base} {
+    name: "scalafmt"
+    uri:  ${vars.uris.scalafmt-uri}
+    // let's keep our ambitions modest for now (November 2017)
+    // and just try to build core (and no Scala.js plz, of course)
+    extra.projects: ["coreJVM"]
+  }
+
+  // dependency of scalafmt
+  // forked (July 2017) for dbuild friendliness
+  ${vars.base} {
+    name: "meta-paradise"
+    uri: ${vars.uris.meta-paradise-uri}
+    // only goal right now (November 2017) is to get scalafmt in, so, let's just
+    // add the project we actually need and not worry about the rest
+    extra.projects: ["paradise"]
+    // use right version-specific source directory regardless of our weird dbuild Scala version number
+    extra.commands: [
+      "set unmanagedSourceDirectories in (paradise, Compile) += (baseDirectory in paradise).value / \"src\" / \"main\" / \"scala-2.12.2\""
+    ]
+  }
+
+  // dependency of scalafmt
+  ${vars.base} {
+    name: "scalameta-1"
+    uri:  ${vars.uris.scalameta-1-uri}
+    // else, bintray stuff goes boom
+    extra.options: ["-Dsbt.prohibit.publish=true"]
+    extra.projects: ["scalametaJVM"]  // no Scala.js. just the minimum scalafmt needs?
+    extra.exclude: [
+      // we never build sbt plugins or benchmarks
+      "benchmarks"
+    ]
+     // use right version-specific source directories regardless of our weird dbuild Scala version numbers
+     extra.commands: ${vars.default-commands} [
+       "set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
+       "set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
+       "set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""
+       "set unmanagedSourceDirectories in (scalahost, Compile) += (baseDirectory in scalahost).value / \"src\" / \"main\" / \"scala-2.12.1\""
+    ]
+  }
+
+  // dependency of scalafmt
+  // forked (July 2017) to remove coursier
+  ${vars.base} {
+    name: "metaconfig"
+    uri:  ${vars.uris.metaconfig-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
 ]}
 
 //// space: scalameta_2
@@ -1453,12 +1504,4 @@ build += {
     uri:  ${vars.uris.scala-xml-quote-uri}
   }
 
-  // dependency of scalafmt
-  // forked (July 2017) to remove coursier
-  ${vars.base} {
-    name: "metaconfig"
-    uri:  ${vars.uris.metaconfig-uri}
-    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
-  }
-
 ]}
diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 29392e355..1a5f394c9 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -49,6 +49,7 @@ vars.uris: {
   machinist-uri:                "https://github.com/typelevel/machinist.git"
   macro-compat-uri:             "https://github.com/milessabin/macro-compat.git"
   macro-paradise-uri:           "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
+  meta-paradise-uri:            "https://github.com/SethTisue/paradise.git#community-build-2.12"
   metaconfig-uri:               "https://github.com/scalacommunitybuild/metaconfig.git#community-build-2.12"
   mima-uri:                     "https://github.com/lightbend/migration-manager.git"
   minitest-uri:                 "https://github.com/monix/minitest.git"
@@ -90,9 +91,11 @@ vars.uris: {
   scala-xml-quote-uri:          "https://github.com/allanrenucci/scala-xml-quote.git#bintray"
   scalacheck-uri:               "https://github.com/rickynils/scalacheck.git#9b71bb3dfe186c03292faa59976487af2ee23caa"
   scalafix-uri:                 "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"
+  scalafmt-uri:                 "https://github.com/scalacommunitybuild/scalafmt.git#community-build-2.12"
   scalaj-http-uri:              "https://github.com/scalaj/scalaj-http.git"
   scalachess-uri:               "https://github.com/ornicar/scalachess.git"
   scalalib-uri:                 "https://github.com/ornicar/scalalib.git"
+  scalameta-1-uri:              "https://github.com/scalacommunitybuild/scalameta.git#v1.7.0"
   scalameta-2-uri:              "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
   scalameter-uri:               "https://github.com/scalameter/scalameter.git"
   scalamock-uri:                "https://github.com/paulbutcher/ScalaMock.git#1e84ffe"  # was master

From d83786232c3a681ebde744e6bd36ca719214100b Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Nov 2017 12:30:46 -0800
Subject: [PATCH 04/18] wip

---
 configs/project-refs.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 1a5f394c9..45909626c 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -95,7 +95,7 @@ vars.uris: {
   scalaj-http-uri:              "https://github.com/scalaj/scalaj-http.git"
   scalachess-uri:               "https://github.com/ornicar/scalachess.git"
   scalalib-uri:                 "https://github.com/ornicar/scalalib.git"
-  scalameta-1-uri:              "https://github.com/scalacommunitybuild/scalameta.git#v1.7.0"
+  scalameta-1-uri:              "https://github.com/scalameta/scalameta.git#v1.7.0"
   scalameta-2-uri:              "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
   scalameter-uri:               "https://github.com/scalameter/scalameter.git"
   scalamock-uri:                "https://github.com/paulbutcher/ScalaMock.git#1e84ffe"  # was master

From e324ee6a7fe6ae1a74fb88cefcda99e5573dd126 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Nov 2017 13:14:13 -0800
Subject: [PATCH 05/18] wip

---
 configs/project-refs.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 45909626c..7991e8766 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -95,7 +95,7 @@ vars.uris: {
   scalaj-http-uri:              "https://github.com/scalaj/scalaj-http.git"
   scalachess-uri:               "https://github.com/ornicar/scalachess.git"
   scalalib-uri:                 "https://github.com/ornicar/scalalib.git"
-  scalameta-1-uri:              "https://github.com/scalameta/scalameta.git#v1.7.0"
+  scalameta-1-uri:              "https://github.com/SethTisue/scalameta.git#community-build-2.12-scalameta1"  # was v1.7.0
   scalameta-2-uri:              "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
   scalameter-uri:               "https://github.com/scalameter/scalameter.git"
   scalamock-uri:                "https://github.com/paulbutcher/ScalaMock.git#1e84ffe"  # was master

From 53d0f04abba67ee0ccb677982dd4c6f657a57492 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Nov 2017 13:48:24 -0800
Subject: [PATCH 06/18] wip

---
 configs/community.dbuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 30dc26305..ed75c0d20 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1351,6 +1351,14 @@ build += {
     extra.test-tasks: "compile"
   }
 
+  // dependency of scalafmt & scalafix
+  // forked (July 2017) to remove coursier
+  ${vars.base} {
+    name: "metaconfig"
+    uri:  ${vars.uris.metaconfig-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
 ]}
 
 //// space: scalameta_1
@@ -1410,14 +1418,6 @@ build += {
     ]
   }
 
-  // dependency of scalafmt
-  // forked (July 2017) to remove coursier
-  ${vars.base} {
-    name: "metaconfig"
-    uri:  ${vars.uris.metaconfig-uri}
-    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
-  }
-
 ]}
 
 //// space: scalameta_2

From 2fbe2ab55f0a37fc5019b0bdc95a22d7944f8ef0 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Nov 2017 13:54:28 -0800
Subject: [PATCH 07/18] wip

---
 configs/community.dbuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index ed75c0d20..9fb31d2ff 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1409,8 +1409,10 @@ build += {
       // we never build sbt plugins or benchmarks
       "benchmarks"
     ]
-     // use right version-specific source directories regardless of our weird dbuild Scala version numbers
      extra.commands: ${vars.default-commands} [
+        // Disable fatal Scaladoc warnings, too fragile
+       "removeScalacOptions -Xfatal-warnings"
+       // use right version-specific source directories regardless of our weird dbuild Scala version numbers
        "set unmanagedSourceDirectories in (commonJVM, Compile) += (baseDirectory in commonJVM).value / \"src\" / \"main\" / \"scala-2.12\""
        "set unmanagedSourceDirectories in (dialectsJVM, Compile) += (baseDirectory in dialectsJVM).value / \"src\" / \"main\" / \"scala-2.12\""
        "set unmanagedSourceDirectories in (scalametaJVM, Compile) += (baseDirectory in scalametaJVM).value / \"src\" / \"main\" / \"scala-2.12\""

From e65a8439607f18285442fd463ed1abcd1e5305b0 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Tue, 14 Nov 2017 14:49:50 -0800
Subject: [PATCH 08/18] wip

---
 configs/community.dbuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 9fb31d2ff..7271e96f7 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1382,6 +1382,8 @@ build += {
     // let's keep our ambitions modest for now (November 2017)
     // and just try to build core (and no Scala.js plz, of course)
     extra.projects: ["coreJVM"]
+    // why doesn't dbuild pick up the dependency?!
+    deps.inject: ["com.geirsson#metaconfig-core"]
   }
 
   // dependency of scalafmt

From 7729f044780be8a303b7242f9e13af5da0c0adb2 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 16:31:55 -0800
Subject: [PATCH 09/18] wip

---
 configs/community.dbuild | 67 ++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 6ad351c53..de67e2836 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -993,13 +993,6 @@ build += {
     uri:  ${vars.uris.scala-xml-quote-uri}
   }
 
-  // dependency of scalafix
-  ${vars.base} {
-    name: "metaconfig"
-    uri:  ${vars.uris.metaconfig-uri}
-    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
-  }
-
   ${vars.base} {
     name: "geny"
     uri:  ${vars.uris.geny-uri}
@@ -1205,7 +1198,8 @@ build += {
 build += {
 
   space.from: jawn_0_10
-  space.to: [ jawn_0_10 ]
+  // to scalameta_1 because of scalafix->ammonite dependency
+  space.to: [ jawn_0_10, scalameta_1 ]
 
   check-missing: [ true, false ]
   cross-version: [ disabled, standard ]
@@ -1311,31 +1305,6 @@ build += {
     extra.test-tasks: "compile"
   }
 
-  // (here in this space because of ammonite-ops dependency)
-  // forked (refreshed September 2017) to remove coursier
-  // caution, refreshing the fork any further can be problematic;
-  // see Olafur's remarks at
-  // https://github.com/scala/community-builds/issues/499#issuecomment-287307613
-  // about the instability of both scalameta and scalafix
-  ${vars.base} {
-    name: "scalafix"
-    uri:  ${vars.uris.scalafix-uri}
-    extra.exclude: [
-      // we never build sbt plugins
-      "scalafix-sbt"
-      // requires scalatex-site which requires Scala.js
-      "readme"
-      // no Scala.js please
-      "coreJS", "diffJS"
-      // Scala 2.10 based
-      "testsInputSbt"
-      // do I *look* like Dotty?
-      "testsOutputDotty"
-      // can't expand macros compiled by previous versions of Scala
-      "testsOutputSbt"
-    ]
-  }
-
 ]}
 
 //// space: jawn_0_11
@@ -1578,4 +1547,36 @@ build += {
     extra.projects: ["runtime"]
   }
 
+  // dependency of scalafix
+  ${vars.base} {
+    name: "metaconfig"
+    uri:  ${vars.uris.metaconfig-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
+  // (here in this space because of ammonite-ops dependency)
+  // forked (refreshed September 2017) to remove coursier
+  // caution, refreshing the fork any further can be problematic;
+  // see Olafur's remarks at
+  // https://github.com/scala/community-builds/issues/499#issuecomment-287307613
+  // about the instability of both scalameta and scalafix
+  ${vars.base} {
+    name: "scalafix"
+    uri:  ${vars.uris.scalafix-uri}
+    extra.exclude: [
+      // we never build sbt plugins
+      "scalafix-sbt"
+      // requires scalatex-site which requires Scala.js
+      "readme"
+      // no Scala.js please
+      "coreJS", "diffJS"
+      // Scala 2.10 based
+      "testsInputSbt"
+      // do I *look* like Dotty?
+      "testsOutputDotty"
+      // can't expand macros compiled by previous versions of Scala
+      "testsOutputSbt"
+    ]
+  }
+
 ]}

From e9cd9d35f1edc52dd9e69fb24b8282471d890d7a Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 17:32:33 -0800
Subject: [PATCH 10/18] wip

---
 configs/community.dbuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index de67e2836..21b7af0e4 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1458,6 +1458,13 @@ build += {
     deps.inject: ["com.geirsson#metaconfig-core"]
   }
 
+  // dependency of both scalafix and scalafmt, so it needs to be in both spaces
+  ${vars.base} {
+    name: "metaconfig-scalameta-2"
+    uri:  ${vars.uris.metaconfig-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
   // dependency of scalafmt
   // forked (July 2017) for dbuild friendliness
   ${vars.base} {
@@ -1547,9 +1554,9 @@ build += {
     extra.projects: ["runtime"]
   }
 
-  // dependency of scalafix
+  // dependency of both scalafix and scalafmt, so it needs to be in both spaces
   ${vars.base} {
-    name: "metaconfig"
+    name: "metaconfig-scalameta-1"
     uri:  ${vars.uris.metaconfig-uri}
     extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
   }

From c31443025d43a02c4293f194767e8f2974aa1f88 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 17:36:58 -0800
Subject: [PATCH 11/18] wip

---
 configs/community.dbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 21b7af0e4..2efe85b7a 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1198,8 +1198,8 @@ build += {
 build += {
 
   space.from: jawn_0_10
-  // to scalameta_1 because of scalafix->ammonite dependency
-  space.to: [ jawn_0_10, scalameta_1 ]
+  // to scalameta spaces to provide ammonite-ops
+  space.to: [ jawn_0_10, scalameta_1, scalameta_2 ]
 
   check-missing: [ true, false ]
   cross-version: [ disabled, standard ]

From 59c65f61926e0d6fe77b2efad24205d58554824d Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 19:13:26 -0800
Subject: [PATCH 12/18] wip

---
 configs/community.dbuild | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 2efe85b7a..54cddd7a9 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1458,13 +1458,6 @@ build += {
     deps.inject: ["com.geirsson#metaconfig-core"]
   }
 
-  // dependency of both scalafix and scalafmt, so it needs to be in both spaces
-  ${vars.base} {
-    name: "metaconfig-scalameta-2"
-    uri:  ${vars.uris.metaconfig-uri}
-    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
-  }
-
   // dependency of scalafmt
   // forked (July 2017) for dbuild friendliness
   ${vars.base} {
@@ -1554,9 +1547,9 @@ build += {
     extra.projects: ["runtime"]
   }
 
-  // dependency of both scalafix and scalafmt, so it needs to be in both spaces
+  // dependency of scalafix
   ${vars.base} {
-    name: "metaconfig-scalameta-1"
+    name: "metaconfig"
     uri:  ${vars.uris.metaconfig-uri}
     extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
   }

From d13b7bd079dbf62da7035266747adfabf5251a38 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 19:23:38 -0800
Subject: [PATCH 13/18] wip

---
 configs/community.dbuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 54cddd7a9..52176bc8c 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1454,8 +1454,6 @@ build += {
     // let's keep our ambitions modest for now (November 2017)
     // and just try to build core (and no Scala.js plz, of course)
     extra.projects: ["coreJVM"]
-    // why doesn't dbuild pick up the dependency?!
-    deps.inject: ["com.geirsson#metaconfig-core"]
   }
 
   // dependency of scalafmt

From bfcc0ab547d077a53836285922cf671ed6f2cfe1 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 19:30:08 -0800
Subject: [PATCH 14/18] wip

---
 configs/community.dbuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 52176bc8c..b481215e3 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1447,13 +1447,11 @@ build += {
 
   projects: [
 
-  // forked (July 2017) to disable coursier, bintray stuff, IntelliJ stuff
+  // forked (refreshed November 2017) to disable bintray stuff, IntelliJ stuff
   ${vars.base} {
     name: "scalafmt"
     uri:  ${vars.uris.scalafmt-uri}
-    // let's keep our ambitions modest for now (November 2017)
-    // and just try to build core (and no Scala.js plz, of course)
-    extra.projects: ["coreJVM"]
+    extra.projects: ["coreJVM", "cli", "tests"]
   }
 
   // dependency of scalafmt

From 42d76bdbd9bd80dcdb75a8a689a0f0cdf650df47 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 19:40:19 -0800
Subject: [PATCH 15/18] wip

---
 configs/community.dbuild  | 13 +++++++++++--
 configs/project-refs.conf |  3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index b481215e3..306f562ee 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1454,6 +1454,15 @@ build += {
     extra.projects: ["coreJVM", "cli", "tests"]
   }
 
+  // dependency of scalafmt. frozen at an old version because that's what
+  // scalafmt expects.  (over in the other scalameta space, scalafix expects
+  // a newer version.)
+  ${vars.base} {
+    name: "metaconfig-old"
+    uri:  ${vars.uris.metaconfig-old-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+  }
+
   // dependency of scalafmt
   // forked (July 2017) for dbuild friendliness
   ${vars.base} {
@@ -1545,8 +1554,8 @@ build += {
 
   // dependency of scalafix
   ${vars.base} {
-    name: "metaconfig"
-    uri:  ${vars.uris.metaconfig-uri}
+    name: "metaconfig-new"
+    uri:  ${vars.uris.metaconfig-new-uri}
     extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
   }
 
diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index bdfb4069d..c7af5a202 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -52,7 +52,8 @@ vars.uris: {
   macro-compat-uri:             "https://github.com/milessabin/macro-compat.git"
   macro-paradise-uri:           "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
   meta-paradise-uri:            "https://github.com/SethTisue/paradise.git#community-build-2.12"
-  metaconfig-uri:               "https://github.com/olafurpg/metaconfig.git"
+  metaconfig-old-uri:           "https://github.com/olafurpg/metaconfig.git#b13e6bbbf"
+  metaconfig-new-uri:           "https://github.com/olafurpg/metaconfig.git"
   mima-uri:                     "https://github.com/lightbend/migration-manager.git"
   minitest-uri:                 "https://github.com/monix/minitest.git"
   monix-uri:                    "https://github.com/monix/monix.git#18f91fdf5"  # was master

From 22eb2e064fa458b72d542a0b626ab3ca3636339d Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 20:04:03 -0800
Subject: [PATCH 16/18] wip

---
 configs/community.dbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 306f562ee..a30f3d99b 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1483,7 +1483,7 @@ build += {
     uri:  ${vars.uris.scalameta-1-uri}
     // else, bintray stuff goes boom
     extra.options: ["-Dsbt.prohibit.publish=true"]
-    extra.projects: ["scalametaJVM"]  // no Scala.js. just the minimum scalafmt needs?
+    extra.projects: ["scalametaJVM", "testkit"]  // no Scala.js. just the minimum scalafmt needs?
     extra.exclude: [
       // we never build sbt plugins or benchmarks
       "benchmarks"

From 06256241c8d8ac0f0b897cf94cb57041b9e73560 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 20:58:40 -0800
Subject: [PATCH 17/18] wip

---
 configs/community.dbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/community.dbuild b/configs/community.dbuild
index 227d65f3b..8054cfeef 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -1470,7 +1470,8 @@ build += {
 
   projects: [
 
-  // forked (refreshed November 2017) to disable bintray stuff, IntelliJ stuff
+  // forked (refreshed November 2017) to disable bintray stuff, IntelliJ stuff,
+  // and to remove a failing git-based test
   ${vars.base} {
     name: "scalafmt"
     uri:  ${vars.uris.scalafmt-uri}

From fc1bac255456f1d21d1e287865f01b6fc563c3af Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Mon, 20 Nov 2017 21:21:35 -0800
Subject: [PATCH 18/18] wip

---
 configs/project-refs.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 9ec960630..8e0469732 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -51,7 +51,7 @@ vars.uris: {
   machinist-uri:                "https://github.com/typelevel/machinist.git"
   macro-compat-uri:             "https://github.com/milessabin/macro-compat.git"
   macro-paradise-uri:           "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
-  meta-paradise-uri:            "https://github.com/SethTisue/paradise.git#community-build-2.12"
+  meta-paradise-uri:            "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12-meta-paradise"
   metaconfig-old-uri:           "https://github.com/olafurpg/metaconfig.git#b13e6bbbf"
   metaconfig-new-uri:           "https://github.com/olafurpg/metaconfig.git"
   mima-uri:                     "https://github.com/lightbend/migration-manager.git"
@@ -101,7 +101,7 @@ vars.uris: {
   scalaj-http-uri:              "https://github.com/scalaj/scalaj-http.git"
   scalachess-uri:               "https://github.com/ornicar/scalachess.git"
   scalalib-uri:                 "https://github.com/ornicar/scalalib.git"
-  scalameta-1-uri:              "https://github.com/SethTisue/scalameta.git#community-build-2.12-scalameta1"  # was v1.7.0
+  scalameta-1-uri:              "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12-scalameta1"  # was v1.7.0
   scalameta-2-uri:              "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
   scalameter-uri:               "https://github.com/scalameter/scalameter.git"
   scalamock-uri:                "https://github.com/paulbutcher/ScalaMock.git#1e84ffe"  # was master