From 77eac3e201259c4831ab8a54749ac5b62215fa32 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 25 Jun 2020 12:54:02 -0700 Subject: [PATCH 01/66] wip --- proj/scalatest.conf | 6 +++--- proj/scalatestplus-junit.conf | 4 ++-- proj/scalatestplus-scalacheck.conf | 4 ++-- proj/scalatestplus-testng.conf | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index 44742118b..3448975f5 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -1,8 +1,8 @@ -// https://github.com/scalatest/scalatest.git#3.1.x +// https://github.com/scalatest/scalatest.git#3.2.x-new vars.proj.scalatest: ${vars.base} { name: "scalatest" - uri: "https://github.com/scalatest/scalatest.git#c4b3227e7580e46e0c5dcd1e46c48a96b5aa7b08" + uri: "https://github.com/scalatest/scalatest.git#f3d5f9d66631dc49b2218c8edd039840788bd915" extra.projects: ["scalatest", "scalactic", "scalatestFunSuite"] } @@ -12,7 +12,7 @@ vars.proj.scalatest: ${vars.base} { vars.proj.scalatest-tests: ${vars.base} { name: "scalatest-tests" - uri: "https://github.com/scalatest/scalatest.git#c4b3227e7580e46e0c5dcd1e46c48a96b5aa7b08" + uri: "https://github.com/scalatest/scalatest.git#f3d5f9d66631dc49b2218c8edd039840788bd915" extra.exclude: [ // we already built these above diff --git a/proj/scalatestplus-junit.conf b/proj/scalatestplus-junit.conf index 35d61686c..20a48b9cf 100644 --- a/proj/scalatestplus-junit.conf +++ b/proj/scalatestplus-junit.conf @@ -1,7 +1,7 @@ -// https://github.com/scalatest/scalatestplus-junit.git#3.1.0.x +// https://github.com/scalatest/scalatestplus-junit.git#3.2.0.x vars.proj.scalatestplus-junit: ${vars.base} { name: "scalatestplus-junit" - uri: "https://github.com/scalatest/scalatestplus-junit.git#ff6f723258fde39effe63ce642369167cb1c3859" + uri: "https://github.com/scalatest/scalatestplus-junit.git#0106723c8d9dff3cfc7a3fa5ee015ae1ac5d9cad" } diff --git a/proj/scalatestplus-scalacheck.conf b/proj/scalatestplus-scalacheck.conf index f52a5ab63..815496e9b 100644 --- a/proj/scalatestplus-scalacheck.conf +++ b/proj/scalatestplus-scalacheck.conf @@ -1,8 +1,8 @@ -// https://github.com/scalatest/scalatestplus-scalacheck.git#3.1.0.x +// https://github.com/scalatest/scalatestplus-scalacheck.git#3.2.0.x vars.proj.scalatestplus-scalacheck: ${vars.base} { name: "scalatestplus-scalacheck" - uri: "https://github.com/scalatest/scalatestplus-scalacheck.git#8480dbe41e135544c3263ece7a0f05c2e1a7fd9e" + uri: "https://github.com/scalatest/scalatestplus-scalacheck.git#27b8fb1f3617ef60716663a2b55fb203d093c4bb" extra.projects: ["scalatestPlusScalaCheckJVM"] extra.settings: ${vars.base.extra.settings} [ diff --git a/proj/scalatestplus-testng.conf b/proj/scalatestplus-testng.conf index 0318f7fe4..c20badb85 100644 --- a/proj/scalatestplus-testng.conf +++ b/proj/scalatestplus-testng.conf @@ -1,7 +1,7 @@ -// https://github.com/scalatest/scalatestplus-testng.git#3.1.0.x +// https://github.com/scalatest/scalatestplus-testng.git#3.2.0.x vars.proj.scalatestplus-testng: ${vars.base} { name: "scalatestplus-testng" - uri: "https://github.com/scalatest/scalatestplus-testng.git#9ad2c9f4fc3dc7d8e92c9b6cb3cb0b95627821a3" + uri: "https://github.com/scalatest/scalatestplus-testng.git#405d66e23e9846bed697b85889fd8281ceb8ec38" } From d7ec92156d77bc9461c6e8e90db808caa21acc9b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 25 Jun 2020 14:18:53 -0700 Subject: [PATCH 02/66] wip --- proj/scalatest.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index 3448975f5..69ca753d2 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -17,6 +17,8 @@ vars.proj.scalatest-tests: ${vars.base} { extra.exclude: [ // we already built these above "scalatest", "scalactic", "scalacticMacro", "scalatestCompatible", "scalatestFunSuite", "scalatestCore" + "scalatestFeatureSpec", "scalatestShouldMatchers", "scalatestMatchersCore", "scalatestDiagrams" + "scalatestRefSpec", "scalatestFunSpec", "scalatestFreeSpec", "scalatestPropSpec" // JVM only please "*JS", "*Native", "*Dotty" // out of scope From a6d102f80d45150acda3fea2eaa7b2e882ea5352 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 25 Jun 2020 14:56:30 -0700 Subject: [PATCH 03/66] wip --- proj/scalatest.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index 69ca753d2..83d915219 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -17,8 +17,8 @@ vars.proj.scalatest-tests: ${vars.base} { extra.exclude: [ // we already built these above "scalatest", "scalactic", "scalacticMacro", "scalatestCompatible", "scalatestFunSuite", "scalatestCore" - "scalatestFeatureSpec", "scalatestShouldMatchers", "scalatestMatchersCore", "scalatestDiagrams" - "scalatestRefSpec", "scalatestFunSpec", "scalatestFreeSpec", "scalatestPropSpec" + "scalatestMatchersCore", "scalatestShouldMatchers", "scalatestMustMatchers", "scalatestDiagrams" + "scalatestFeatureSpec", "scalatestRefSpec", "scalatestFunSpec", "scalatestFreeSpec", "scalatestPropSpec", "scalatestFlatSpec" // JVM only please "*JS", "*Native", "*Dotty" // out of scope From 8cb3fb346848e21b843c409f37d5de9d00a1ccca Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 25 Jun 2020 15:11:36 -0700 Subject: [PATCH 04/66] wip --- proj/scalatest.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index 83d915219..079c3212e 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -18,7 +18,8 @@ vars.proj.scalatest-tests: ${vars.base} { // we already built these above "scalatest", "scalactic", "scalacticMacro", "scalatestCompatible", "scalatestFunSuite", "scalatestCore" "scalatestMatchersCore", "scalatestShouldMatchers", "scalatestMustMatchers", "scalatestDiagrams" - "scalatestFeatureSpec", "scalatestRefSpec", "scalatestFunSpec", "scalatestFreeSpec", "scalatestPropSpec", "scalatestFlatSpec" + "scalatestFeatureSpec", "scalatestRefSpec", "scalatestFunSpec", "scalatestFreeSpec", "scalatestPropSpec", + "scalatestFlatSpec", "scalatestWordSpec" // JVM only please "*JS", "*Native", "*Dotty" // out of scope From 5c1b2488288ab266e37a6abd243c72218a18d0c9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 30 Jun 2020 18:07:11 -0700 Subject: [PATCH 05/66] wip --- proj/discipline-scalatest.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proj/discipline-scalatest.conf b/proj/discipline-scalatest.conf index c9a2862e7..489949c3e 100644 --- a/proj/discipline-scalatest.conf +++ b/proj/discipline-scalatest.conf @@ -5,4 +5,10 @@ vars.proj.discipline-scalatest: ${vars.base} { uri: "https://github.com/typelevel/discipline-scalatest.git#0b6235b1202410b5b93ea2ddfeb0e52151ca9b7b" 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"""" + ] } From 00d55cedfa0c3c4dc03bea1b413ea6364565bd5a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 30 Jun 2020 18:08:49 -0700 Subject: [PATCH 06/66] wip --- proj/silencer.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proj/silencer.conf b/proj/silencer.conf index ca2f0d221..4e64bf367 100644 --- a/proj/silencer.conf +++ b/proj/silencer.conf @@ -1,10 +1,10 @@ -// https://github.com/lrytz/silencer.git#new-reporters # was ghik, master +// https://github.com/SethTisue/silencer.git#scalatest-3.2 # was ghik, master -// forked (September 2019) for 2.13.1 compatibility. presumably support will be merged -// before too much longer and we can unfork +// temporarily forked for ScalaTest 3.2 friendliness, pending merge of +// https://github.com/ghik/silencer/pull/55 vars.proj.silencer: ${vars.base} { name: "silencer" - uri: "https://github.com/lrytz/silencer.git#dfa69e9e4b7683394ef5442b3e008aef75e9568d" + uri: "https://github.com/SethTisue/silencer.git#9f364826d9f5c1b4e4e0c28e67a64ab24706a66d" } From 64c0b69635f6754d11a6a78cda77bb1070980073 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 30 Jun 2020 20:22:45 -0700 Subject: [PATCH 07/66] wip --- dependencies.txt | 74 ++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/dependencies.txt b/dependencies.txt index 1fc03f350..88c25f041 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -49,7 +49,6 @@ scalatestplus-mockito: cloc-plugin, scala, scala-xml, scalatest scalatestplus-testng: cloc-plugin, scala, scala-xml, scalatest scallop: cloc-plugin, scala, scala-xml, scalatest scoverage: cloc-plugin, scala, scala-xml, scalatest -silencer: cloc-plugin, scala, scala-xml, scalatest sksamuel-exts: cloc-plugin, scala, scala-xml, scalatest twotails: cloc-plugin, scala, scala-xml, scalatest wartremover: cloc-plugin, scala, scala-xml, scalatest @@ -78,6 +77,7 @@ magnolia: cloc-plugin, mercator, scala, scala-xml, scalatest, wartremover implicitbox: cloc-plugin, minitest, portable-scala-reflect, scala, scalacheck scapegoat: cloc-plugin, scala, scala-collection-compat, scala-xml, scalatest scribe: cloc-plugin, perfolation, scala, scala-xml, scalacheck, scalatest +silencer: cloc-plugin, scala, scala-collection-compat, scala-xml, scalatest cachecontrol: cloc-plugin, scala, scala-parser-combinators, scala-xml, scalatest scalariform: cloc-plugin, scala, scala-parser-combinators, scala-xml, scalatest twirl: cloc-plugin, scala, scala-parser-combinators, scala-xml, scalatest @@ -91,7 +91,6 @@ scalacheck-shapeless: cloc-plugin, portable-scala-reflect, scala, scalacheck, sh scalatags: cloc-plugin, portable-scala-reflect, scala, scala-xml, sourcecode, utest grizzled: cloc-plugin, scala, scala-collection-compat, scala-xml, scalatest, wartremover scodec-bits: cloc-plugin, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck -sttp-model: cloc-plugin, kind-projector, scala, scala-xml, scalatest, silencer, wartremover classutil: cloc-plugin, grizzled, scala, scala-collection-compat, scala-xml, scalatest, wartremover scalaj-http: cloc-plugin, jackson-module-scala, scala, scala-xml, scalacheck, scalatest, scalatest-3-0 discipline-scalatest: cloc-plugin, discipline, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck @@ -100,12 +99,12 @@ scodec: cloc-plugin, scala, scala-xml, scalacheck, scalatest, scalatestplus-scal airframe: cloc-plugin, scala, scala-collection-compat, scala-parser-combinators, scala-xml, scalacheck, scalatest elastic4s: cloc-plugin, jackson-module-scala, scala, scala-xml, scalacheck, scalatest, scalatest-3-0, sksamuel-exts slick: cloc-plugin, sbt-testng, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatest-3-0 +sttp-model: cloc-plugin, kind-projector, scala, scala-collection-compat, scala-xml, scalatest, silencer, wartremover scalatest-tests: cloc-plugin, scala, scala-parser-combinators, scala-xml, scalatest, scalatestplus-junit, scalatestplus-testng scalatex: acyclic, cloc-plugin, fastparse-scalameta, portable-scala-reflect, scala, scala-xml, scalatags, sourcecode, utest scalapb: cloc-plugin, fastparse, portable-scala-reflect, scala, scala-xml, scalacheck, scalatest, scalatest-3-0, sourcecode, utest specs2: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck jsoniter-scala: cloc-plugin, expression-evaluator, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck -akka: cloc-plugin, scala, scala-java8-compat, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, silencer json4s: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, specs2 spray-json: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, specs2 ssl-config: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, specs2 @@ -114,13 +113,12 @@ http4s-parboiled2: cloc-plugin, kind-projector, portable-scala-reflect, scala, s lift-json: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, specs2 splain: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, shapeless, specs2 discipline-specs2: cloc-plugin, discipline, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, specs2 -better-files: akka, cloc-plugin, scala, scala-java8-compat, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer -scala-gopher: akka, cloc-plugin, scala, scala-async, scala-java8-compat, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, silencer blaze: cloc-plugin, kind-projector, log4s, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, specs2 play-doc: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, specs2, twirl cats: cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum scala-sculpt: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, specs2, spray-json, verify scalameta: cloc-plugin, fastparse, fastparse-scalameta, portable-scala-reflect, scala, scala-xml, scalacheck, scalapb, scalatest, scalatest-3-0, sourcecode, utest +akka: cloc-plugin, scala, scala-collection-compat, scala-java8-compat, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, silencer squants: cloc-plugin, json4s, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, specs2, tut advxml: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum cats-effect: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum @@ -136,8 +134,9 @@ twitter-util: cloc-plugin, jackson-module-scala, scala, scala-collection-compat, better-monadic-for: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, wartremover cats-retry: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum natchez: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum +better-files: akka, cloc-plugin, scala, scala-collection-compat, scala-java8-compat, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer scala-newtype: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, shapeless, simulacrum -play-json: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shapeless, silencer, specs2 +scala-gopher: akka, cloc-plugin, scala, scala-async, scala-collection-compat, scala-java8-compat, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, silencer scodec-cats: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, scodec, scodec-bits, shapeless, simulacrum algebra: cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum kittens: cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum @@ -149,71 +148,72 @@ dispatch: cloc-plugin, json4s, kind-projector, lift-json, portable-scala-reflect gigahorse: cloc-plugin, json4s, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, specs2, ssl-config, unfiltered scalikejdbc: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-testng, specs2 spire: algebra, cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, machinist, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum +play-json: cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shapeless, silencer, specs2 atto: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, fs2, kind-projector, refined, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, scodec-bits, shapeless, simulacrum, wartremover scalameter: cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, specs2, spray-json monix: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, implicitbox, kind-projector, minitest, portable-scala-reflect, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum -jawn: claimant, cloc-plugin, json4s, kind-projector, play-json, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shapeless, silencer, specs2, spray-json libra: algebra, cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, machinist, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, singleton-ops, spire scalamock: cloc-plugin, fastparse, fastparse-scalameta, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, sourcecode, specs2, utest mockito-scala: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2 cats-time: better-monadic-for, cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, wartremover -sjson-new: claimant, cloc-plugin, jawn, json4s, kind-projector, play-json, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shaded-scalajson, shapeless, silencer, specs2, spray-json +jawn: claimant, cloc-plugin, json4s, kind-projector, play-json, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shapeless, silencer, specs2, spray-json specs2-more: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2 breeze: algebra, cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, machinist, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, shapeless, simulacrum, spire multibot: cats, cloc-plugin, discipline, discipline-scalatest, json4s, kind-projector, monocle, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2 droste: algebra, atto, cats, cats-effect, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, fs2, kind-projector, refined, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, scodec-bits, shapeless, simulacrum, wartremover -play-file-watch: akka, better-files, cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer, specs2 -prog-scala-examples: akka, cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-async, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2 scalastyle: cloc-plugin, fastparse, fastparse-scalameta, munit, portable-scala-reflect, scala, scala-collection-compat, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalariform, scalatest, scalatest-3-0, scalatestplus-junit, sourcecode, utest doodle: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, implicitbox, kind-projector, magnolia, mercator, minitest, monix, portable-scala-reflect, scala, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, wartremover cats-effect-testing: cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, kind-projector, minitest, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2, utest scala-logging: cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, mockito-scala, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, shapeless, simulacrum, specs2 giter8: cloc-plugin, fastparse, fastparse-scalameta, kind-projector, portable-scala-reflect, sbt-io, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalamock, scalapb, scalatest, scalatest-3-0, scopt, sourcecode, specs2, utest, verify -sbt-util: claimant, cloc-plugin, jawn, json4s, kind-projector, play-json, portable-scala-reflect, sbt-io, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shaded-scalajson, shapeless, silencer, sjson-new, specs2, spray-json +sjson-new: claimant, cloc-plugin, jawn, json4s, kind-projector, play-json, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shaded-scalajson, shapeless, silencer, specs2, spray-json +play-file-watch: akka, better-files, cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer, specs2 log4cats: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2, wartremover +prog-scala-examples: akka, cloc-plugin, kind-projector, portable-scala-reflect, scala, scala-async, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2 avro4s: cats, cloc-plugin, discipline, discipline-scalatest, json4s, kind-projector, magnolia, mercator, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2, wartremover -akka-stream: akka, akka-protobuf-v3, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, ssl-config +sbt-util: claimant, cloc-plugin, jawn, json4s, kind-projector, play-json, portable-scala-reflect, sbt-io, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shaded-scalajson, shapeless, silencer, sjson-new, specs2, spray-json unique: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2, wartremover -metrics-scala: akka, cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, mockito-scala, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer, simulacrum, specs2 vault: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, kind-projector, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2, unique, wartremover coulomb: algebra, cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-scalatest, kind-projector, machinist, portable-scala-reflect, pureconfig, refined, scala, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, singleton-ops, spire, tut, utest redis4cats: better-monadic-for, cats, cats-effect, cloc-plugin, context-applied, discipline, discipline-scalatest, kind-projector, log4cats, munit, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, shapeless, simulacrum, specs2, wartremover -akka-http: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config -circe: cats, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json +akka-stream: akka, akka-protobuf-v3, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, ssl-config metaconfig: cats, cloc-plugin, discipline, discipline-scalatest, fansi, kind-projector, munit, paiges, portable-scala-reflect, pprint, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-scalacheck, sconfig, shapeless, simulacrum, sourcecode, specs2, spray-json, utest -akka-http-cors: akka, akka-http, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config -akka-http-webgoat: akka, akka-http, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config +metrics-scala: akka, cats, cloc-plugin, discipline, discipline-scalatest, kind-projector, mockito-scala, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer, simulacrum, specs2 alpakka-kafka: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, ssl-config -circe-generic-extras: cats, circe, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json -circe-jackson: cats, circe, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json -jawn-fs2: cats, cats-effect, claimant, cloc-plugin, discipline, discipline-scalatest, fs2, jawn, json4s, kind-projector, play-json, portable-scala-reflect, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json -akka-streams-tcp-chat: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec, scodec-bits, shapeless, silencer, specs2, ssl-config -akka-http-session: akka, akka-http, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config, wartremover -play-ws: akka, akka-protobuf-v3, akka-stream, cachecontrol, cloc-plugin, jackson-module-scala, kind-projector, play-json, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer, specs2, ssl-config +akka-http: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config kafka: cats, cloc-plugin, discipline, discipline-scalatest, jackson-module-scala, kind-projector, mockito-scala, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-logging, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, shapeless, simulacrum, specs2 -circe-config: cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json -akka-more: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, specs2, ssl-config -zinc: claimant, cloc-plugin, fastparse, jawn, json4s, kind-projector, play-json, portable-scala-reflect, sbinary, sbt-io, sbt-util, scala, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalapb, scalatest, scalatest-3-0, shaded-scalajson, shapeless, silencer, sjson-new, sourcecode, specs2, spray-json, utest, verify -akka-persistence-cassandra: akka, akka-more, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, specs2, ssl-config -enumeratum: cats, circe, claimant, cloc-plugin, discipline, discipline-scalatest, fansi, jawn, json4s, kind-projector, play-json, portable-scala-reflect, pprint, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, spray-json, utest -akka-management: akka, akka-http, akka-more, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, specs2, spray-json, ssl-config +circe: cats, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json +akka-http-cors: akka, akka-http, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config +akka-http-webgoat: akka, akka-http, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config +circe-generic-extras: cats, circe, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json +circe-jackson: cats, circe, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json +jawn-fs2: cats, cats-effect, claimant, cloc-plugin, discipline, discipline-scalatest, fs2, jawn, json4s, kind-projector, play-json, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json +akka-streams-tcp-chat: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec, scodec-bits, shapeless, silencer, specs2, ssl-config +akka-http-session: akka, akka-http, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, specs2, spray-json, ssl-config, wartremover +play-ws: akka, akka-protobuf-v3, akka-stream, cachecontrol, cloc-plugin, jackson-module-scala, kind-projector, play-json, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, shapeless, silencer, specs2, ssl-config +circe-config: cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-scalatest, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, specs2, spray-json +akka-more: akka, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, specs2, ssl-config +zinc: claimant, cloc-plugin, fastparse, jawn, json4s, kind-projector, play-json, portable-scala-reflect, sbinary, sbt-io, sbt-util, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalapb, scalatest, scalatest-3-0, shaded-scalajson, shapeless, silencer, sjson-new, sourcecode, specs2, spray-json, utest, verify +akka-persistence-cassandra: akka, akka-more, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, specs2, ssl-config doobie: cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-scalatest, fs2, jawn, json4s, kind-projector, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, spray-json +enumeratum: cats, circe, claimant, cloc-plugin, discipline, discipline-scalatest, fansi, jawn, json4s, kind-projector, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, spray-json, utest akka-persistence-jdbc: akka, akka-more, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, sbt-testng, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, slick, specs2, ssl-config -ciris: cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-scalatest, enumeratum, fansi, jawn, json4s, kind-projector, play-json, portable-scala-reflect, pprint, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, spray-json, squants, tut, utest mdoc: cats, cloc-plugin, discipline, discipline-scalatest, fansi, fastparse, fastparse-scalameta, kind-projector, metaconfig, munit, paiges, portable-scala-reflect, pprint, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, sconfig, shapeless, simulacrum, sourcecode, specs2, spray-json, utest +akka-management: akka, akka-http, akka-more, akka-protobuf-v3, akka-stream, cloc-plugin, jackson-module-scala, kind-projector, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, silencer, specs2, spray-json, ssl-config cats-mtl: cats, cloc-plugin, discipline, discipline-scalatest, fansi, fastparse, fastparse-scalameta, kind-projector, machinist, mdoc, metaconfig, munit, paiges, portable-scala-reflect, pprint, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, sconfig, shapeless, simulacrum, sourcecode, specs2, spray-json, tut, utest -playframework: akka, akka-http, akka-more, akka-protobuf-v3, akka-stream, cachecontrol, cloc-plugin, jackson-module-scala, kind-projector, play-json, play-ws, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, shapeless, silencer, specs2, spray-json, ssl-config, twirl +ciris: cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-scalatest, enumeratum, fansi, jawn, json4s, kind-projector, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, spray-json, squants, tut, utest eff: cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-scalatest, doobie, fs2, implicitbox, jawn, json4s, kind-projector, minitest, monix, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json -play-webgoat: akka, akka-http, akka-more, akka-protobuf-v3, akka-stream, cachecontrol, cloc-plugin, jackson-module-scala, kind-projector, play-json, play-ws, playframework, portable-scala-reflect, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, shapeless, silencer, specs2, spray-json, ssl-config, twirl scalafmt: cats, cloc-plugin, discipline, discipline-scalatest, fansi, fastparse, fastparse-scalameta, kind-projector, metaconfig, munit, paiges, portable-scala-reflect, pprint, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, sconfig, scopt, shapeless, simulacrum, sourcecode, specs2, spray-json, utest, verify +playframework: akka, akka-http, akka-more, akka-protobuf-v3, akka-stream, cachecontrol, cloc-plugin, jackson-module-scala, kind-projector, play-json, play-ws, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, shapeless, silencer, specs2, spray-json, ssl-config, twirl +play-webgoat: akka, akka-http, akka-more, akka-protobuf-v3, akka-stream, cachecontrol, cloc-plugin, jackson-module-scala, kind-projector, play-json, play-ws, playframework, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, shapeless, silencer, specs2, spray-json, ssl-config, twirl meow-mtl: cats, cats-effect, cats-mtl, cloc-plugin, discipline, discipline-scalatest, fansi, fastparse, fastparse-scalameta, implicitbox, kind-projector, machinist, mdoc, metaconfig, minitest, monix, munit, paiges, portable-scala-reflect, pprint, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, sconfig, shapeless, simulacrum, sourcecode, specs2, spray-json, tut, utest skunk: better-monadic-for, cats, cats-effect, cats-testkit-scalatest, cats-time, circe, claimant, cloc-plugin, discipline, discipline-scalatest, enumeratum, fansi, fs2, jawn, json4s, kind-projector, natchez, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec, scodec-bits, scodec-cats, shapeless, silencer, simulacrum, sourcecode, specs2, spray-json, utest, wartremover -http4s: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover -tsec: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover -http4s-jwt-auth: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, jwt-scala, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover +http4s: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover lagom: akka, akka-http, akka-management, akka-more, akka-persistence-cassandra, akka-persistence-jdbc, akka-protobuf-v3, akka-stream, alpakka-kafka, cachecontrol, cloc-plugin, genjavadoc, jackson-module-scala, kind-projector, play-json, play-ws, playframework, portable-scala-reflect, sbt-testng, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-mockito, scalatestplus-scalacheck, scalatestplus-testng, shapeless, silencer, slick, specs2, spray-json, ssl-config, twirl -github4s: base64, better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalamock, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover -sttp: akka, akka-http, akka-http-cors, akka-protobuf-v3, akka-stream, better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s, http4s-parboiled2, jackson-module-scala, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, ssl-config, sttp-model, twirl, unique, utest, vault, wartremover +tsec: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover +http4s-jwt-auth: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, jwt-scala, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover +github4s: base64, better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalamock, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover +sttp: akka, akka-http, akka-http-cors, akka-protobuf-v3, akka-stream, better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, fs2, http4s, http4s-parboiled2, jackson-module-scala, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalatags, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, ssl-config, sttp-model, twirl, unique, utest, vault, wartremover scala-pet-store: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, circe-config, circe-generic-extras, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, doobie, enumeratum, fansi, fastparse, fastparse-scalameta, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, mdoc, metaconfig, minitest, munit, paiges, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, sconfig, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, tsec, tut, twirl, unique, utest, vault, wartremover pureconfig-more: akka, better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-scalatest, discipline-specs2, enumeratum, fansi, fastparse, fastparse-scalameta, fs2, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, magnolia, mdoc, mercator, metaconfig, minitest, munit, paiges, play-json, portable-scala-reflect, pprint, pureconfig, refined, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parser-combinators, scala-xml, scalacheck, scalacheck-shapeless, scalameta, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec-bits, sconfig, shapeless, silencer, simulacrum, sourcecode, specs2, specs2-more, spray-json, sttp-model, tut, twirl, unique, utest, vault, wartremover pfps-shopping-cart: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, cats-mtl, cats-retry, cats-testkit-scalatest, cats-time, circe, ciris, claimant, cloc-plugin, context-applied, discipline, discipline-scalatest, discipline-specs2, enumeratum, fansi, fastparse, fastparse-scalameta, fs2, http4s, http4s-jwt-auth, http4s-parboiled2, implicitbox, jawn, jawn-fs2, json4s, jwt-scala, kind-projector, log4cats, log4s, machinist, mdoc, meow-mtl, metaconfig, minitest, monix, munit, natchez, paiges, play-json, portable-scala-reflect, pprint, pureconfig, redis4cats, refined, refined-more, scala, scala-collection-compat, scala-js-stubs, scala-newtype, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec, scodec-bits, scodec-cats, sconfig, shapeless, silencer, simulacrum, skunk, sourcecode, specs2, specs2-more, spray-json, squants, tut, twirl, unique, utest, vault, wartremover From ff27ef1ac7bea599af18c393ed40a8d942b8374b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 1 Jul 2020 07:17:19 -0700 Subject: [PATCH 08/66] wip --- proj/silencer.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/proj/silencer.conf b/proj/silencer.conf index 4e64bf367..a73d33a05 100644 --- a/proj/silencer.conf +++ b/proj/silencer.conf @@ -1,10 +1,7 @@ -// https://github.com/SethTisue/silencer.git#scalatest-3.2 # was ghik, master - -// temporarily forked for ScalaTest 3.2 friendliness, pending merge of -// https://github.com/ghik/silencer/pull/55 +// https://github.com/ghik/silencer.git#master vars.proj.silencer: ${vars.base} { name: "silencer" - uri: "https://github.com/SethTisue/silencer.git#9f364826d9f5c1b4e4e0c28e67a64ab24706a66d" + uri: "https://github.com/ghik/silencer.git#cb962c5f6105b0e1a119b4db1d5f0dcbe594aa35" } From 8e7828f1ea83456c203fb610aaf4959e7e0d6abc Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 1 Jul 2020 18:50:56 -0700 Subject: [PATCH 09/66] wip --- proj/better-monadic-for.conf | 4 ++-- proj/scala-swing.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proj/better-monadic-for.conf b/proj/better-monadic-for.conf index 6c38da300..00feb6755 100644 --- a/proj/better-monadic-for.conf +++ b/proj/better-monadic-for.conf @@ -1,8 +1,8 @@ -// https://github.com/oleg-py/better-monadic-for.git#master +// https://github.com/SethTisue/better-monadic-for.git#scalatest-3.1 # was oleg-py, master vars.proj.better-monadic-for: ${vars.base} { name: "better-monadic-for" - uri: "https://github.com/oleg-py/better-monadic-for.git#0be7a9728c2cdef2f0a167c904b93ac58e890592" + uri: "https://github.com/SethTisue/better-monadic-for.git#2ec2c2f4a5834e2b478662d655b2dd79acd5df45" extra.exclude: [ "scalazTests" diff --git a/proj/scala-swing.conf b/proj/scala-swing.conf index bcf60d63a..055eca2a5 100644 --- a/proj/scala-swing.conf +++ b/proj/scala-swing.conf @@ -2,7 +2,7 @@ vars.proj.scala-swing: ${vars.base} { name: "scala-swing" - uri: "https://github.com/scala/scala-swing.git#192ff1cdba3a28011c21284c656f1e625819f07b" + uri: "https://github.com/scala/scala-swing.git#13ae8d8646fc2e052640c5b4a156b86f9b70e0f4" extra.commands: ${vars.default-commands} [ // work around https://github.com/scala/community-builds/issues/575 From e3331fa59118f7576649bcefb53efb236e4eda48 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sun, 5 Jul 2020 17:45:12 -0500 Subject: [PATCH 10/66] wip --- proj/better-monadic-for.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/better-monadic-for.conf b/proj/better-monadic-for.conf index 00feb6755..ff8ec5e1b 100644 --- a/proj/better-monadic-for.conf +++ b/proj/better-monadic-for.conf @@ -1,8 +1,8 @@ -// https://github.com/SethTisue/better-monadic-for.git#scalatest-3.1 # was oleg-py, master +// https://github.com/oleg-py/better-monadic-for.git#master vars.proj.better-monadic-for: ${vars.base} { name: "better-monadic-for" - uri: "https://github.com/SethTisue/better-monadic-for.git#2ec2c2f4a5834e2b478662d655b2dd79acd5df45" + uri: "https://github.com/oleg-py/better-monadic-for.git#9c0062f752c8128525da895cb3339e9e506b8387" extra.exclude: [ "scalazTests" From 82bd3d88668acb0178b07e3a92386b06e0dfae09 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 6 Jul 2020 08:46:27 -0500 Subject: [PATCH 11/66] wip --- proj/fs2.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/proj/fs2.conf b/proj/fs2.conf index e176082ff..14ca5dc8d 100644 --- a/proj/fs2.conf +++ b/proj/fs2.conf @@ -1,13 +1,13 @@ -// https://github.com/functional-streams-for-scala/fs2.git#7e58b9324b85bebde1b3fbd1274f9a7c580de6a6 +// https://github.com/functional-streams-for-scala/fs2.git#v2.4.2 // 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 +// frozen (July 2020) at last release version; we like to use tags in this +// repo because of a history of fragility (downstream dependencies breaking) 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"] From 8ca89271bcb6de4a85eef85df61266356580007c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 6 Jul 2020 10:45:06 -0500 Subject: [PATCH 12/66] wip --- proj/fs2.conf | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/proj/fs2.conf b/proj/fs2.conf index 14ca5dc8d..aa23f3e65 100644 --- a/proj/fs2.conf +++ b/proj/fs2.conf @@ -1,28 +1,19 @@ -// https://github.com/functional-streams-for-scala/fs2.git#v2.4.2 +// https://github.com/functional-streams-for-scala/fs2.git#main // note that this repo has required JDK 11 for building (since January 2020) -// frozen (July 2020) at last release version; we like to use tags in this -// repo because of a history of fragility (downstream dependencies breaking) - vars.proj.fs2: ${vars.base} { name: "fs2" 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 """set coreJVM / Test / unmanagedSourceDirectories := Seq()""" + """set coreJVM / Test / managedSources := Seq()""" """set reactiveStreams / Test / unmanagedSourceDirectories := Seq()""" """set io / Test / unmanagedSourceDirectories := Seq()""" // otherwise sbt-gpg errors on `publish` From cc8779e3b7d267747bb2a08dd3ffbddecbd281e2 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 6 Jul 2020 23:55:21 -0500 Subject: [PATCH 13/66] wip --- proj/fs2.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/proj/fs2.conf b/proj/fs2.conf index aa23f3e65..c3805b4f9 100644 --- a/proj/fs2.conf +++ b/proj/fs2.conf @@ -12,6 +12,7 @@ vars.proj.fs2: ${vars.base} { // so, don't even compile tests, let alone run them extra.run-tests: false extra.commands: ${vars.default-commands} [ + "removeDependency org.scalatestplus scalatestplus-testng" """set coreJVM / Test / unmanagedSourceDirectories := Seq()""" """set coreJVM / Test / managedSources := Seq()""" """set reactiveStreams / Test / unmanagedSourceDirectories := Seq()""" From 78a749be780474ab1f1dd9163db43db0f99f8f6e Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 07:24:40 -0500 Subject: [PATCH 14/66] wip --- proj/fs2.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/proj/fs2.conf b/proj/fs2.conf index c3805b4f9..d7e85e7ae 100644 --- a/proj/fs2.conf +++ b/proj/fs2.conf @@ -16,6 +16,7 @@ vars.proj.fs2: ${vars.base} { """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" From d91887326f84dddbe55c404ddde89ae1d4cdfa7f Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 09:20:43 -0500 Subject: [PATCH 15/66] wip --- proj/sksamuel-exts.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proj/sksamuel-exts.conf b/proj/sksamuel-exts.conf index 75bc4dc45..e6413d075 100644 --- a/proj/sksamuel-exts.conf +++ b/proj/sksamuel-exts.conf @@ -10,5 +10,9 @@ vars.proj.sksamuel-exts: ${vars.base} { extra.commands: ${vars.default-commands} [ // reported upstream at https://github.com/sksamuel/exts/commit/5f69f7254d9ad58a94dd304a0e1cdb560486d6c2#r29458859 "set excludeFilter in (Test, unmanagedSources) := HiddenFileFilter || \"FileWatcherTest.scala\"" + // 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"] } From 2e62b014c185a0afc875ade756dde7c887e76db6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 09:46:56 -0500 Subject: [PATCH 16/66] wip --- proj/scalameta.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proj/scalameta.conf b/proj/scalameta.conf index 8f7518ed4..04165b075 100644 --- a/proj/scalameta.conf +++ b/proj/scalameta.conf @@ -21,5 +21,9 @@ vars.proj.scalameta: ${vars.base} { // testkit compiles on 2.13, but its tests don't (not just in the community build context, // the problem exists upstream as well) """set unmanagedSourceDirectories in (testkit, Test) := Seq()""" + // ScalaTest 3.0, not 3.2 + "removeDependency org.scalatest scalatest" + """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0"""" ] + deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From 5439e503be9d5a7c2937287c1d463b7b0499a65b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 10:13:44 -0500 Subject: [PATCH 17/66] wip --- proj/log4s.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proj/log4s.conf b/proj/log4s.conf index 9891c1684..3dee0f60f 100644 --- a/proj/log4s.conf +++ b/proj/log4s.conf @@ -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"] } From 506937db6a93b1f249fb8f6cd0f55027100e7d81 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 12:19:02 -0500 Subject: [PATCH 18/66] wip --- proj/paiges.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proj/paiges.conf b/proj/paiges.conf index 28da72efa..0c1f16070 100644 --- a/proj/paiges.conf +++ b/proj/paiges.conf @@ -5,4 +5,9 @@ vars.proj.paiges: ${vars.base} { uri: "https://github.com/typelevel/paiges.git#c3048f44ab0463f8e90a0db1f144ae7a47f0da97" extra.projects: ["coreJVM", "catsJVM"] // but not "benchmark" + extra.commands: ${vars.default-commands} [ + // project declares dependency on scalatestplus-scalacheck 3.1; + // but on 3.2 that only pulls in scalatest-core, so we must: + """set ThisBuild / libraryDependencies += "org.scalatest" %% "scalatest-funsuite" % "0" % Test""" + ] } From 6e0c3796b972c606e2d282a3c577c73ef37510c8 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 13:47:43 -0500 Subject: [PATCH 19/66] wip --- proj/enumeratum.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/proj/enumeratum.conf b/proj/enumeratum.conf index 317c90c5d..ea485f2e6 100644 --- a/proj/enumeratum.conf +++ b/proj/enumeratum.conf @@ -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.1 + "scalacommunitybuild#scalatest" + ] + extra.commands: ${vars.default-commands} [ + "removeDependency org.scalatest scalatest" + """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" + ] } From 6f8718b6d0059346e0ba6d009e6920044f3627cd Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 15:23:27 -0500 Subject: [PATCH 20/66] wip --- proj/cachecontrol.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proj/cachecontrol.conf b/proj/cachecontrol.conf index c2e96adfd..a859f66f3 100644 --- a/proj/cachecontrol.conf +++ b/proj/cachecontrol.conf @@ -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"] } From 5382b5c2169e30a4ef290bea4009e00ed80aa338 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 7 Jul 2020 15:34:28 -0500 Subject: [PATCH 21/66] wip --- proj/http4s.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/http4s.conf b/proj/http4s.conf index 46076fe30..0c7e9e791 100644 --- a/proj/http4s.conf +++ b/proj/http4s.conf @@ -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 @@ -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 From ac5369c9d19a97e67eda95a083fd9a803be43435 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 08:13:39 -0500 Subject: [PATCH 22/66] wip --- proj/http4s.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/http4s.conf b/proj/http4s.conf index 0c7e9e791..6aa16b4a8 100644 --- a/proj/http4s.conf +++ b/proj/http4s.conf @@ -21,7 +21,7 @@ vars.proj.http4s: ${vars.base} { ] extra.exclude: [ // outside our purview - "bench", "docs", "website", "argonaut" + "bench", "docs", "website", "argonaut", "scalafixRules" // Missing dependencies: com.spinoco#fs2-crypto, io.chrisdavenport#keypool "ember-client", "examples-ember" ] From 9e09ee1f9eb421d1f92797473080ace18e1a49ed Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 08:21:14 -0500 Subject: [PATCH 23/66] wip --- proj/akka-http.conf | 4 ++++ proj/akka-management.conf | 2 +- proj/akka-persistence-cassandra.conf | 4 ++++ proj/akka-persistence-jdbc.conf | 6 +++++- proj/gigahorse.conf | 2 +- proj/grizzled.conf | 4 ++++ proj/json4s.conf | 1 + proj/jwt-scala.conf | 6 ++++++ proj/kits.conf | 2 +- proj/lagom.conf | 2 +- proj/mockito-scala.conf | 6 ++++++ proj/perfolation.conf | 6 ++++++ proj/sbt-io.conf | 4 ++++ proj/scalariform.conf | 6 ++++++ proj/sjson-new.conf | 6 ++++++ proj/squants.conf | 6 ++++++ proj/twotails.conf | 6 ++++++ 17 files changed, 68 insertions(+), 5 deletions(-) diff --git a/proj/akka-http.conf b/proj/akka-http.conf index 4de4e6621..8f24065e6 100644 --- a/proj/akka-http.conf +++ b/proj/akka-http.conf @@ -23,5 +23,9 @@ vars.proj.akka-http: ${vars.base} { """set httpTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "CodingDirectivesSpec.scala" || "HttpAppSpec.scala"""" // and some tests run forked, so this goes in javaOptions, not extra.options """set ThisBuild / javaOptions += "-Dakka.fail-mixed-versions=false"""" + // 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"] } diff --git a/proj/akka-management.conf b/proj/akka-management.conf index 1eb08d5e1..abebbca02 100644 --- a/proj/akka-management.conf +++ b/proj/akka-management.conf @@ -13,7 +13,7 @@ vars.proj.akka-management: ${vars.base} { 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""" // and as usual "set every bintrayReleaseOnPublish := false" ] diff --git a/proj/akka-persistence-cassandra.conf b/proj/akka-persistence-cassandra.conf index 901b61898..00a2a8cce 100644 --- a/proj/akka-persistence-cassandra.conf +++ b/proj/akka-persistence-cassandra.conf @@ -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"] } diff --git a/proj/akka-persistence-jdbc.conf b/proj/akka-persistence-jdbc.conf index 8f7647e64..04c63f782 100644 --- a/proj/akka-persistence-jdbc.conf +++ b/proj/akka-persistence-jdbc.conf @@ -18,8 +18,12 @@ vars.proj.akka-persistence-jdbc: ${vars.base} { // 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" + // ScalaTest 3.0, not 3.2 + "removeDependency org.scalatest scalatest" + """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" ] - extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"] + deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } diff --git a/proj/gigahorse.conf b/proj/gigahorse.conf index 6b488ac01..d7bc5114a 100644 --- a/proj/gigahorse.conf +++ b/proj/gigahorse.conf @@ -10,6 +10,6 @@ vars.proj.gigahorse: ${vars.base} { 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""" ] } diff --git a/proj/grizzled.conf b/proj/grizzled.conf index 71c6b2bc0..b1a40546d 100644 --- a/proj/grizzled.conf +++ b/proj/grizzled.conf @@ -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"] } diff --git a/proj/json4s.conf b/proj/json4s.conf index 0a8936c19..5e5750a6c 100644 --- a/proj/json4s.conf +++ b/proj/json4s.conf @@ -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()" diff --git a/proj/jwt-scala.conf b/proj/jwt-scala.conf index 3c0e7799e..815434bff 100644 --- a/proj/jwt-scala.conf +++ b/proj/jwt-scala.conf @@ -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"] } diff --git a/proj/kits.conf b/proj/kits.conf index fa89bc8e6..594c23b4b 100644 --- a/proj/kits.conf +++ b/proj/kits.conf @@ -9,6 +9,6 @@ vars.proj.kits: ${vars.base} { 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""" ] } diff --git a/proj/lagom.conf b/proj/lagom.conf index bd3439ce7..b2b994678 100644 --- a/proj/lagom.conf +++ b/proj/lagom.conf @@ -25,7 +25,7 @@ vars.proj.lagom: ${vars.base} { 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""" // 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())" diff --git a/proj/mockito-scala.conf b/proj/mockito-scala.conf index c5974cc05..b8d1b1ddb 100644 --- a/proj/mockito-scala.conf +++ b/proj/mockito-scala.conf @@ -7,4 +7,10 @@ vars.proj.mockito-scala: ${vars.base} { uri: "https://github.com/mockito/mockito-scala.git#50c64c37a55a0a2ddea51e453c4f15f11e7b64f8" extra.exclude: ["scalaz"] + 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"] } diff --git a/proj/perfolation.conf b/proj/perfolation.conf index 46020e22d..d9d04e06e 100644 --- a/proj/perfolation.conf +++ b/proj/perfolation.conf @@ -9,4 +9,10 @@ vars.proj.perfolation: ${vars.base} { uri: "https://github.com/outr/perfolation.git#a9fc4dfc312fda5dc85f2181c55172dffd7ccbc7" extra.projects: ["coreJVM"] + 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"] } diff --git a/proj/sbt-io.conf b/proj/sbt-io.conf index 8b3ff18ae..86d51d8e5 100644 --- a/proj/sbt-io.conf +++ b/proj/sbt-io.conf @@ -9,5 +9,9 @@ vars.proj.sbt-io: ${vars.base} { "set every bintrayReleaseOnPublish := false" // fails on JDK 13+; reported upstream: https://github.com/sbt/io/issues/288 """set io / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "IOSpecification.scala"""" + // 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"] } diff --git a/proj/scalariform.conf b/proj/scalariform.conf index 532452164..825536ea5 100644 --- a/proj/scalariform.conf +++ b/proj/scalariform.conf @@ -4,4 +4,10 @@ vars.proj.scalariform: ${vars.base} { name: "scalariform" uri: "https://github.com/scala-ide/scalariform.git#8cf96a69d7a87a4b4d31a4061b8eb1ca615fd896" + 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"] } diff --git a/proj/sjson-new.conf b/proj/sjson-new.conf index 4a53d4848..f461a92d7 100644 --- a/proj/sjson-new.conf +++ b/proj/sjson-new.conf @@ -13,4 +13,10 @@ vars.proj.sjson-new: ${vars.base} { uri: "https://github.com/eed3si9n/sjson-new.git#874d07801839dd194ed376a3618aa5a9293ff64d" extra.exclude: ["benchmark"] + 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"] } diff --git a/proj/squants.conf b/proj/squants.conf index 2f39dea4c..3d8a7997b 100644 --- a/proj/squants.conf +++ b/proj/squants.conf @@ -5,4 +5,10 @@ vars.proj.squants: ${vars.base} { uri: "https://github.com/typelevel/squants.git#4a049fcff2668eb2d89bdd8c33aea32f1c80f552" extra.projects: ["squantsJVM"] + 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"] } diff --git a/proj/twotails.conf b/proj/twotails.conf index 04c8c6b8a..2a226e85a 100644 --- a/proj/twotails.conf +++ b/proj/twotails.conf @@ -9,4 +9,10 @@ vars.proj.twotails: ${vars.base} { name: "twotails" uri: "https://github.com/wheaties/TwoTails.git#fbb1042058451350efa358d1af4d4fc19b010794" + 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"] } From 58bc7adbc418f5aa311bb34c412855ac0e82c6f6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 13:10:08 -0500 Subject: [PATCH 24/66] wip --- proj/akka-http-cors.conf | 2 +- proj/akka-http-session.conf | 4 ++-- proj/akka-management.conf | 4 ++-- proj/breeze.conf | 2 +- proj/enumeratum.conf | 2 +- proj/finagle.conf | 4 ++-- proj/gigahorse.conf | 2 +- proj/jackson-module-scala.conf | 2 +- proj/kafka.conf | 2 +- proj/kits.conf | 3 +-- proj/lagom.conf | 4 ++-- proj/play-json.conf | 4 ++-- proj/prog-scala-examples.conf | 3 +-- proj/scala-logging.conf | 4 ++-- proj/scala-newtype.conf | 4 ++-- proj/scala-stm.conf | 2 +- proj/scala-typed-holes.conf | 6 ++++++ proj/scalajson.conf | 2 +- proj/scalameter.conf | 4 ++-- proj/scalapb.conf | 4 ++-- proj/scapegoat.conf | 6 ++++++ proj/scrooge.conf | 4 ++-- proj/slick.conf | 4 ++-- proj/twitter-util.conf | 4 ++-- proj/unfiltered.conf | 4 ++-- proj/zinc.conf | 4 ++-- 26 files changed, 50 insertions(+), 40 deletions(-) diff --git a/proj/akka-http-cors.conf b/proj/akka-http-cors.conf index 8dd8b5aeb..8fb23e179 100644 --- a/proj/akka-http-cors.conf +++ b/proj/akka-http-cors.conf @@ -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} [ diff --git a/proj/akka-http-session.conf b/proj/akka-http-session.conf index 029568612..b79811811 100644 --- a/proj/akka-http-session.conf +++ b/proj/akka-http-session.conf @@ -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""" ] diff --git a/proj/akka-management.conf b/proj/akka-management.conf index abebbca02..c16ebbb7a 100644 --- a/proj/akka-management.conf +++ b/proj/akka-management.conf @@ -8,10 +8,10 @@ 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 + // 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 ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test""" // and as usual diff --git a/proj/breeze.conf b/proj/breeze.conf index 54d486d87..6317190fa 100644 --- a/proj/breeze.conf +++ b/proj/breeze.conf @@ -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 diff --git a/proj/enumeratum.conf b/proj/enumeratum.conf index ea485f2e6..610a0ee53 100644 --- a/proj/enumeratum.conf +++ b/proj/enumeratum.conf @@ -15,7 +15,7 @@ vars.proj.enumeratum: ${vars.base} { deps.inject: ${vars.base.deps.inject} [ // no idea why this isn't picked up otherwise "com.lihaoyi#pprint" - // ScalaTest 3.0 not 3.1 + // ScalaTest 3.0 not 3.2 "scalacommunitybuild#scalatest" ] extra.commands: ${vars.default-commands} [ diff --git a/proj/finagle.conf b/proj/finagle.conf index 7a284f93e..b63827768 100644 --- a/proj/finagle.conf +++ b/proj/finagle.conf @@ -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 diff --git a/proj/gigahorse.conf b/proj/gigahorse.conf index d7bc5114a..e3a1fee62 100644 --- a/proj/gigahorse.conf +++ b/proj/gigahorse.conf @@ -6,7 +6,7 @@ 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" diff --git a/proj/jackson-module-scala.conf b/proj/jackson-module-scala.conf index 40b2b4944..7276d5109 100644 --- a/proj/jackson-module-scala.conf +++ b/proj/jackson-module-scala.conf @@ -14,7 +14,7 @@ vars.proj.jackson-module-scala: ${vars.base} { uri: "https://github.com/FasterXML/jackson-module-scala.git#8e56424a8ed6b432d66886733d9da16c4b299391" 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" diff --git a/proj/kafka.conf b/proj/kafka.conf index 35b1eb43c..11effa09b 100644 --- a/proj/kafka.conf +++ b/proj/kafka.conf @@ -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" diff --git a/proj/kits.conf b/proj/kits.conf index 594c23b4b..6d32e7316 100644 --- a/proj/kits.conf +++ b/proj/kits.conf @@ -4,10 +4,9 @@ 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 ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test""" ] diff --git a/proj/lagom.conf b/proj/lagom.conf index b2b994678..2dce9d32c 100644 --- a/proj/lagom.conf +++ b/proj/lagom.conf @@ -20,10 +20,10 @@ 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 ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test""" // tests in these subprojects are too slow and (more importantly) too fragile diff --git a/proj/play-json.conf b/proj/play-json.conf index d9ef24642..458454ce3 100644 --- a/proj/play-json.conf +++ b/proj/play-json.conf @@ -7,10 +7,10 @@ vars.proj.play-json: ${vars.base} { uri: "https://github.com/playframework/play-json.git#ef4ba16d862522bac2736b2ba00dcee5f689a1c0" extra.projects: ["play-jsonJVM"] // no Scala.js plz - // 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""" ] diff --git a/proj/prog-scala-examples.conf b/proj/prog-scala-examples.conf index d9aa8763f..75f5fd4ed 100644 --- a/proj/prog-scala-examples.conf +++ b/proj/prog-scala-examples.conf @@ -8,10 +8,9 @@ vars.proj.prog-scala-examples: ${vars.base} { name: "prog-scala-examples" uri: "https://github.com/scalacommunitybuild/prog-scala-2nd-ed-code-examples.git#f23900dd7a652e863f0dda702b23004e4faebeec" - // 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""" ] diff --git a/proj/scala-logging.conf b/proj/scala-logging.conf index 775a02f07..746ce0c35 100644 --- a/proj/scala-logging.conf +++ b/proj/scala-logging.conf @@ -4,10 +4,10 @@ vars.proj.scala-logging: ${vars.base} { name: "scala-logging" uri: "https://github.com/scalacommunitybuild/scala-logging.git#a83a5472d79aab9eacfbf6012551d2d6a27719c9" - // 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""" ] diff --git a/proj/scala-newtype.conf b/proj/scala-newtype.conf index 2be3b74c3..b83961c95 100644 --- a/proj/scala-newtype.conf +++ b/proj/scala-newtype.conf @@ -8,10 +8,10 @@ vars.proj.scala-newtype: ${vars.base} { uri: "https://github.com/estatico/scala-newtype.git#babcff2df0e366eea7f42eee1d3b9003157691fb" extra.exclude: ["newtypeJS", "catsTestsJS"] // no Scala.js plz - // 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""" ] diff --git a/proj/scala-stm.conf b/proj/scala-stm.conf index ce3838bbf..7234011bd 100644 --- a/proj/scala-stm.conf +++ b/proj/scala-stm.conf @@ -4,7 +4,7 @@ vars.proj.scala-stm: ${vars.base} { name: "scala-stm" uri: "https://github.com/scala-stm/scala-stm.git#d7d833f82fba9bea56631241448c49cb4ab333f6" - // 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" diff --git a/proj/scala-typed-holes.conf b/proj/scala-typed-holes.conf index 21fe0d0ee..4bac5d061 100644 --- a/proj/scala-typed-holes.conf +++ b/proj/scala-typed-holes.conf @@ -5,4 +5,10 @@ vars.proj.scala-typed-holes: ${vars.base} { uri: "https://github.com/cb372/scala-typed-holes.git#16bd99aa303a290fde2e7821ac7254cdc1e13072" extra.exclude: ["docs"] + 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"] } diff --git a/proj/scalajson.conf b/proj/scalajson.conf index f8311164c..49e0a1924 100644 --- a/proj/scalajson.conf +++ b/proj/scalajson.conf @@ -6,7 +6,7 @@ vars.proj.scalajson: ${vars.base} { // no Scala.js please, and no benchmarks either extra.projects: ["scalaJsonJVM"] - // 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" diff --git a/proj/scalameter.conf b/proj/scalameter.conf index 2b424d55d..a0e89ee32 100644 --- a/proj/scalameter.conf +++ b/proj/scalameter.conf @@ -14,11 +14,11 @@ vars.proj.scalameter: ${vars.base} { deps.inject: ${vars.base.deps.inject} [ // ...but this one does "com.veact#scala-ssh" - // ScalaTest 3.0, not 3.1 + // ScalaTest 3.0, not 3.2 "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""" "removeDependency com.decodified scala-ssh" diff --git a/proj/scalapb.conf b/proj/scalapb.conf index a4924215b..fb6d1b85c 100644 --- a/proj/scalapb.conf +++ b/proj/scalapb.conf @@ -8,10 +8,10 @@ vars.proj.scalapb: ${vars.base} { // just what scalameta needs, for now extra.projects: ["runtimeJVM"] - // 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""" ] diff --git a/proj/scapegoat.conf b/proj/scapegoat.conf index 503e26cd6..9ba01688b 100644 --- a/proj/scapegoat.conf +++ b/proj/scapegoat.conf @@ -7,4 +7,10 @@ vars.proj.scapegoat: ${vars.base} { name: "scapegoat" uri: "https://github.com/scalacommunitybuild/scapegoat.git#388519a7ed81429e7f7ad7a7000e24e8d8893ac8" + 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"] } diff --git a/proj/scrooge.conf b/proj/scrooge.conf index 5c10af33c..7588732e1 100644 --- a/proj/scrooge.conf +++ b/proj/scrooge.conf @@ -8,10 +8,10 @@ vars.proj.scrooge: ${vars.base} { uri: "https://github.com/twitter/scrooge.git#7d3cb2c5e35a83205a5617dd26b0dcb8c141fc10" extra.projects: ["scrooge-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""" // the usual bintray stuff diff --git a/proj/slick.conf b/proj/slick.conf index 137c4392a..58e1021a5 100644 --- a/proj/slick.conf +++ b/proj/slick.conf @@ -13,10 +13,10 @@ vars.proj.slick: ${vars.base} { // https://github.com/sbt/sbt-testng-interface/blob/ca730f705f48af2139f39bc726b474afec072738/plugin/src/main/scala/de/johoop/testngplugin/TestNGPlugin.scala#L44 // I think it's a confusion of levels, but maybe I'm missing something. - ST 8/27/15 "de.johoop#sbt-testng-interface" - // ScalaTest 3.0, not 3.1 + // ScalaTest 3.0, not 3.2 "scalacommunitybuild#scalatest" ] - // ScalaTest 3.0, not 3.1 + // ScalaTest 3.0, not 3.2 extra.commands: ${vars.default-commands} [ "removeDependency org.scalatest scalatest" """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" diff --git a/proj/twitter-util.conf b/proj/twitter-util.conf index 3a60587f2..7546ddbe8 100644 --- a/proj/twitter-util.conf +++ b/proj/twitter-util.conf @@ -18,10 +18,10 @@ vars.proj.twitter-util: ${vars.base} { // "We use that when we don't think the tests will be reliable in a ci environment" "-DSKIP_FLAKY=true" ] - // 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 libraryDependencies in utilTest += "scalacommunitybuild" %% "scalatest" % "0"""" diff --git a/proj/unfiltered.conf b/proj/unfiltered.conf index c49a1bc19..348637472 100644 --- a/proj/unfiltered.conf +++ b/proj/unfiltered.conf @@ -9,10 +9,10 @@ vars.proj.unfiltered: ${vars.base} { uri: "https://github.com/unfiltered/unfiltered.git#a5913c9cee835999c61e8a6c027e7e5441fe619c" deps.inject: ${vars.base.deps.inject} [ - // ScalaTest 3.0, not 3.1 + // ScalaTest 3.0, not 3.2 "scalacommunitybuild#scalatest" ] - // ScalaTest 3.0, not 3.1 + // ScalaTest 3.0, not 3.2 extra.commands: ${vars.default-commands} [ "removeDependency org.scalatest scalatest" """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" diff --git a/proj/zinc.conf b/proj/zinc.conf index fea559809..3c4bc6d98 100644 --- a/proj/zinc.conf +++ b/proj/zinc.conf @@ -16,12 +16,12 @@ vars.proj.zinc: ${vars.base} { "compilerBridgeTest" ] extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"] - // 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} [ // as usual "set every bintrayReleaseOnPublish := false" - // ScalaTest 3.0, not 3.1 + // ScalaTest 3.0, not 3.2 "removeDependency org.scalatest scalatest" """set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test""" """set LocalProject("zincTestingJVM2_13") / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0"""" From 14b8e263286803c788224d09f4b710da927872f7 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 14:09:26 -0500 Subject: [PATCH 25/66] wip --- proj/http4s.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/http4s.conf b/proj/http4s.conf index 6aa16b4a8..b3021b48f 100644 --- a/proj/http4s.conf +++ b/proj/http4s.conf @@ -21,7 +21,7 @@ vars.proj.http4s: ${vars.base} { ] extra.exclude: [ // outside our purview - "bench", "docs", "website", "argonaut", "scalafixRules" + "bench", "docs", "website", "argonaut", "scalafixRules", "scalafixTests" // Missing dependencies: com.spinoco#fs2-crypto, io.chrisdavenport#keypool "ember-client", "examples-ember" ] From 6c5031ec1f4ca798db3895589783ae57b6e9d952 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 14:38:15 -0500 Subject: [PATCH 26/66] wip --- proj/classutil.conf | 4 ++++ proj/pascal.conf | 6 ++++++ proj/scala-records.conf | 6 ++++++ proj/scoverage.conf | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/proj/classutil.conf b/proj/classutil.conf index a606e9ecf..80026a427 100644 --- a/proj/classutil.conf +++ b/proj/classutil.conf @@ -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"] } diff --git a/proj/pascal.conf b/proj/pascal.conf index 8ecefbad1..5e2f59b59 100644 --- a/proj/pascal.conf +++ b/proj/pascal.conf @@ -4,4 +4,10 @@ vars.proj.pascal: ${vars.base} { name: "pascal" uri: "https://github.com/TomasMikula/pascal.git#a8b7201e1f555afb766f80875c0f65e0767afedf" + // 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"] } diff --git a/proj/scala-records.conf b/proj/scala-records.conf index c9635a874..558b29e8d 100644 --- a/proj/scala-records.conf +++ b/proj/scala-records.conf @@ -8,4 +8,10 @@ vars.proj.scala-records: ${vars.base} { "coreJS" // no Scala.js please "root" // dbuild thinks it tries to publish root#root ] + // 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"] } diff --git a/proj/scoverage.conf b/proj/scoverage.conf index beb3c7188..d37108062 100644 --- a/proj/scoverage.conf +++ b/proj/scoverage.conf @@ -12,4 +12,10 @@ vars.proj.scoverage: ${vars.base} { // January 2018: failure's continued existence confirmed // see https://github.com/scala/community-builds/pull/387 extra.test-tasks: ["compile"] + // 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"] } From ff01d8eddbb2f0aa0584dc5e1efb2051845486bb Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 14:44:47 -0500 Subject: [PATCH 27/66] wip --- proj/elastic4s.conf | 6 ++++++ proj/scalamock.conf | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/proj/elastic4s.conf b/proj/elastic4s.conf index 0597b16bf..8edb5828c 100644 --- a/proj/elastic4s.conf +++ b/proj/elastic4s.conf @@ -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"] } diff --git a/proj/scalamock.conf b/proj/scalamock.conf index 65625dc10..08576279f 100644 --- a/proj/scalamock.conf +++ b/proj/scalamock.conf @@ -1,10 +1,11 @@ -// https://github.com/paulbutcher/ScalaMock.git#master +// https://github.com/SethTisue/ScalaMock.git#scalatest-3.2 # was paulbutcher, master -// 2.13: tracking master since that's where 2.13 support landed +// temporarily forked pending merge of +// https://github.com/paulbutcher/ScalaMock/pull/333 vars.proj.scalamock: ${vars.base} { name: "scalamock" - uri: "https://github.com/paulbutcher/ScalaMock.git#c46a81ca756947380339b1dc0e2d7bb5d6c8b2b8" + uri: "https://github.com/SethTisue/ScalaMock.git#02503a7f72ee07bf2d3c508ee9a91ed71012d7fe" extra.projects: ["scalamockJVM", "examples"] } From fdafdd1fc8dbbda3c6003238d43e1efbaaf3b6c6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 14:46:11 -0500 Subject: [PATCH 28/66] wip --- proj/avro4s.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 0e32aa968..4b55fb291 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -5,4 +5,10 @@ vars.proj.avro4s: ${vars.base} { uri: "https://github.com/sksamuel/avro4s.git#781aa424f4affc2b8dfa35280c583442960df08b" extra.exclude: ["benchmarks"] + // 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"] } From 43b119a3af92bc3291c4ae522e205a77d97dd2e2 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 14:48:57 -0500 Subject: [PATCH 29/66] wip --- proj/scala-gopher.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proj/scala-gopher.conf b/proj/scala-gopher.conf index 028c95c19..f7f2b9b9e 100644 --- a/proj/scala-gopher.conf +++ b/proj/scala-gopher.conf @@ -10,4 +10,10 @@ vars.proj.scala-gopher: ${vars.base} { // too many intermittent failures -- reported at // https://github.com/rssh/scala-gopher/issues/20 extra.test-tasks: ["compile"] + // 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"] } From ca7c03d467d1cdd7fe509a06086902f542a8e678 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 15:10:08 -0500 Subject: [PATCH 30/66] wip --- proj/scalamock.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/proj/scalamock.conf b/proj/scalamock.conf index 08576279f..7b85d341d 100644 --- a/proj/scalamock.conf +++ b/proj/scalamock.conf @@ -1,11 +1,8 @@ -// https://github.com/SethTisue/ScalaMock.git#scalatest-3.2 # was paulbutcher, master - -// temporarily forked pending merge of -// https://github.com/paulbutcher/ScalaMock/pull/333 +// https://github.com/paulbutcher/ScalaMock.git#master vars.proj.scalamock: ${vars.base} { name: "scalamock" - uri: "https://github.com/SethTisue/ScalaMock.git#02503a7f72ee07bf2d3c508ee9a91ed71012d7fe" + uri: "https://github.com/paulbutcher/ScalaMock.git#08ee77c9be4c98a352d3f111d83b730d56d9931c" extra.projects: ["scalamockJVM", "examples"] } From 77fda918bf1f241d0b463fdd75826a233a5ac468 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 15:32:02 -0500 Subject: [PATCH 31/66] wip --- proj/scalasti.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proj/scalasti.conf b/proj/scalasti.conf index 45eb7a4ca..4b5313d92 100644 --- a/proj/scalasti.conf +++ b/proj/scalasti.conf @@ -14,7 +14,11 @@ vars.proj.scalasti: ${vars.base} { extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"] extra.commands: ${vars.default-commands} [ "set every bintrayReleaseOnPublish := false" + // 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"] // we really just want scalasti because it's a dependency of giter8, so // this doesn't seem worth troubleshooting: // [scalasti] [error] Failed tests: From 99ea77f199fc31c9a2c43a7fbb551bc26c4b9c45 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 16:13:45 -0500 Subject: [PATCH 32/66] wip --- proj/akka-http.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/akka-http.conf b/proj/akka-http.conf index 8f24065e6..1adc8674b 100644 --- a/proj/akka-http.conf +++ b/proj/akka-http.conf @@ -25,7 +25,7 @@ vars.proj.akka-http: ${vars.base} { """set ThisBuild / javaOptions += "-Dakka.fail-mixed-versions=false"""" // ScalaTest 3.0, not 3.2 "removeDependency org.scalatest scalatest" - """set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test""" + """set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0"""" ] deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From a4be152b8d3561c13297d29cfb154c79db46575a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 16:14:17 -0500 Subject: [PATCH 33/66] wip --- proj/scapegoat.conf | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/proj/scapegoat.conf b/proj/scapegoat.conf index 9ba01688b..3fbcf9eeb 100644 --- a/proj/scapegoat.conf +++ b/proj/scapegoat.conf @@ -1,16 +1,10 @@ -// https://github.com/scalacommunitybuild/scapegoat.git#community-build-2.13 +// https://github.com/SethTisue/scapegoat.git#community-build-2.13 # was sksamuel, master -// forked (August 2019) because some classpath-handling code didn't -// work under dbuild +// forked (August 2019; refreshed July 2020) because some +// classpath-handling code didn't work under dbuild vars.proj.scapegoat: ${vars.base} { name: "scapegoat" - uri: "https://github.com/scalacommunitybuild/scapegoat.git#388519a7ed81429e7f7ad7a7000e24e8d8893ac8" + uri: "https://github.com/SethTisue/scapegoat.git#883d336dab2c93b34e887fa5a4b43fc8a5636f9f" - 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"] } From ffc76c76eefca215eda953febc34c30d4faae246 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 16:16:34 -0500 Subject: [PATCH 34/66] wip --- proj/mockito-scala.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/mockito-scala.conf b/proj/mockito-scala.conf index b8d1b1ddb..378dee00d 100644 --- a/proj/mockito-scala.conf +++ b/proj/mockito-scala.conf @@ -10,7 +10,7 @@ vars.proj.mockito-scala: ${vars.base} { extra.commands: ${vars.default-commands} [ // ScalaTest 3.0, not 3.2 "removeDependency org.scalatest scalatest" - """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" + """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0"""" ] deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From 404bb2e1c9ed99b0900552229237a5517b186387 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 16:35:36 -0500 Subject: [PATCH 35/66] wip --- proj/sbt-util.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proj/sbt-util.conf b/proj/sbt-util.conf index 3cab74ec2..21ae22679 100644 --- a/proj/sbt-util.conf +++ b/proj/sbt-util.conf @@ -7,5 +7,9 @@ vars.proj.sbt-util: ${vars.base} { extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"] extra.commands: ${vars.default-commands} [ "set every bintrayReleaseOnPublish := false" + // 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"] } From 37fcdd79bf0811cc22ecc1d80d509b2948f68b4f Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 16:50:00 -0500 Subject: [PATCH 36/66] wip --- proj/akka-http.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/proj/akka-http.conf b/proj/akka-http.conf index 1adc8674b..4de4e6621 100644 --- a/proj/akka-http.conf +++ b/proj/akka-http.conf @@ -23,9 +23,5 @@ vars.proj.akka-http: ${vars.base} { """set httpTests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "CodingDirectivesSpec.scala" || "HttpAppSpec.scala"""" // and some tests run forked, so this goes in javaOptions, not extra.options """set ThisBuild / javaOptions += "-Dakka.fail-mixed-versions=false"""" - // ScalaTest 3.0, not 3.2 - "removeDependency org.scalatest scalatest" - """set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0"""" ] - deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From 5cf0d176eb24ebe90e80e29a71eb010eef6dc1d6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 16:56:02 -0500 Subject: [PATCH 37/66] wip --- proj/avro4s.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 4b55fb291..0e32aa968 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -5,10 +5,4 @@ vars.proj.avro4s: ${vars.base} { uri: "https://github.com/sksamuel/avro4s.git#781aa424f4affc2b8dfa35280c583442960df08b" extra.exclude: ["benchmarks"] - // 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"] } From 65da76cfe2231d346cd9e33738568f4b89f90c88 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 17:19:48 -0500 Subject: [PATCH 38/66] wip --- proj/akka-http.conf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/proj/akka-http.conf b/proj/akka-http.conf index 4de4e6621..83dd7d83b 100644 --- a/proj/akka-http.conf +++ b/proj/akka-http.conf @@ -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: [ From ccf4d2a37352bd0dcd89a1895912257bf030cf28 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 17:23:00 -0500 Subject: [PATCH 39/66] wip --- proj/circe-config.conf | 7 ------- proj/libra.conf | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/proj/circe-config.conf b/proj/circe-config.conf index df19b5423..eb30d703a 100644 --- a/proj/circe-config.conf +++ b/proj/circe-config.conf @@ -4,11 +4,4 @@ vars.proj.circe-config: ${vars.base} { name: "circe-config" uri: "https://github.com/circe/circe-config.git#a3e79c18babb5e18b2d1f5b9ec6edceb1c1ea3d3" - // 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""" - ] } diff --git a/proj/libra.conf b/proj/libra.conf index 651b0cb6c..47af6538c 100644 --- a/proj/libra.conf +++ b/proj/libra.conf @@ -11,4 +11,10 @@ vars.proj.libra: ${vars.base} { uri: "https://github.com/scalacommunitybuild/libra.git#25adeaeea520ca33635ca30b62167700cd17bc78" extra.exclude: ["docs"] + // 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"] } From e066ae9bde05de8d2c879c695f03fbebec80eaf1 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 17:44:08 -0500 Subject: [PATCH 40/66] wip --- proj/tsec.conf | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/proj/tsec.conf b/proj/tsec.conf index c74408240..bf273b048 100644 --- a/proj/tsec.conf +++ b/proj/tsec.conf @@ -1,7 +1,9 @@ -// https://github.com/jmcardon/tsec.git#v0.2.0 +// https://github.com/jmcardon/tsec.git#v0.2.0 # was jmcardon, v0.2.0 // dependency of scala-pet-store // frozen (March 2020) at version scala-pet-store currently expects +// forked (July 2020) to downgrade to ScalaTest 3.0 (from a 3.1 snapshot; +// it seemed easier than going forward to 3.2) vars.proj.tsec: ${vars.base} { name: "tsec" @@ -18,11 +20,4 @@ vars.proj.tsec: ${vars.base} { // involved in code generation, it's not the sbt plugin like usual. shrug? deps.ignore: ["com.geirsson#scalafmt-core", "com.lucidchart#scalafmt-impl"] check-missing: false // ignore missing scalafmt - deps.inject: ${vars.base.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""" - ] } From 73e968198347f7cb341e03129c990be2a24de083 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:16:02 -0500 Subject: [PATCH 41/66] wip --- proj/tsec.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/tsec.conf b/proj/tsec.conf index bf273b048..0eb3f1238 100644 --- a/proj/tsec.conf +++ b/proj/tsec.conf @@ -1,4 +1,4 @@ -// https://github.com/jmcardon/tsec.git#v0.2.0 # was jmcardon, v0.2.0 +// https://github.com/scalacommunitybuild/tsec.git#community-build-2.13 # was jmcardon, v0.2.0 // dependency of scala-pet-store // frozen (March 2020) at version scala-pet-store currently expects @@ -7,7 +7,7 @@ vars.proj.tsec: ${vars.base} { name: "tsec" - uri: "https://github.com/jmcardon/tsec.git#0efd8bbed7578020d7e092de52eda45820237802" + uri: "https://github.com/scalacommunitybuild/tsec.git#78fa0c5bec52658a40c8830a2b8edcaadea92297" extra.exclude: [ "microsite", "tsec-bench" // out of scope From 74c096be2891ec127eb88241747d1e2cdb561ac7 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:19:58 -0500 Subject: [PATCH 42/66] wip --- proj/sttp.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proj/sttp.conf b/proj/sttp.conf index 43bc0476a..099bc5f4e 100644 --- a/proj/sttp.conf +++ b/proj/sttp.conf @@ -28,5 +28,9 @@ vars.proj.sttp: ${vars.base} { """set asyncHttpClientFs2Backend / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())""" // ditto; same ticket """set akkaHttpBackend / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "AkkaHttpStreamingTest.scala"""" + // 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"] } From a8b590276b9eedd9b4be724457939497b7eedb26 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:23:15 -0500 Subject: [PATCH 43/66] wip --- proj/avro4s.conf | 6 ++++++ proj/sksamuel-exts.conf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 0e32aa968..9466d7dd6 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -5,4 +5,10 @@ vars.proj.avro4s: ${vars.base} { uri: "https://github.com/sksamuel/avro4s.git#781aa424f4affc2b8dfa35280c583442960df08b" extra.exclude: ["benchmarks"] + // 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"] } diff --git a/proj/sksamuel-exts.conf b/proj/sksamuel-exts.conf index e6413d075..f97568a63 100644 --- a/proj/sksamuel-exts.conf +++ b/proj/sksamuel-exts.conf @@ -12,7 +12,7 @@ vars.proj.sksamuel-exts: ${vars.base} { "set excludeFilter in (Test, unmanagedSources) := HiddenFileFilter || \"FileWatcherTest.scala\"" // 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""" ] deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From 8da497c4cc5c210c8ed7639ab0703f4e2007fd73 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:47:52 -0500 Subject: [PATCH 44/66] wip --- proj/tsec.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proj/tsec.conf b/proj/tsec.conf index 0eb3f1238..869699dd6 100644 --- a/proj/tsec.conf +++ b/proj/tsec.conf @@ -20,4 +20,10 @@ vars.proj.tsec: ${vars.base} { // involved in code generation, it's not the sbt plugin like usual. shrug? deps.ignore: ["com.geirsson#scalafmt-core", "com.lucidchart#scalafmt-impl"] check-missing: false // ignore missing scalafmt + // 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"] } From 64225a9cbf066528e6ef57000315ae5cd72a1dfa Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:50:39 -0500 Subject: [PATCH 45/66] wip --- proj/circe-config.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/circe-config.conf b/proj/circe-config.conf index eb30d703a..5afa73af8 100644 --- a/proj/circe-config.conf +++ b/proj/circe-config.conf @@ -2,6 +2,6 @@ vars.proj.circe-config: ${vars.base} { name: "circe-config" - uri: "https://github.com/circe/circe-config.git#a3e79c18babb5e18b2d1f5b9ec6edceb1c1ea3d3" + uri: "https://github.com/circe/circe-config.git#cb9fc08d3edc36d69aac4c7fc1efe8dbc4b798a4" } From 92be41c8c5f7ff0ef051d6dcdf63fbbc5bf0baf6 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:54:34 -0500 Subject: [PATCH 46/66] oops --- proj/sksamuel-exts.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/sksamuel-exts.conf b/proj/sksamuel-exts.conf index f97568a63..e6413d075 100644 --- a/proj/sksamuel-exts.conf +++ b/proj/sksamuel-exts.conf @@ -12,7 +12,7 @@ vars.proj.sksamuel-exts: ${vars.base} { "set excludeFilter in (Test, unmanagedSources) := HiddenFileFilter || \"FileWatcherTest.scala\"" // ScalaTest 3.0, not 3.2 "removeDependency org.scalatest scalatest" - """set ThisBuild / libraryDependencies += "scalacommunitybuild" %% "scalatest" % "0" % Test""" + """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" ] deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From b92ef962c43fdaca0ddfed5c31be4e268d40dc6b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 18:59:35 -0500 Subject: [PATCH 47/66] wip --- proj/avro4s.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 9466d7dd6..9c0c07210 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -1,4 +1,7 @@ -// https://github.com/sksamuel/avro4s.git#master +// https://github.com/SethTisue/avro4s.git#scalatest-3.2 # was sksamuel, master + +// temporarily forked pending merge of +// https://github.com/sksamuel/avro4s/pull/514 vars.proj.avro4s: ${vars.base} { name: "avro4s" From eb08d80d832035034bc3136c8d35e78186107ecd Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 19:02:03 -0500 Subject: [PATCH 48/66] wip --- proj/avro4s.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 9c0c07210..9348d26eb 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -8,10 +8,4 @@ vars.proj.avro4s: ${vars.base} { uri: "https://github.com/sksamuel/avro4s.git#781aa424f4affc2b8dfa35280c583442960df08b" extra.exclude: ["benchmarks"] - // 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"] } From 7e6274182d4a7f23fb6f0dddac6abc85729fd07c Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 19:04:50 -0500 Subject: [PATCH 49/66] wip --- proj/avro4s.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 9348d26eb..3db94fb1c 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -5,7 +5,7 @@ vars.proj.avro4s: ${vars.base} { name: "avro4s" - uri: "https://github.com/sksamuel/avro4s.git#781aa424f4affc2b8dfa35280c583442960df08b" + uri: "https://github.com/SethTisue/avro4s.git#4aabfa7af2dc0501d3235e2223527f96b4ba66a0" extra.exclude: ["benchmarks"] } From 6c0fe92f25ae3b1ebabdb31e0b7cfc1fa17d2024 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 8 Jul 2020 20:03:56 -0500 Subject: [PATCH 50/66] wip --- proj/avro4s.conf | 7 ++----- proj/mockito-scala.conf | 13 +++++-------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/proj/avro4s.conf b/proj/avro4s.conf index 3db94fb1c..726536e6f 100644 --- a/proj/avro4s.conf +++ b/proj/avro4s.conf @@ -1,11 +1,8 @@ -// https://github.com/SethTisue/avro4s.git#scalatest-3.2 # was sksamuel, master - -// temporarily forked pending merge of -// https://github.com/sksamuel/avro4s/pull/514 +// https://github.com/sksamuel/avro4s.git#master vars.proj.avro4s: ${vars.base} { name: "avro4s" - uri: "https://github.com/SethTisue/avro4s.git#4aabfa7af2dc0501d3235e2223527f96b4ba66a0" + uri: "https://github.com/sksamuel/avro4s.git#ef1ba21bffa667f99709511362f6303fdf5e30e9" extra.exclude: ["benchmarks"] } diff --git a/proj/mockito-scala.conf b/proj/mockito-scala.conf index 378dee00d..497804639 100644 --- a/proj/mockito-scala.conf +++ b/proj/mockito-scala.conf @@ -1,16 +1,13 @@ -// https://github.com/mockito/mockito-scala.git#release/1.x +// https://github.com/SethTisue/mockito-scala.git#scalatest-3.2 # was mockito, release/1.x // dependency of metrics-scala, and of kafka +// temporarily forked pending merge of +// https://github.com/mockito/mockito-scala/pull/264 + vars.proj.mockito-scala: ${vars.base} { name: "mockito-scala" - uri: "https://github.com/mockito/mockito-scala.git#50c64c37a55a0a2ddea51e453c4f15f11e7b64f8" + uri: "https://github.com/SethTisue/mockito-scala.git#cb9abaef8ed247871e2e902202b2e2f259000f17" extra.exclude: ["scalaz"] - extra.commands: ${vars.default-commands} [ - // ScalaTest 3.0, not 3.2 - "removeDependency org.scalatest scalatest" - """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0"""" - ] - deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From cec5a0b9bf9afb805b3b061b00356fd9d2534031 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 9 Jul 2020 06:49:40 -0500 Subject: [PATCH 51/66] wip --- proj/mockito-scala.conf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/proj/mockito-scala.conf b/proj/mockito-scala.conf index 497804639..16f19a669 100644 --- a/proj/mockito-scala.conf +++ b/proj/mockito-scala.conf @@ -1,13 +1,10 @@ -// https://github.com/SethTisue/mockito-scala.git#scalatest-3.2 # was mockito, release/1.x +// https://github.com/mockito/mockito-scala.git#release/1.x // dependency of metrics-scala, and of kafka -// temporarily forked pending merge of -// https://github.com/mockito/mockito-scala/pull/264 - vars.proj.mockito-scala: ${vars.base} { name: "mockito-scala" - uri: "https://github.com/SethTisue/mockito-scala.git#cb9abaef8ed247871e2e902202b2e2f259000f17" + uri: "https://github.com/mockito/mockito-scala.git#febdec638aecc12cff41c5523024eab89aa97256" extra.exclude: ["scalaz"] } From f76390a4351750e28cd9817d042e62d220be9e9b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 17:53:36 -0700 Subject: [PATCH 52/66] wip --- proj/scalameta.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/proj/scalameta.conf b/proj/scalameta.conf index 04165b075..3e673721f 100644 --- a/proj/scalameta.conf +++ b/proj/scalameta.conf @@ -23,7 +23,8 @@ vars.proj.scalameta: ${vars.base} { """set unmanagedSourceDirectories in (testkit, Test) := Seq()""" // ScalaTest 3.0, not 3.2 "removeDependency org.scalatest scalatest" - """set libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0"""" + """set libraryDependencies in Test in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test""" + """set libraryDependencies in testkit += "scalacommunitybuild" %% "scalatest" % "0"""" ] deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] } From dd4f2dedde262eb31636a5bb17bb2955a0c16932 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 18:41:43 -0700 Subject: [PATCH 53/66] wip --- proj/sttp.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proj/sttp.conf b/proj/sttp.conf index 099bc5f4e..c4034060b 100644 --- a/proj/sttp.conf +++ b/proj/sttp.conf @@ -1,4 +1,4 @@ -// https://github.com/softwaremill/sttp.git#12636c33ce4cece7c411a9b48657f2845cebad89 # master +// https://github.com/SethTisue/sttp.git#scalatest-3.2-readiness # was softwaremill, 12636c33ce4cece7c411a9b48657f2845cebad89; was master // frozen at a known-green commit before http4s-related compile errors // (presumably because we have http4s frozen?) @@ -6,9 +6,11 @@ // next time we unfreeze, check the status of https://github.com/softwaremill/sttp/issues/598 // to see what tests we could try to re-enable +// forked (July 2020) pending merge of changes needed for ScalaTest 3.2 compat + vars.proj.sttp: ${vars.base} { name: "sttp" - uri: "https://github.com/softwaremill/sttp.git#12636c33ce4cece7c411a9b48657f2845cebad89" + uri: "https://github.com/SethTisue/sttp.git#02a92f68cbbd234be135817683391d9a280bb1d0" extra.options: ["-Dakka.fail-mixed-versions=false"] extra.projects: ["rootJVM"] // aggregates From 763560d300a398ac5082cfcafa30e4d3f3487cdd Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 19:07:29 -0700 Subject: [PATCH 54/66] wip --- proj/libra.conf | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/proj/libra.conf b/proj/libra.conf index 47af6538c..c79544182 100644 --- a/proj/libra.conf +++ b/proj/libra.conf @@ -1,20 +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" extra.exclude: ["docs"] - // 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"] } From 96c4948c5e3040f77c2802ec7099ee95878e09ba Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 19:29:35 -0700 Subject: [PATCH 55/66] wip --- proj/libra.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/libra.conf b/proj/libra.conf index c79544182..39570fc57 100644 --- a/proj/libra.conf +++ b/proj/libra.conf @@ -7,7 +7,7 @@ vars.proj.libra: ${vars.base} { name: "libra" - uri: "https://github.com/scalacommunitybuild/libra.git#25adeaeea520ca33635ca30b62167700cd17bc78" + uri: "https://github.com/SethTisue/libra.git#eef8464928a31b2bcdc1cbbc9c80c16cafd27bdb" - extra.exclude: ["docs"] + extra.exclude: ["docs", "*JS"] } From 5b89c9776fb2e231e87a2d9f49789f7a749fa00d Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 20:02:17 -0700 Subject: [PATCH 56/66] wip --- proj/libra.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/libra.conf b/proj/libra.conf index 39570fc57..15b3a40f0 100644 --- a/proj/libra.conf +++ b/proj/libra.conf @@ -7,7 +7,7 @@ vars.proj.libra: ${vars.base} { name: "libra" - uri: "https://github.com/SethTisue/libra.git#eef8464928a31b2bcdc1cbbc9c80c16cafd27bdb" + uri: "https://github.com/SethTisue/libra.git#766aec63a252660132175ca30d93c0b094c19186" extra.exclude: ["docs", "*JS"] } From fc67955f8612bebd94502198e6995b83c9935641 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 21:03:15 -0700 Subject: [PATCH 57/66] wip --- proj/sttp.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/proj/sttp.conf b/proj/sttp.conf index c4034060b..1880c8abc 100644 --- a/proj/sttp.conf +++ b/proj/sttp.conf @@ -30,9 +30,5 @@ vars.proj.sttp: ${vars.base} { """set asyncHttpClientFs2Backend / Test / executeTests := Tests.Output(TestResult.Passed, Map(), Iterable())""" // ditto; same ticket """set akkaHttpBackend / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "AkkaHttpStreamingTest.scala"""" - // 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"] } From ba6218c311e1759f0a0485dd1daa86d62d120df0 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 21:06:46 -0700 Subject: [PATCH 58/66] wip --- proj/giter8.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proj/giter8.conf b/proj/giter8.conf index 99e002bdc..97822ed26 100644 --- a/proj/giter8.conf +++ b/proj/giter8.conf @@ -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"""" From ab58c3e68179bf888dc90beb277509ee72d68f2b Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 23 Jul 2020 22:05:08 -0700 Subject: [PATCH 59/66] wip --- proj/scalafmt.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/proj/scalafmt.conf b/proj/scalafmt.conf index 08ea32bb2..bb2dd79e7 100644 --- a/proj/scalafmt.conf +++ b/proj/scalafmt.conf @@ -7,9 +7,10 @@ vars.proj.scalafmt: ${vars.base} { name: "scalafmt" uri: "https://github.com/scalameta/scalafmt.git#7333de90ef6de6159c166811fc28c31c5e61e34f" - extra.projects: ["coreJVM", "cli", "tests"] - extra.commands: ${vars.default-commands} [ - // not investigated - """set tests / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "GitOpsTest.scala" || "CliTest.scala"""" - ] + // when we move to newer scalameta, we should see if we can start running + // tests here again. the problem is scalameta-testkit. in the scalameta + // version we have, scalameta-testkit is still on 3.0. once we have a version + // that's on 3.2 (or perhaps 3.1 would be enough?), this should start working again. + extra.projects: ["coreJVM", "cli"] // , "tests" + extra.run-tests: false } From b5325795b13b615f359790fbe5ee03beb0da3d9a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 08:33:03 -0700 Subject: [PATCH 60/66] wip --- proj/akka-management.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/proj/akka-management.conf b/proj/akka-management.conf index f98f59658..e43151bb9 100644 --- a/proj/akka-management.conf +++ b/proj/akka-management.conf @@ -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.2 - deps.inject: ${vars.base.deps.inject} ["scalacommunitybuild#scalatest"] extra.commands: ${vars.default-commands} [ - // ScalaTest 3.0, not 3.2 - "removeDependency org.scalatest scalatest" - """set ThisBuild / libraryDependencies += "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 From 3fe9f65337826fbd85313fbe5aeed43b442781df Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 12:09:35 -0700 Subject: [PATCH 61/66] wip --- proj/akka-persistence-jdbc.conf | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/proj/akka-persistence-jdbc.conf b/proj/akka-persistence-jdbc.conf index 04c63f782..74fcde575 100644 --- a/proj/akka-persistence-jdbc.conf +++ b/proj/akka-persistence-jdbc.conf @@ -5,13 +5,14 @@ // 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 @@ -21,9 +22,5 @@ vars.proj.akka-persistence-jdbc: ${vars.base} { extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"] extra.commands: ${vars.default-commands} [ "set every bintrayReleaseOnPublish := false" - // 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"] } From 8ce1bc24c36582427cd73a094dfaabc953bdee26 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 13:36:45 -0700 Subject: [PATCH 62/66] wip --- proj/circe-config.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proj/circe-config.conf b/proj/circe-config.conf index cb1a39a98..b32760bd0 100644 --- a/proj/circe-config.conf +++ b/proj/circe-config.conf @@ -1,7 +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" + // (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 } From 322b04b182e228328358810f3a1feeb5375d70e7 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 14:27:55 -0700 Subject: [PATCH 63/66] wip --- proj/scalatest.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index 079c3212e..1da074b1b 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -24,6 +24,8 @@ vars.proj.scalatest-tests: ${vars.base} { "*JS", "*Native", "*Dotty" // out of scope "root", "examples" + // until https://github.com/scalatest/scalatest/issues/1851 gets fixed + "genSortedTests" ] // needs extra heap to even compile extra.options: ["-Xmx4000m"] From 6a4a14a899e6dda5948775e18c78756bdfc58606 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 14:59:46 -0700 Subject: [PATCH 64/66] wip --- proj/scalatest.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index 1da074b1b..cd8bf648d 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -24,8 +24,6 @@ vars.proj.scalatest-tests: ${vars.base} { "*JS", "*Native", "*Dotty" // out of scope "root", "examples" - // until https://github.com/scalatest/scalatest/issues/1851 gets fixed - "genSortedTests" ] // needs extra heap to even compile extra.options: ["-Xmx4000m"] @@ -45,6 +43,8 @@ vars.proj.scalatest-tests: ${vars.base} { """set scalatestTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "GeneratorSpec.scala" || "FrameworkSuite.scala" || "WaitersSpec.scala" || "TestSortingReporterSpec.scala" || "JavaFuturesSpec.scala" || "ParallelTestExecutionSpec.scala" || "TimeLimitsSpec.scala" || "TestThreadsStartingCounterSpec.scala" || "SuiteSortingReporterSpec.scala" || "CommonGeneratorsSpec.scala" || "PropCheckerAssertingSpec.scala" || "ConductorMethodsSuite.scala"""" """set scalacticTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "NonEmptyArraySpec.scala"""" """set genRegularTests4 / Test / managedSources ~= (_.filterNot(_.getName == "FrameworkSuite.scala").filterNot(_.getName == "GeneratorSpec.scala").filterNot(_.getName == "CommonGeneratorsSpec.scala").filterNot(_.getName == "ParallelTestExecutionSpec.scala").filterNot(_.getName == "DispatchReporterSpec.scala").filterNot(_.getName == "TestThreadsStartingCounterSpec.scala").filterNot(_.getName == "EventuallySpec.scala"))""" + // work around https://github.com/scalatest/scalatest/issues/1851 + "genGenTests/compile" ] // too many tests rely on Symbol#toString being 'foo // reenable after 2.13.3 comes out and upstream adapts From 4f70104b4b8518e07cbdfa98e7992478d1392bc4 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 15:14:12 -0700 Subject: [PATCH 65/66] wip --- proj/scalatest.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/proj/scalatest.conf b/proj/scalatest.conf index cd8bf648d..d56b0c792 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -24,6 +24,8 @@ vars.proj.scalatest-tests: ${vars.base} { "*JS", "*Native", "*Dotty" // out of scope "root", "examples" + // https://github.com/scalatest/scalatest/issues/1852 + "genRegularTests4" ] // needs extra heap to even compile extra.options: ["-Xmx4000m"] From 557c3a8b64286275aa0a09c9716ff8253eaa1c41 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 24 Jul 2020 15:41:17 -0700 Subject: [PATCH 66/66] wip --- dependencies.txt | 1 - proj/scalatest.conf | 59 ++++++++++----------------------------------- projs.conf | 1 - 3 files changed, 13 insertions(+), 48 deletions(-) diff --git a/dependencies.txt b/dependencies.txt index 5bc8a763c..89b414fba 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -98,7 +98,6 @@ elastic4s: cloc-plugin, jackson-module-scala, scala, scala-xml, scalacheck, scal slick: cloc-plugin, sbt-testng, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatest-3-0 sttp-model: cloc-plugin, kind-projector, scala, scala-collection-compat, scala-xml, scalatest, silencer, wartremover grizzled: cloc-plugin, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatest-3-0, wartremover -scalatest-tests: cloc-plugin, scala, scala-parser-combinators, scala-xml, scalatest, scalatestplus-junit, scalatestplus-testng scalatex: acyclic, cloc-plugin, fastparse-scalameta, portable-scala-reflect, scala, scala-xml, scalatags, sourcecode, utest classutil: cloc-plugin, grizzled, scala, scala-collection-compat, scala-xml, scalacheck, scalatest, scalatest-3-0, wartremover scalapb: cloc-plugin, fastparse, portable-scala-reflect, scala, scala-xml, scalacheck, scalatest, scalatest-3-0, sourcecode, utest diff --git a/proj/scalatest.conf b/proj/scalatest.conf index d56b0c792..d8df4974a 100644 --- a/proj/scalatest.conf +++ b/proj/scalatest.conf @@ -1,54 +1,21 @@ // https://github.com/scalatest/scalatest.git#3.2.x-new -vars.proj.scalatest: ${vars.base} { - name: "scalatest" - uri: "https://github.com/scalatest/scalatest.git#f3d5f9d66631dc49b2218c8edd039840788bd915" +// We don't attempt to compile or run the tests at all. (We used to; +// see version control history. On 3.0 we compiled and ran them; +// on 3.1 we just compiled them.) - extra.projects: ["scalatest", "scalactic", "scalatestFunSuite"] -} +// The tests involve a lot of code generation and even figuring out +// how to run them on 3.2 seems complicated. Perhaps I'll get some +// guidance at https://github.com/scalatest/scalatest/issues/1851 +// and/or https://github.com/scalatest/scalatest/issues/1852 on how +// this can be easily done. -// this is almost 1M lines of code, but it needn't be green (or be compiled at all) -// for dependent projects to proceed, so let's keep it separate +// In the meantime, the fact that ScalaTest is used in so many downstream +// projects should mean that it's getting a good workout. -vars.proj.scalatest-tests: ${vars.base} { - name: "scalatest-tests" +vars.proj.scalatest: ${vars.base} { + name: "scalatest" uri: "https://github.com/scalatest/scalatest.git#f3d5f9d66631dc49b2218c8edd039840788bd915" - extra.exclude: [ - // we already built these above - "scalatest", "scalactic", "scalacticMacro", "scalatestCompatible", "scalatestFunSuite", "scalatestCore" - "scalatestMatchersCore", "scalatestShouldMatchers", "scalatestMustMatchers", "scalatestDiagrams" - "scalatestFeatureSpec", "scalatestRefSpec", "scalatestFunSpec", "scalatestFreeSpec", "scalatestPropSpec", - "scalatestFlatSpec", "scalatestWordSpec" - // JVM only please - "*JS", "*Native", "*Dotty" - // out of scope - "root", "examples" - // https://github.com/scalatest/scalatest/issues/1852 - "genRegularTests4" - ] - // needs extra heap to even compile - extra.options: ["-Xmx4000m"] - - // dependencies are on prelease versions with different artifact names, so we must - // override to the released artifact names - deps.inject: [ - "org.scalatestplus#testng-6-7" - "org.scalatestplus#junit-4-12" - ] - extra.commands: ${vars.default-commands} [ - "removeDependency org.scalatestplus scalatestplus-testng" - "removeDependency org.scalatestplus scalatestplus-junit" - """set libraryDependencies in ThisBuild += "org.scalatestplus" %% "testng-6-7" % "0" % Test""" - """set libraryDependencies in ThisBuild += "org.scalatestplus" %% "junit-4-12" % "0" % Test""" - // not investigated - """set scalatestTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "GeneratorSpec.scala" || "FrameworkSuite.scala" || "WaitersSpec.scala" || "TestSortingReporterSpec.scala" || "JavaFuturesSpec.scala" || "ParallelTestExecutionSpec.scala" || "TimeLimitsSpec.scala" || "TestThreadsStartingCounterSpec.scala" || "SuiteSortingReporterSpec.scala" || "CommonGeneratorsSpec.scala" || "PropCheckerAssertingSpec.scala" || "ConductorMethodsSuite.scala"""" - """set scalacticTest / Test / unmanagedSources / excludeFilter := HiddenFileFilter || "NonEmptyArraySpec.scala"""" - """set genRegularTests4 / Test / managedSources ~= (_.filterNot(_.getName == "FrameworkSuite.scala").filterNot(_.getName == "GeneratorSpec.scala").filterNot(_.getName == "CommonGeneratorsSpec.scala").filterNot(_.getName == "ParallelTestExecutionSpec.scala").filterNot(_.getName == "DispatchReporterSpec.scala").filterNot(_.getName == "TestThreadsStartingCounterSpec.scala").filterNot(_.getName == "EventuallySpec.scala"))""" - // work around https://github.com/scalatest/scalatest/issues/1851 - "genGenTests/compile" - ] - // too many tests rely on Symbol#toString being 'foo - // reenable after 2.13.3 comes out and upstream adapts - extra.test-tasks: ["compile"] + extra.projects: ["scalatest", "scalactic", "scalatestFunSuite"] } diff --git a/projs.conf b/projs.conf index abd1ee813..e5ca582a9 100644 --- a/projs.conf +++ b/projs.conf @@ -178,7 +178,6 @@ build += { ${vars.proj.scalastyle} ${vars.proj.scalatags} ${vars.proj.scalatest-3-0} - ${vars.proj.scalatest-tests} ${vars.proj.scalatestplus-junit} ${vars.proj.scalatestplus-mockito} ${vars.proj.scalatestplus-scalacheck}