Merge remote-tracking branch 'origin/2.12.x' into sbt-0.13.16

Author: SethTisue

configs/community.dbuild

@@ -117,6 +117,9 @@ build += {
         uri: "https://github.com/scala/scala-xml.git"
         extra.commands: ${vars.default-commands} [
           "set scalaVersion := \""${vars.scala-version}"\""
+          // work around https://github.com/scala/community-builds/issues/575
+          // (in a community build context, we don't need MiMa to run)
+          "set every ScalaModulePlugin.mimaPreviousVersion := None"
         ]
         extra.projects: ["xmlJVM"]
       }
@@ -136,33 +139,68 @@ build += {
   projects: [
 
   ${vars.base} {
-    name: "scala-partest-interface"
-    uri:  ${vars.uris.scala-partest-interface-uri}
+    name: "scala-parser-combinators"
+    uri:  ${vars.uris.scala-parser-combinators-uri}
+    extra.exclude: ["scala-parser-combinatorsJS"]
   }
 
+  // if master proves difficult to track, the 0.6.x branch could be
+  // used instead; see discussion at
+  // https://github.com/scala/community-builds/issues/506
   ${vars.base} {
-    name: "scala-partest"
-    uri:  ${vars.uris.scala-partest-uri}
+    name: "scala-js"
+    uri:  ${vars.uris.scala-js-uri}
+    extra: ${vars.base.extra} {
+      // hopefully avoid intermittent OutOfMemoryErrors with default 1.5G heap?
+      options: ["-Xmx2048m"]
+      projects: [ tools, testSuite, stubs ]
+      commands: ${vars.default-commands} [
+        // - Disable compiler/test because it is very fragile.
+        "set test in (Build.compiler, Test) := {}"
+        // - Disable fatal Scaladoc warnings, also fragile
+        "removeScalacOptions -Xfatal-warnings"
+        // - We disable source map tests to save ourselves a `npm install source-map-support` on the workers.
+        //   Although only `testSuite` actually has tests, dbuild will try to run the tests for all projects
+        //   that `testSuite` depends on (transitively), so we need to set it in a bunch of places.
+        "set Seq(library, testInterface, jUnitRuntime, testSuite).map(p => jsEnv in p := new org.scalajs.jsenv.nodejs.NodeJSEnv(org.scalajs.jsenv.nodejs.NodeJSEnv.Config().withExecutable(\""${vars.node}"\").withSourceMap(false)))"
+      ]
+    }
   }
 
+  // frozen (June 2017) at an April 2017 commit; newer commits
+  // broke the scalacheck subproject of specs2
   ${vars.base} {
-    name: "scala-swing"
-    uri:  ${vars.uris.scala-swing-uri}
+    name: "scalacheck"
+    uri:  ${vars.uris.scalacheck-uri}
+    extra.projects: ["jvm"]  // no Scala.js please
+    // because of new unused warnings in 2.12.2
+    extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ]
   }
 
   ${vars.base} {
-    name: "scala-parser-combinators"
-    uri:  ${vars.uris.scala-parser-combinators-uri}
-    extra.exclude: ["scala-parser-combinatorsJS"]
+    name: "scalatest"
+    uri:  ${vars.uris.scalatest-uri}
+    extra: ${vars.base.extra} {
+      projects: ["scalatest", "scalactic"]
+      test-tasks: ["compile"] // TODO run tests -- need to exclude browser-based tests somehow
+    }
   }
 
-  // frozen at a March 2017 commit before https://github.com/scala/community-builds/issues/493
-  // was introduced.  hopefully Rickard will find a different solution for
-  // https://github.com/rickynils/scalacheck/issues/318
   ${vars.base} {
-    name: "scalacheck"
-    uri:  ${vars.uris.scalacheck-uri}
-    extra.projects: ["jvm"]  // no Scala.js please
+    name: "scala-partest-interface"
+    uri:  ${vars.uris.scala-partest-interface-uri}
+  }
+
+  ${vars.base} {
+    name: "scala-partest"
+    uri:  ${vars.uris.scala-partest-uri}
+    extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ] # Deprecated optimizer settings
+
+  }
+
+  ${vars.base} {
+    name: "scala-swing"
+    uri:  ${vars.uris.scala-swing-uri}
   }
 
   // tracking master as of December 2016.  if master proves unstable,
@@ -237,15 +275,6 @@ build += {
     ]
   }
 
-  ${vars.base} {
-    name: "scalatest"
-    uri:  ${vars.uris.scalatest-uri}
-    extra: ${vars.base.extra} {
-      projects: ["scalatest", "scalactic"]
-      test-tasks: ["compile"] // TODO run tests -- need to exclude browser-based tests somehow
-    }
-  }
-
   ${vars.base} {
     name: "genjavadoc"
     uri:  ${vars.uris.genjavadoc-uri}
@@ -308,9 +337,6 @@ build += {
     uri: ${vars.uris.scalariform-uri}
     // warnings reported upstream at https://github.com/scala-ide/scalariform/issues/234
     extra.commands: ${vars.default-commands} [ "removeScalacOptions -Xfatal-warnings" ]
-    // tests don't compile on ScalaTest 3.0. reported upstream at
-    // https://github.com/scala-ide/scalariform/issues/232
-    extra.run-tests: false
   }
 
   ${vars.base} {
@@ -351,29 +377,6 @@ build += {
     uri:  ${vars.uris.sbinary-uri}
   }
 
-  // if master proves difficult to track, the 0.6.x branch could be
-  // used instead; see discussion at
-  // https://github.com/scala/community-builds/issues/506
-  ${vars.base} {
-    name: "scala-js"
-    uri:  ${vars.uris.scala-js-uri}
-    extra: ${vars.base.extra} {
-      // hopefully avoid intermittent OutOfMemoryErrors with default 1.5G heap?
-      options: ["-Xmx2048m"]
-      projects: [ tools, testSuite, stubs ]
-      commands: ${vars.default-commands} [
-        // - Disable compiler/test because it is very fragile.
-        "set test in (Build.compiler, Test) := {}"
-        // - Disable fatal Scaladoc warnings, also fragile
-        "removeScalacOptions -Xfatal-warnings"
-        // - We disable source map tests to save ourselves a `npm install source-map-support` on the workers.
-        //   Although only `testSuite` actually has tests, dbuild will try to run the tests for all projects
-        //   that `testSuite` depends on (transitively), so we need to set it in a bunch of places.
-        "set Seq(library, testInterface, jUnitRuntime, testSuite).map(p => jsEnv in p := new org.scalajs.jsenv.nodejs.NodeJSEnv(executable = \""${vars.node}"\").withSourceMap(false))"
-      ]
-    }
-  }
-
   // forked (April 2017) for 2.12.2 and 2.13 compat.
   // can be unforked once these PRs are merged:
   // * https://github.com/lihaoyi/utest/pull/107
@@ -460,6 +463,10 @@ build += {
     extra.projects: ["fs2CatsJVM"]  // no Scala.js
   }
 
+  // frozen at May 2017 commit because newer commits caused a failure
+  // in monix: https://github.com/monix/monix/issues/366
+  // and moved (in June 2017) to an even older (April 2017) commit
+  // so that doodle compiles
   ${vars.base} {
     name: "cats"
     uri:  ${vars.uris.cats-uri}
@@ -562,14 +569,17 @@ build += {
     extra.test-tasks: ["compile"]
   }
 
-  // frozen (April 2017) because a newer commit caused a test failure in scalamock;
-  // see Adriaan's comment on the culprit commit:
-  // https://github.com/etorreborre/specs2/commit/e4e9ab771d213fb8becd51af180354bc240bb2c1#commitcomment-21743802
   ${vars.base} {
     name: "specs2"
     uri:  ${vars.uris.specs2-uri}
     extra.test-tasks: ["compile"] // TODO: ??? - hasn't been tried lately
-    extra.exclude: ["guide"]  // eff-related compile errors, as of January 2017 anyway
+    extra.exclude: [
+      // eff-related compile errors, as of January 2017 anyway
+      "guide"
+      // not community build relevant, and was causing error
+      // ("multiple projects have the same artifacts visible in the same space")
+      "pom"
+    ]
     extra.commands: ${vars.default-commands} [
       // too fragile? TODO: I got a non-exhaustive match warning that
       // could conceivably indicate some real regression. or maybe it's
@@ -581,6 +591,9 @@ build += {
   ${vars.base} {
     name: "ssl-config"
     uri:  ${vars.uris.ssl-config-uri}
+    // repeated hangs during testing; see
+    // https://github.com/scala/community-builds/issues/560
+    extra.test-tasks: ["compile"]
   }
 
   ${vars.base} {
@@ -596,10 +609,6 @@ build += {
     extra.run-tests: false
   }
 
-  // disable -Xfatal-warnings because of new unused warnings introduced
-  // by https://github.com/scala/scala/pull/5402 ;
-  // reported upstream at https://github.com/ensime/pcplod/issues/20
-  // also forked (April 2017) to update a related test result
   ${vars.base} {
     name: "pcplod"
     uri:  ${vars.uris.pcplod-uri}
@@ -639,6 +648,8 @@ build += {
     extra.projects: ["play-jsonJVM"]  // no Scala.js plz
   }
 
+  // frozen (June 2017) after a test started failing;
+  // see https://github.com/scala/community-builds/issues/564
   ${vars.base} {
     name: "play-ws"
     uri:  ${vars.uris.play-ws-uri}
@@ -688,6 +699,11 @@ build += {
     extra.projects: ["lift-json"]
   }
 
+  // frozen (June 2017) at a June 2017 commit before breaking String
+  // vs. CharSequence changes went in and broke upickle.  see
+  // https://github.com/scala/community-builds/issues/565 .  we could
+  // unfreeze once there's a new jawn release for dependent projects
+  // to upgrade to
   ${vars.base} {
     name: "jawn"
     uri:  ${vars.uris.jawn-uri}
@@ -699,14 +715,17 @@ build += {
     extra.projects: ["ast", "parser", "json4s", "spray"]
   }
 
+  // frozen (June 2017) at a November 2016 commit because newer commits failed
+  // to compile -- I guess because fs2 is changing? ticket is
+  // https://github.com/scala/community-builds/issues/563
   ${vars.base} {
     name: "jawn-fs2"
     uri:  ${vars.uris.jawn-fs2-uri}
   }
 
   // forked (updated March 2017) because of bintray-sbt errors;
   // see https://github.com/typesafehub/dbuild/issues/158 (fixed in
-  // at least some cases in dbuild 0.9.7-RC1? not in this case)
+  // at least some cases in dbuild 0.9.7? not in this case)
   ${vars.base} {
     name: "scalamock"
     uri:  ${vars.uris.scalamock-uri}
@@ -795,7 +814,7 @@ build += {
     name: "scala-json-ast"
     uri:  ${vars.uris.scala-json-ast-uri}
     // no Scala.js please, and no benchmarks either
-    extra.projects: ["scalaJsonASTJVM"]
+    extra.projects: ["scalaJsonJVM"]
   }
 
   ${vars.base} {
@@ -839,31 +858,15 @@ build += {
     extra.projects: ["minitestJVM", "lawsJVM"]  // no Scala.js
   }
 
+  // using series/2.x rather than master because tracking master
+  // was causing some compile failures, probably having to do with
+  // the dependency changes happening recently (June 2017)
   ${vars.base} {
     name: "monix"
     uri:  ${vars.uris.monix-uri}
     extra.projects: ["coreJVM", "tckTests"]  // no Scala.js, no benchmarks
   }
 
-  ${vars.base} {
-    name: "conductr-lib"
-    uri:  ${vars.uris.conductr-lib-uri}
-    extra.exclude: [
-      // not our Akka version
-      "akka23Common", "akka23ConductRBundleLib", "akka23TestLib"
-      // we don't have Lagom yet
-      "lagom1JavaConductRBundleLib", "lagom1ScalaConductRBundleLib"
-      // not our Play version
-      "play23Common", "play23ConductRBundleLib", "play23ConductRClientLib"
-      // also not our Play version
-      "play24Common", "play24ConductRBundleLib", "play24ConductRClientLib"
-      // "That particular lib shouldn't be processed", says Christopher
-      "akka24ConductRClientLib"
-      // Play stuff didn't work, maybe try again later?
-      "play25ConductRBundleLib", "play25ConductRClientLib", "play25Common"
-    ]
-  }
-
   // this was added because conductr-lib's Play integration depended on it,
   // but we ended up not including that integration (for now anyway?), so
   // nothing depends on this.  leaving it in since we might as well, but
@@ -898,9 +901,6 @@ build += {
   ${vars.base} {
     name: "dispatch"
     uri:  ${vars.uris.dispatch-uri}
-    // running tests was intermittently hanging. reported upstream at
-    // https://github.com/dispatch/reboot/issues/137
-    extra.test-tasks: ["compile"]
   }
 
   ${vars.base} {
@@ -926,6 +926,7 @@ build += {
   ${vars.base} {
     name: "http4s-websocket"
     uri:  ${vars.uris.http4s-websocket-uri}
+    extra.projects: ["http4sWebsocketJVM"]  // no Scala.js plz
   }
 
   // frozen at v0.12.4 because that's the version http4s depends on,
@@ -985,10 +986,23 @@ build += {
     extra.projects: ["fansiJVM"]  // no Scala.js
   }
 
+  // as per https://github.com/lihaoyi/upickle-pprint/issues/209
+  // upickle is now obsolete (and the pprint part has its own repo now).
+  // leaving this here because it isn't causing, any trouble, and
+  // because we already have it forked/frozen. note that no other
+  // projects depend on it, so it could be dropped if any trouble
+  //  starts.  pprint is now separate.
   ${vars.base} {
-    name: "upickle-pprint"
-    uri:  ${vars.uris.upickle-pprint-uri}
-    extra.projects: ["upickleJVM", "pprintJVM"]  // no Scala.js
+    name: "upickle"
+    uri:  ${vars.uris.upickle-uri}
+    // no Scala.js; also only upickle no pprint
+    extra.projects: ["upickleJVM"]
+  }
+
+  ${vars.base} {
+    name: "pprint"
+    uri:  ${vars.uris.pprint-uri}
+    extra.projects: ["pprintJVM"]  // no Scala.js
   }
 
   ${vars.base} {
@@ -1122,7 +1136,9 @@ build += {
      extra.test-tasks: ["compile"]
   }
 
-  // adding (April 2017) because scalameta now depends on it
+  // adding (April 2017) because scalameta now depends on it.
+  // frozen (June 2017) since more recent revisions didn't compile;
+  // see https://github.com/scala/community-builds/issues/562
   ${vars.base} {
      name: "scalapb"
      uri:  ${vars.uris.scalapb-uri}
@@ -1139,10 +1155,43 @@ build += {
      extra.projects: ["lensesJVM"]  // no Scala.js plz
   }
 
+  // frozen at May 2017 commit because newer commits were failing;
+  // see https://github.com/scala/community-builds/issues/544
   ${vars.base} {
      name: "cats-effect"
      uri:  ${vars.uris.cats-effect-uri}
      extra.projects: ["coreJVM", "lawsJVM"]  // no Scala.js plz
   }
 
+  // forked (June 2017) to get rid of the usual bintray-sbt stuff that
+  // makes dbuild upset; also waiting on upstream merge of
+  // https://github.com/underscoreio/doodle/pull/55
+  ${vars.base} {
+     name: "doodle"
+     uri: ${vars.uris.doodle-uri}
+     extra.projects: ["doodleJVM"]  // no Scala.js plz
+  }
+
+  // once https://github.com/scala/scala-collections-laws/pull/18
+  // is merged we can track master
+  ${vars.base} {
+     name: "scala-collections-laws"
+     uri: ${vars.uris.scala-collections-laws-uri}
+     // as per the repo readme
+     extra.options: ["-XX:MaxMetaspaceSize=1G", "-Xmx6G"]
+     // note that we're not actually doing
+     // `runMain tests.generated.collection.Test_All` which is what
+     // the repo readme says to do. dbuild doesn't let us set
+     // extra.test-tasks to a task that takes arguments.  (anyway,
+     // it's not clear it's really necessary or appropriate to
+     // actually run the whole thing as part of the community build?)
+  }
+
+  ${vars.base} {
+     name: "better-files"
+     uri: ${vars.uris.better-files-uri}
+     // test failure reported upstream at https://github.com/pathikrit/better-files/issues/165
+     extra.test-tasks: ["compile"]
+  }
+
 ]}