Skip to content

Commit fe74dc1

Browse files
committed
2.13: get ScalaCheck green again
1 parent 64ce8ba commit fe74dc1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

configs/community.dbuild

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ set commands ++= {
107107
}
108108
"""
109109
vars.default-commands += "appendScalacOptions "${vars.scalac-opts}
110-
vars.default-commands += "removeScalacOptions -Yno-adapted-args"
111-
vars.default-commands += "removeScalacOptions -Xfatal-warnings"
110+
vars.default-commands += "removeScalacOptions -Xfatal-warnings -Yno-adapted-args -Ywarn-inaccessible -Ywarn-nullary-override -Ywarn-nullary-unit -Ywarn-infer-any -Ywarn-unused-import"
112111
vars.default-commands += "appendScalacOptions -Ymacro-annotations"
113112
vars.default-commands += "removeMacroParadise"
114113
vars.base.extra.commands = ${vars.default-commands}
@@ -203,7 +202,11 @@ build += {
203202
${vars.base} {
204203
name: "scalacheck"
205204
uri: ${vars.uris.scalacheck-uri}
205+
extra.sbt-version: ${vars.sbt-1-version}
206206
extra.projects: ["jvm"] // no Scala.js please
207+
extra.commands: ${vars.base.extra.commands} [
208+
"set jvm/Test/unmanagedSources/excludeFilter := HiddenFileFilter || \"SerializabilitySpecification.scala\""
209+
]
207210
}
208211

209212
// see also scalatest-tests

configs/project-refs.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ vars.uris: {
122122
scala-xml-quote-uri: "https://github.com/allanrenucci/scala-xml-quote.git#bintray"
123123
scala-xml-uri: "https://github.com/scala/scala-xml.git#newCollectionsBootstrap"
124124
scalacheck-shapeless-uri: "https://github.com/alexarchambault/scalacheck-shapeless.git"
125-
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
125+
scalacheck-uri: "https://github.com/lrytz/scalacheck.git#m4"
126126
scalachess-uri: "https://github.com/ornicar/scalachess.git"
127127
scaladex-uri: "https://github.com/scalacenter/scaladex.git#8f943f1961" # was master
128128
scalafix-uri: "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"

0 commit comments

Comments
 (0)