From fe74dc1739b9b857d7dc0ea33e0d44284cac64da Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Fri, 8 Jun 2018 13:59:56 -0700
Subject: [PATCH] 2.13: get ScalaCheck green again

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

diff --git a/configs/community.dbuild b/configs/community.dbuild
index c613fb5a9..f05061b5c 100644
--- a/configs/community.dbuild
+++ b/configs/community.dbuild
@@ -107,8 +107,7 @@ set commands ++= {
 }
 """
 vars.default-commands += "appendScalacOptions "${vars.scalac-opts}
-vars.default-commands += "removeScalacOptions -Yno-adapted-args"
-vars.default-commands += "removeScalacOptions -Xfatal-warnings"
+vars.default-commands += "removeScalacOptions -Xfatal-warnings -Yno-adapted-args -Ywarn-inaccessible -Ywarn-nullary-override -Ywarn-nullary-unit -Ywarn-infer-any -Ywarn-unused-import"
 vars.default-commands += "appendScalacOptions -Ymacro-annotations"
 vars.default-commands += "removeMacroParadise"
 vars.base.extra.commands = ${vars.default-commands}
@@ -203,7 +202,11 @@ build += {
   ${vars.base} {
     name: "scalacheck"
     uri:  ${vars.uris.scalacheck-uri}
+    extra.sbt-version: ${vars.sbt-1-version}
     extra.projects: ["jvm"]  // no Scala.js please
+    extra.commands: ${vars.base.extra.commands} [
+      "set jvm/Test/unmanagedSources/excludeFilter := HiddenFileFilter || \"SerializabilitySpecification.scala\""
+    ]
   }
 
   // see also scalatest-tests
diff --git a/configs/project-refs.conf b/configs/project-refs.conf
index 4e54471b1..7195645fd 100644
--- a/configs/project-refs.conf
+++ b/configs/project-refs.conf
@@ -122,7 +122,7 @@ vars.uris: {
   scala-xml-quote-uri:          "https://github.com/allanrenucci/scala-xml-quote.git#bintray"
   scala-xml-uri:                "https://github.com/scala/scala-xml.git#newCollectionsBootstrap"
   scalacheck-shapeless-uri:     "https://github.com/alexarchambault/scalacheck-shapeless.git"
-  scalacheck-uri:               "https://github.com/SethTisue/scalacheck.git#newCollections"  # was rickynils, 9b71bb3dfe186c03292faa59976487af2ee23caa; we were also using lrytz's branch in the same fork for a while, Seth's is based off that
+  scalacheck-uri:               "https://github.com/lrytz/scalacheck.git#m4"
   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"