Skip to content

ScalaTest 3.2 #1172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 71 commits into from
Jul 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
77eac3e
wip
SethTisue Jun 25, 2020
d7ec921
wip
SethTisue Jun 25, 2020
a6d102f
wip
SethTisue Jun 25, 2020
8cb3fb3
wip
SethTisue Jun 25, 2020
5c1b248
wip
SethTisue Jul 1, 2020
00d55ce
wip
SethTisue Jul 1, 2020
64c0b69
wip
SethTisue Jul 1, 2020
ff27ef1
wip
SethTisue Jul 1, 2020
3120124
Merge remote-tracking branch 'origin/2.13.x' into scalatest-3.2
SethTisue Jul 2, 2020
a61472c
Merge remote-tracking branch 'origin/2.13.x' into scalatest-3.2
SethTisue Jul 2, 2020
8e7828f
wip
SethTisue Jul 2, 2020
e3331fa
wip
SethTisue Jul 5, 2020
2967c2e
Merge remote-tracking branch 'origin/2.13.x' into scalatest-3.2
SethTisue Jul 6, 2020
82bd3d8
wip
SethTisue Jul 6, 2020
8ca8927
wip
SethTisue Jul 6, 2020
cc8779e
wip
SethTisue Jul 7, 2020
78a749b
wip
SethTisue Jul 7, 2020
d918873
wip
SethTisue Jul 7, 2020
2e62b01
wip
SethTisue Jul 7, 2020
5439e50
wip
SethTisue Jul 7, 2020
506937d
wip
SethTisue Jul 7, 2020
6e0c379
wip
SethTisue Jul 7, 2020
6f8718b
wip
SethTisue Jul 7, 2020
5382b5c
wip
SethTisue Jul 7, 2020
ac5369c
wip
SethTisue Jul 8, 2020
9e09ee1
wip
SethTisue Jul 8, 2020
58bc7ad
wip
SethTisue Jul 8, 2020
14b8e26
wip
SethTisue Jul 8, 2020
6c5031e
wip
SethTisue Jul 8, 2020
ff01d8e
wip
SethTisue Jul 8, 2020
fdafdd1
wip
SethTisue Jul 8, 2020
43b119a
wip
SethTisue Jul 8, 2020
ca7c03d
wip
SethTisue Jul 8, 2020
77fda91
wip
SethTisue Jul 8, 2020
99ea77f
wip
SethTisue Jul 8, 2020
a4be152
wip
SethTisue Jul 8, 2020
ffc76c7
wip
SethTisue Jul 8, 2020
404bb2e
wip
SethTisue Jul 8, 2020
37fcdd7
wip
SethTisue Jul 8, 2020
5cf0d17
wip
SethTisue Jul 8, 2020
65da76c
wip
SethTisue Jul 8, 2020
ccf4d2a
wip
SethTisue Jul 8, 2020
e066ae9
wip
SethTisue Jul 8, 2020
73e9681
wip
SethTisue Jul 8, 2020
74c096b
wip
SethTisue Jul 8, 2020
a8b5902
wip
SethTisue Jul 8, 2020
8da497c
wip
SethTisue Jul 8, 2020
64225a9
wip
SethTisue Jul 8, 2020
92be41c
oops
SethTisue Jul 8, 2020
b92ef96
wip
SethTisue Jul 8, 2020
eb08d80
wip
SethTisue Jul 9, 2020
7e62741
wip
SethTisue Jul 9, 2020
6c0fe92
wip
SethTisue Jul 9, 2020
cec5a0b
wip
SethTisue Jul 9, 2020
3de9fda
Merge remote-tracking branch 'origin/2.13.x' into scalatest-3.2
SethTisue Jul 23, 2020
f76390a
wip
SethTisue Jul 24, 2020
dd4f2de
wip
SethTisue Jul 24, 2020
763560d
wip
SethTisue Jul 24, 2020
96c4948
wip
SethTisue Jul 24, 2020
5b89c97
wip
SethTisue Jul 24, 2020
ec21c4d
Merge remote-tracking branch 'origin/2.13.x' into scalatest-3.2
SethTisue Jul 24, 2020
fc67955
wip
SethTisue Jul 24, 2020
ba6218c
wip
SethTisue Jul 24, 2020
ab58c3e
wip
SethTisue Jul 24, 2020
b532579
wip
SethTisue Jul 24, 2020
3fe9f65
wip
SethTisue Jul 24, 2020
8ce1bc2
wip
SethTisue Jul 24, 2020
322b04b
wip
SethTisue Jul 24, 2020
6a4a14a
wip
SethTisue Jul 24, 2020
4f70104
wip
SethTisue Jul 24, 2020
557c3a8
wip
SethTisue Jul 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 58 additions & 59 deletions dependencies.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion proj/akka-http-cors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ vars.proj.akka-http-cors: ${vars.base} {
extra.projects: ["akka-http-cors"]
// I don't know what this error is about:
// java.lang.AbstractMethodError: Method ch/megard/akka/http/cors/CorsDirectivesSpec.org$scalatest$Assertions$_setter_$assertionsHelper_$eq(Lorg/scalatest/Assertions$AssertionsHelper;)V is abstract
// maybe some ScalaTest 3.0 vs 3.1 thing. perhaps revisit once Akka moves to 3.1?
// maybe some ScalaTest 3.0 vs 3.2 thing. perhaps revisit once Akka moves to 3.1 or 2?
// for now, it's fine, we don't need to compile or run the tests
extra.run-tests: false
extra.commands: ${vars.default-commands} [
Expand Down
4 changes: 2 additions & 2 deletions proj/akka-http-session.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ vars.proj.akka-http-session: ${vars.base} {
deps.inject: ${vars.base.deps.inject} [
// not really sure why this doesn't get picked up, maybe a "provided" dependency issue?
"com.typesafe.akka#akka-testkit"
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
"scalacommunitybuild#scalatest"
]
extra.commands: ${vars.default-commands} [
// not really sure why akka-testkit doesn't get picked up, maybe a "provided" dependency issue?
"set libraryDependencies in core += \"com.typesafe.akka\" %% \"akka-testkit\" % \"0.0.0\" % Test"
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
Expand Down
11 changes: 7 additions & 4 deletions proj/akka-http.conf
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
// https://github.com/akka/akka-http.git#8d8aaa8f9a502b5d0f3e6de83e02b4bcdd0bf435 # was master
// https://github.com/scalacommunitybuild/akka-http.git#community-build-2.13 # was akka, master

// frozen (February 2020) at a February 2020 commit just before UseHttp2 was removed
// from the API (playframework, downstream, still uses it)
// frozen (February 2020) at a February 2020 commit (8d8aaa8f9a502b5d0f3e6de83e02b4bcdd0bf435)
// just before UseHttp2 was removed from the API (playframework, downstream, still uses it)

// forked (July 2020) for ScalaTest 3.2 compatibility -- had to cherry-pick a commit (50a899f7753)
// with the needed changes, it postdated the freeze point

vars.proj.akka-http: ${vars.base} {
name: "akka-http"
uri: "https://github.com/akka/akka-http.git#8d8aaa8f9a502b5d0f3e6de83e02b4bcdd0bf435"
uri: "https://github.com/scalacommunitybuild/akka-http.git#7e9299cad243c0f2eb4392c5e04d639d7832cd01"

extra.exclude: ["docs", "akka-http-bench-jmh"]
extra.options: [
Expand Down
6 changes: 0 additions & 6 deletions proj/akka-management.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@ vars.proj.akka-management: ${vars.base} {
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
// for now anyway, ambition level is just to include anything lagom needs
extra.projects: ["akka-management", "cluster-bootstrap", "cluster-http"]
// ScalaTest 3.0, not 3.1
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.1
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
// and as usual
"set every bintrayReleaseOnPublish := false"
]
// we got errors trying to run the tests, but Patrik suggests we not bother
Expand Down
4 changes: 4 additions & 0 deletions proj/akka-persistence-cassandra.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,9 @@ vars.proj.akka-persistence-cassandra: ${vars.base} {
// "FIXME enable again when branch for Akka 2.6.x", so we exclude it
// https://github.com/akka/akka-persistence-cassandra/blob/fcf62f418ea4037b7966b261b4993178795b903f/core/src/test/scala/akka/persistence/cassandra/journal/CassandraLoadTypedSpec.scala#L5
"""set core / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "CassandraLoadTypedSpec.scala""""
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
7 changes: 4 additions & 3 deletions proj/akka-persistence-jdbc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@
// updates their dependency to use the new org, we could probably
// unfreeze

// and then forked from that commit to upgrade to ScalaTest 3.1.0
// and then forked from that commit to upgrade to ScalaTest 3.1
// (because the usual way of overriding the dependency ran into
// trouble; see https://github.com/scala/community-build/issues/1072)
// (fork updated July 2020 for ScalaTest 3.2)

vars.proj.akka-persistence-jdbc: ${vars.base} {
name: "akka-persistence-jdbc"
uri: "https://github.com/scalacommunitybuild/akka-persistence-jdbc.git#53b195b58452df5fb92271018482a3e48d0ad713"
uri: "https://github.com/scalacommunitybuild/akka-persistence-jdbc.git#b48a78c99b3d11adcc7fa8c5783bf87bed0b3b27"

// it isn't clear to me that there are any tests we can run without
// doing the Docker stuff in their test.sh script. we might ask the
// Akka team if there is any segregation between unit vs. integration tests,
// that kind of thing?
extra.test-tasks: "compile"
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
extra.commands: ${vars.default-commands} [
"set every bintrayReleaseOnPublish := false"
]
extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]
}
2 changes: 1 addition & 1 deletion proj/breeze.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ vars.proj.breeze: ${vars.base} {

extra.exclude: ["benchmark"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
// flaky
Expand Down
6 changes: 6 additions & 0 deletions proj/cachecontrol.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ vars.proj.cachecontrol: ${vars.base} {
name: "cachecontrol"
uri: "https://github.com/playframework/cachecontrol.git#aea2d269556d3b6e484bc8c815757a5f65ae6079"

// ScalaTest 3.0, not 3.2
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
12 changes: 5 additions & 7 deletions proj/circe-config.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
// https://github.com/circe/circe-config.git#master

// added because it's a dependency of scala-pet-store

vars.proj.circe-config: ${vars.base} {
name: "circe-config"
uri: "https://github.com/circe/circe-config.git#c031f9e97024e4454df3f90ec2cd013235e3f8b7"

// dependency is on prelease version with different artifact name, so we must
// override to the released artifact name
deps.inject: ["org.scalatestplus#scalacheck-1-14"]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatestplus scalatestplus-scalacheck"
"""set libraryDependencies in ThisBuild += "org.scalatestplus" %% "scalacheck-1-14" % "0" % Test"""
]
// (July 2020) this is a bit sad, but I don't see a way to work around
// https://github.com/tkawachi/sbt-doctest/issues/135
extra.run-tests: false
}
4 changes: 4 additions & 0 deletions proj/classutil.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ vars.proj.classutil: ${vars.base} {
extra.commands: ${vars.default-commands} [
"set every bintrayReleaseOnPublish := false"
"set every bintrayOmitLicense := true" // otherwise it complains we don't have one
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
6 changes: 6 additions & 0 deletions proj/discipline-scalatest.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ vars.proj.discipline-scalatest: ${vars.base} {
uri: "https://github.com/typelevel/discipline-scalatest.git#1677d4e14cfa58e88f8a9bb67e5e728812baf30d"

extra.exclude: ["*JS", "docs"]
extra.commands: ${vars.default-commands} [
// discipline-scalatest is still on 3.1, and if we don't do anything, we just
// get scalatest-core which isn't enough. the easiest way to get the optional
// add-ons we need is just to depend on the mega-JAR
"""set ThisBuild / libraryDependencies += "org.scalatest" %% "scalatest" % "0""""
]
}
6 changes: 6 additions & 0 deletions proj/elastic4s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@ vars.proj.elastic4s: ${vars.base} {
uri: "https://github.com/sksamuel/elastic4s.git#a967eb96da75138404a683a6f6e52d06f5997612"

extra.projects: ["elastic4s-core"]
// ScalaTest 3.0, not 3.2
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
12 changes: 10 additions & 2 deletions proj/enumeratum.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@ vars.proj.enumeratum: ${vars.base} {
name: "enumeratum"
uri: "https://github.com/scalacommunitybuild/enumeratum.git#075b5394821be4d60cbc03f2d3e53a7ec98f0e6d"

// no idea why this isn't picked up otherwise
deps.inject: ["com.lihaoyi#pprint"]
extra.projects: [
"coreJVM", "coreJVMTests"
// as for other subprojects, for now let's just pull in what lsp4s
// needs. maybe add more later
"enumeratumCirceJVM"
]
deps.inject: ${vars.base.deps.inject} [
// no idea why this isn't picked up otherwise
"com.lihaoyi#pprint"
// ScalaTest 3.0 not 3.2
"scalacommunitybuild#scalatest"
]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
}
4 changes: 2 additions & 2 deletions proj/finagle.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ vars.proj.finagle: ${vars.base} {

// I didn't attempt to add any other subprojects
extra.projects: ["finagle-core"]
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
// flaky tests
Expand Down
21 changes: 7 additions & 14 deletions proj/fs2.conf
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
// https://github.com/functional-streams-for-scala/fs2.git#7e58b9324b85bebde1b3fbd1274f9a7c580de6a6
// https://github.com/functional-streams-for-scala/fs2.git#main

// note that this repo has required JDK 11 for building (since January 2020)

// frozen (March 2020) at version that happens to work with
// pureconfig downstream

vars.proj.fs2: ${vars.base} {
name: "fs2"
uri: "https://github.com/functional-streams-for-scala/fs2.git#7e58b9324b85bebde1b3fbd1274f9a7c580de6a6"
uri: "https://github.com/functional-streams-for-scala/fs2.git#0d5de35860b0734163c28ffb547bb4e22ef91eed"

// no Scala.js, no benchmarks or docs
extra.projects: ["coreJVM", "reactiveStreams", "io"]
// yuck. we should really revisit this once they upgrade to ScalaTest 3.1 final
// they use GeneratorDrivenPropertyChecks which is only available in a ScalaTest 3.3 snapshot;
// so, don't even compile tests, let alone run them
extra.run-tests: false
// ignore missing scalatestplus-scalacheck
check-missing: false
deps.ignore: ["org.scalatestplus#scalatestplus-scalacheck"]
extra.settings: ${vars.base.extra.settings} [
"conflictWarning in ThisBuild := ConflictWarning.disable"
]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatestplus scalatestplus-scalacheck"
// don't even compile tests, let alone run them
"removeDependency org.scalatestplus scalatestplus-testng"
"""set coreJVM / Test / unmanagedSourceDirectories := Seq()"""
"""set coreJVM / Test / managedSources := Seq()"""
"""set reactiveStreams / Test / unmanagedSourceDirectories := Seq()"""
"""set reactiveStreams / Test / managedSources := Seq()"""
"""set io / Test / unmanagedSourceDirectories := Seq()"""
// otherwise sbt-gpg errors on `publish`
"set every gpgWarnOnFailure := true"
Expand Down
4 changes: 2 additions & 2 deletions proj/gigahorse.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ vars.proj.gigahorse: ${vars.base} {

// as of August 2017, doesn't compile against latest akka-http
extra.exclude: ["akkaHttp"]
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
}
4 changes: 4 additions & 0 deletions proj/giter8.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ vars.proj.giter8: ${vars.base} {
"set every bintrayReleaseOnPublish := false"
]
check-missing: false // ignore missing scripted-sbt
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
// intermittent failures reported upstream:
// https://github.com/foundweekends/giter8/issues/455
"""set lib / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "VersionNumberOrderingTest.scala" || "FormatSpecification.scala""""
Expand Down
4 changes: 4 additions & 0 deletions proj/grizzled.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,9 @@ vars.proj.grizzled: ${vars.base} {
// don't happen in Brian's own CI, I have no idea. doesn't seem worth
// investigating
"set every wartremoverErrors := Seq()"
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
6 changes: 3 additions & 3 deletions proj/http4s.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// https://github.com/http4s/http4s.git#v0.21.0
// https://github.com/http4s/http4s.git#v0.21.6

// this is a big build with a ton of subprojects. we needn't be shy
// about disabling fragile ones, ones with obscure dependencies we
Expand All @@ -8,7 +8,7 @@

vars.proj.http4s: ${vars.base} {
name: "http4s"
uri: "https://github.com/http4s/http4s.git#66517fb3cdfb7ebf994c76414b52525e2d7309a1"
uri: "https://github.com/http4s/http4s.git#4810a9f820dde33d9f3fa68527f74db1cb303cac"

extra.commands: ${vars.default-commands} [
// UriSpec: didn't compile (October 2018), it didn't seem worth investigating, probably a specs2 change
Expand All @@ -21,7 +21,7 @@ vars.proj.http4s: ${vars.base} {
]
extra.exclude: [
// outside our purview
"bench", "docs", "website", "argonaut"
"bench", "docs", "website", "argonaut", "scalafixRules", "scalafixTests"
// Missing dependencies: com.spinoco#fs2-crypto, io.chrisdavenport#keypool
"ember-client", "examples-ember"
]
Expand Down
2 changes: 1 addition & 1 deletion proj/jackson-module-scala.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars.proj.jackson-module-scala: ${vars.base} {
uri: "https://github.com/FasterXML/jackson-module-scala.git#d9a74ab159e510b3326fa68fd779ce9634fa7fb9"

extra.sbt-version: ${vars.sbt-0-13-version}
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
Expand Down
1 change: 1 addition & 0 deletions proj/json4s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ vars.proj.json4s: ${vars.base} {
name: "json4s"
uri: "https://github.com/scalacommunitybuild/json4s.git#a3d7d31e1098868c3a0032c23aa7980fcf63b17d"

extra.run-tests: false
extra.exclude: ["json4s-scalaz"]
extra.commands: ${vars.default-commands} [
"set every mimaPreviousArtifacts := Set()"
Expand Down
6 changes: 6 additions & 0 deletions proj/jwt-scala.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,10 @@ vars.proj.jwt-scala: ${vars.base} {

// only what http4s-jwt-auth needs
extra.projects: ["coreProject"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
2 changes: 1 addition & 1 deletion proj/kafka.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ vars.proj.kafka: ${vars.base} {
name: "kafka"
uri: "https://github.com/ennru/kafka.git#a16eff39988b7a32b88fda9b588e3516a6cb1d7e"

// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
"removeDependency org.scalatest scalatest"
Expand Down
5 changes: 2 additions & 3 deletions proj/kits.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ vars.proj.kits: ${vars.base} {
name: "kits"
uri: "https://github.com/halcat0x15a/kits.git#c3451fee6f09b4bfc6fc3fe5684031f484070e3d"

// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.1
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
}
6 changes: 3 additions & 3 deletions proj/lagom.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ vars.proj.lagom: ${vars.base} {
"-Dsbt.classloader.close=false"
]
extra.test-tasks: "compile"
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.1
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
// tests in these subprojects are too slow and (more importantly) too fragile
// "set executeTests in `persistence-cassandra-scaladsl` in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
// "set executeTests in `testkit-scaladsl` in Test := Tests.Output(TestResult.Passed, Map(), Iterable())"
Expand Down
13 changes: 6 additions & 7 deletions proj/libra.conf
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
// https://github.com/scalacommunitybuild/libra.git#community-build-2.13 # was to-ithaca, master

// forked (March 2020) to adjust for discipline-scalatest source incompatibility.
// we cannot PR the change upstream at present because there is no spire release
// yet to depend on
// https://github.com/SethTisue/libra.git#scalatest-3.2 # was to-ithaca, master

// depends on spire

// temporarily forked pending merge of
// https://github.com/to-ithaca/libra/pull/121

vars.proj.libra: ${vars.base} {
name: "libra"
uri: "https://github.com/scalacommunitybuild/libra.git#25adeaeea520ca33635ca30b62167700cd17bc78"
uri: "https://github.com/SethTisue/libra.git#766aec63a252660132175ca30d93c0b094c19186"

extra.exclude: ["docs"]
extra.exclude: ["docs", "*JS"]
}
6 changes: 6 additions & 0 deletions proj/log4s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ vars.proj.log4s: ${vars.base} {
uri: "https://github.com/Log4s/log4s.git#845c14fc93fc06fd84a6a25899d4d57f47dd66ae"

extra.exclude: ["coreJS", "testingJS"]
extra.commands: ${vars.default-commands} [
// ScalaTest 3.0, not 3.2
"removeDependency org.scalatest scalatest"
"""set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
]
deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"]
}
Loading