refresh scalafmt fork

to a much newer version that doesn't have so many idiosyncratic
dependencies

Author: SethTisue

configs/community.dbuild

@@ -4,8 +4,8 @@
 // - scala
 // - scala.main
 //   - scala.main.jawn_0_10
-//     - scala.main.jawn_0_10.scalameta_1
-//     - scala.main.jawn_0_10.scalameta_2
+//     - scala.main.jawn_0_10.metaconfig_new
+//     - scala.main.jawn_0_10.metaconfig_old
 //   - scala.main.jawn_0_11
 // - scala.scalaz8
 
@@ -15,11 +15,10 @@
 // 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.)
+// the metaconfig split is because we want to have both scalafmt
+//   and scalafix, but they are on incompatible metaconfig versions.
+//   (this is easy to keep segregated since scalafmt and scalafix tend
+//   to be build-level dependencies, not project-level dependencies.)
 
 // the scalaz 7/8 split is because both scalaz versions use (at least
 //   some of) the same artifact names
@@ -1646,6 +1645,46 @@ build += {
     check-missing: false
   }
 
+  // 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.5\""
+    ]
+  }
+
+  ${vars.base} {
+    name: "jsoniter-scala"
+    uri:  ${vars.uris.jsoniter-scala-uri}
+    extra.sbt-version: ${vars.sbt-1-version}
+    extra.exclude: ["benchmark"]
+  }
+
+  ${vars.base} {
+    name: "scalatex"
+    uri:  ${vars.uris.scalatex-uri}
+    extra.exclude: [
+      "scalatexSbtPlugin"  // we never build sbt plugins
+      "site", "readme", "scrollspy"  // these use Scala.js
+    ]
+  }
+
 ]}
 
 //// space: jawn_0_10
@@ -1764,13 +1803,6 @@ build += {
     extra.projects: ["upickleJVM"]
   }
 
-  ${vars.base} {
-    name: "jsoniter-scala"
-    uri:  ${vars.uris.jsoniter-scala-uri}
-    extra.sbt-version: ${vars.sbt-1-version}
-    extra.exclude: ["benchmark"]
-  }
-
   // dependency of scaladex. depends on upickle
   ${vars.base} {
     name: "autowire"
@@ -1815,16 +1847,6 @@ build += {
     ]
   }
 
-  // depends on ammonite-ops
-  ${vars.base} {
-    name: "scalatex"
-    uri:  ${vars.uris.scalatex-uri}
-    extra.exclude: [
-      "scalatexSbtPlugin"  // we never build sbt plugins
-      "site", "readme", "scrollspy"  // these use Scala.js
-    ]
-  }
-
   // see also ammonite-ops.
   // frozen (April 2018) at a March 2018 commit before a problematic upickle
   // upgrade; see also upickle
@@ -2006,11 +2028,11 @@ build += {
 
 ]}
 
-//// space: scalameta_1
+//// space: metaconfig_new
 
 build += {
 
-  space: scala.main.jawn_0_10.scalameta_1
+  space: scala.main.jawn_0_10.metaconfig_new
 
   check-missing: [ true, false ]
   cross-version: [ disabled, standard ]
@@ -2019,64 +2041,42 @@ build += {
 
   projects: [
 
-  // forked (refreshed November 2017) to disable bintray stuff, IntelliJ stuff,
-  // and to remove a failing git-based test
+  // forked (June 2018) to disable IntelliJ stuff
   ${vars.base} {
     name: "scalafmt"
     uri:  ${vars.uris.scalafmt-uri}
     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} {
-    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: ${vars.default-commands} [
-      "set unmanagedSourceDirectories in (paradise, Compile) += (baseDirectory in paradise).value / \"src\" / \"main\" / \"scala-2.12.2\""
+      "set every bintrayReleaseOnPublish := false"
+      // one test failure, maybe xml-related, I should report it upstream
+      "set excludeFilter in (Test, unmanagedSources) in tests := HiddenFileFilter || \"FormatTests.scala\""
     ]
   }
 
-  // dependency of scalafmt
+  // dependency of scalafmt. frozen at an old version because that's what
+  // scalafmt expects
   ${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", "testkit"]  // no Scala.js. just the minimum scalafmt needs?
-    extra.exclude: [
-      // we never build sbt plugins or benchmarks
-      "benchmarks"
+    name: "metaconfig-new"
+    uri:  ${vars.uris.metaconfig-new-uri}
+    extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+    // I guess dbuild is getting confused by the extra _1.13?
+    deps.ignore: ["com.github.alexarchambault#scalacheck-shapeless"]
+    deps.inject: ${vars.base.deps.inject} [
+      "com.github.alexarchambault#scalacheck-shapeless_1.13"
     ]
-    extra.commands: ${vars.default-commands} [
-      // 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\""
-      "set unmanagedSourceDirectories in (scalahost, Compile) += (baseDirectory in scalahost).value / \"src\" / \"main\" / \"scala-2.12.1\""
+    check-missing: false
+    extra.settings: ${vars.base.extra.settings} [
+      "conflictWarning in ThisBuild := ConflictWarning.disable"
     ]
   }
 
 ]}
 
-//// space: scalameta_2
+//// space: metaconfig-old
 
 build += {
 
-  space: scala.main.jawn_0_10.scalameta_2
+  space: scala.main.jawn_0_10.metaconfig_old
 
   check-missing: [ true, false ]
   cross-version: [ disabled, standard ]
@@ -2085,30 +2085,6 @@ build += {
 
   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.5\""
-    ]
-  }
-
   // adding (September 2017) because scalafix's "cli" subproject uses it.
   // forked to remove coursier and upgrade sbt-bintray
   ${vars.base} {
@@ -2122,15 +2098,20 @@ build += {
     extra.projects: ["runtime"]
   }
 
-  // dependency of scalafix.  frozen (April 2018) at v0.6.0 since newer commits break
-  // scalafix. presumably this is a temporarily transitional state and we should attempt
-  // to unfreeze once things settle down. (the commit descriptions indicate this is part of
-  // an effort to move scalafmt onto newer versions of things -- it'd be great to have
-  // scalafmt and scalafix in the same space.)
+  // dependency of scalafix, frozen (June 2018) at v0.8.3 (the version scalafix uses)
   ${vars.base} {
-    name: "metaconfig-new"
-    uri:  ${vars.uris.metaconfig-new-uri}
+    name: "metaconfig-old"
+    uri:  ${vars.uris.metaconfig-old-uri}
     extra.projects: ["metaconfig-hoconJVM", "metaconfig-typesafe-config"]  // no Scala.js plz
+    // I guess dbuild is getting confused by the extra _1.13?
+    deps.ignore: ["com.github.alexarchambault#scalacheck-shapeless"]
+    deps.inject: ${vars.base.deps.inject} [
+      "com.github.alexarchambault#scalacheck-shapeless_1.13"
+    ]
+    check-missing: false
+    extra.settings: ${vars.base.extra.settings} [
+      "conflictWarning in ThisBuild := ConflictWarning.disable"
+    ]
   }
 
   // (here in this space because of ammonite-ops dependency)

configs/project-refs.conf

@@ -70,9 +70,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"
   magnolia-uri:                 "https://github.com/propensive/magnolia.git"
-  meta-paradise-uri:            "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12-meta-paradise"
-  metaconfig-new-uri:           "https://github.com/olafurpg/metaconfig.git#v0.6.0"
-  metaconfig-old-uri:           "https://github.com/olafurpg/metaconfig.git#b13e6bbbf"
+  metaconfig-new-uri:           "https://github.com/olafurpg/metaconfig.git#v0.7.2"
+  metaconfig-old-uri:           "https://github.com/olafurpg/metaconfig.git#v0.6.0"
   metrics-scala-uri:            "https://github.com/erikvanoosten/metrics-scala.git"
   mima-uri:                     "https://github.com/lightbend/migration-manager.git"
   minitest-uri:                 "https://github.com/monix/minitest.git"
@@ -127,12 +126,11 @@ vars.uris: {
   scalachess-uri:               "https://github.com/ornicar/scalachess.git"
   scaladex-uri:                 "https://github.com/scalacenter/scaladex.git#8f943f1961"  # was master
   scalafix-uri:                 "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"
-  scalafmt-uri:                 "https://github.com/scalacommunitybuild/scalafmt.git#community-build-2.12"
+  scalafmt-uri:                 "https://github.com/SethTisue/scalafmt.git#community-build-2.12"
   scalaj-http-uri:              "https://github.com/scalaj/scalaj-http.git"
   scalajson-uri:                "https://github.com/mdedetrich/scalajson.git"
   scalalib-uri:                 "https://github.com/ornicar/scalalib.git"
-  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"
+  scalameta-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#410b853c0"  # was master