2.13: advance project SHAs (and reduce usage of sbt 1.5) (#1488)

Author: SethTisue

core/genjavadoc.conf

@@ -2,6 +2,6 @@
 
 vars.proj.genjavadoc: ${vars.base} {
   name: "genjavadoc"
-  uri: "https://github.com/lightbend/genjavadoc.git#a2891668293d7965e3e3f4936f5fde3100e2f57c"
+  uri: "https://github.com/lightbend/genjavadoc.git#f0e093834568ed035bf46601052a40a13e7b981b"
 
 }

core/scalafix.conf

@@ -1,13 +1,9 @@
-// https://github.com/scalacommunitybuild/scalafix.git#community-build-2.13  # was scalacenter, main
-
-// forked (September 2021) to remove tests that don't compile
-// under -Xsource:3
+// https://github.com/scalacenter/scalafix.git#main
 
 vars.proj.scalafix: ${vars.base} {
   name: "scalafix"
-  uri: "https://github.com/scalacenter/scalafix.git#fd4ce4630c9d0bc374db766c6737b3925e622046"
+  uri: "https://github.com/scalacenter/scalafix.git#0686db1433f6e4bb4e370f049d464ee562094b90"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.exclude: [
     // out of scope
     "docs"

core/silencer.conf

@@ -2,6 +2,6 @@
 
 vars.proj.silencer: ${vars.base} {
   name: "silencer"
-  uri: "https://github.com/ghik/silencer.git#5ff0ea0362e97a34203b59de1b3601f391d6fa88"
+  uri: "https://github.com/ghik/silencer.git#6cc8e685b41ce2304583c28936f91a008e301987"
 
 }

core/wartremover.conf

@@ -2,7 +2,7 @@
 
 vars.proj.wartremover: ${vars.base} {
   name: "wartremover"
-  uri: "https://github.com/wartremover/wartremover.git#72e4fe0dff3ff4021dd816d231bb69ba0a99a7f8"
+  uri: "https://github.com/wartremover/wartremover.git#cb76e97d497069833427847e117122e1229d6d96"
 
   extra.exclude: [
     "sbt-plugin"

proj/airframe.conf

@@ -2,9 +2,8 @@
 
 vars.proj.airframe: ${vars.base} {
   name: "airframe"
-  uri: "https://github.com/wvlet/airframe.git#cc5d7428f5fd35dc2ef93ef885467c87ead5c84e"
+  uri: "https://github.com/wvlet/airframe.git#38b544ca97f64598e96de75c9987064b842c46da"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.projects: ["communityBuild"]  // no Scala.js plz
   extra.commands: ${vars.default-commands} [
     // just compile the tests in the ulid subproject, don't run them; see

proj/akka-http-cors.conf

@@ -4,7 +4,7 @@
 
 vars.proj.akka-http-cors: ${vars.base} {
   name: "akka-http-cors"
-  uri: "https://github.com/lomigmegard/akka-http-cors.git#f3ecc84746d36a412401c3e2decca10bdda4d0ed"
+  uri: "https://github.com/lomigmegard/akka-http-cors.git#ed35ac1536f9fd350711c4c265c5b8cb461fa392"
 
   extra.options: ["-Dakka.fail-mixed-versions=false"]
   extra.projects: ["akka-http-cors"]

proj/akka-http-json.conf

@@ -5,7 +5,7 @@
 
 vars.proj.akka-http-json: ${vars.base} {
   name: "akka-http-json"
-  uri: "https://github.com/hseeberger/akka-http-json.git#c42eedae8e28b8335b0a28ca700090f2bb675807"
+  uri: "https://github.com/hseeberger/akka-http-json.git#99da70cfc1a755f97607b184e7a699550374f057"
 
   // we might try to re-enable this when we have newer akka-http; right now
   // the tests don't compile and it looks like an akka-http version problem

proj/akka-http.conf

@@ -2,7 +2,7 @@
 
 vars.proj.akka-http: ${vars.base} {
   name: "akka-http"
-  uri: "https://github.com/akka/akka-http.git#d5f6536c39be843afdc3d3d1a703423e249225eb"
+  uri: "https://github.com/akka/akka-http.git#16890a19a69c4517164e1099f72e6c97e645869d"
 
   extra.exclude: ["docs", "akka-http-bench-jmh"]
   extra.options: [

proj/akka-management.conf

@@ -2,7 +2,7 @@
 
 vars.proj.akka-management: ${vars.base} {
   name: "akka-management"
-  uri: "https://github.com/akka/akka-management.git#5557e2c3de229efca86451187949b8687b9059b6"
+  uri: "https://github.com/akka/akka-management.git#98d90026103a85c4c8c69a425939b809998973bf"
 
   // for now anyway, ambition level is just to include anything lagom needs
   extra.projects: ["akka-management", "cluster-bootstrap", "cluster-http"]

proj/akka-persistence-jdbc.conf

@@ -2,7 +2,7 @@
 
 vars.proj.akka-persistence-jdbc: ${vars.base} {
   name: "akka-persistence-jdbc"
-  uri: "https://github.com/akka/akka-persistence-jdbc.git#bef97bfbe3520c3160caf52176c2529400e1826f"
+  uri: "https://github.com/akka/akka-persistence-jdbc.git#cf9d1d47add4edd8e58047bfaeab8fd53a3fcebc"
 
   // 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

proj/akka.conf

@@ -2,7 +2,7 @@
 
 vars.proj.akka: ${vars.base} {
   name: "akka"
-  uri: "https://github.com/akka/akka.git#eb6f3e3d1927f283c582d8533598201f19a970a8"
+  uri: "https://github.com/akka/akka.git#6581f70c2e9da035de48dc524e76fe47ca288266"
 
   extra.projects: ["akka-scala-nightly"]
   extra.exclude: [

proj/alpakka-kafka.conf

@@ -2,7 +2,7 @@
 
 vars.proj.alpakka-kafka: ${vars.base} {
   name: "alpakka-kafka"
-  uri: "https://github.com/akka/alpakka-kafka.git#c147194b45c724d4853edece58008a5733c0c4a9"
+  uri: "https://github.com/akka/alpakka-kafka.git#c7005ac2f086992c70eac49ffb9fd96cbcadfe07"
 
   extra.exclude: [
     // out of scope

proj/atto.conf

@@ -2,7 +2,7 @@
 
 vars.proj.atto: ${vars.base} {
   name: "atto"
-  uri: "https://github.com/tpolecat/atto.git#872c4c77545a3f41878bb1115b3dc18f3afc2a4a"
+  uri: "https://github.com/tpolecat/atto.git#5f71a86e21b079c8c466b941b1a8fbd94bdf59bf"
 
   extra.exclude: ["*JS", "docs", "atto"]
 }

proj/avro4s.conf

@@ -4,7 +4,7 @@
 
 vars.proj.avro4s: ${vars.base} {
   name: "avro4s"
-  uri: "https://github.com/sksamuel/avro4s.git#5599b9e0427e6c822151e78eec72054709b588c6"
+  uri: "https://github.com/sksamuel/avro4s.git#06e777878e5f7a7a0dc06a30a80d4fabad523693"
 
   extra.exclude: ["benchmarks"]
 }

proj/better-tostring.conf

@@ -1,7 +1,7 @@
-// https://github.com/polyvariant/better-tostring.git#master
+// https://github.com/polyvariant/better-tostring.git#main
 
 vars.proj.better-tostring: ${vars.base} {
   name: "better-tostring"
-  uri: "https://github.com/polyvariant/better-tostring.git#d3eecc72b4263c46e25add6e78abc2167b3964e6"
+  uri: "https://github.com/polyvariant/better-tostring.git#7e0fad582134b7f0f7a06ce2fbac7772cb09884d"
 
 }

proj/bijection.conf

@@ -2,9 +2,8 @@
 
 vars.proj.bijection: ${vars.base} {
   name: "bijection"
-  uri: "https://github.com/twitter/bijection.git#41be34f434b736e8f92377cc35764d7032d3ea91"
+  uri: "https://github.com/twitter/bijection.git#3c156f6062d711784806a157596ee0d3e82fd94f"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   // at the moment let's just do the part scalafix needs. there are a bunch
   // of integration modules, but my hunch is they are likelier to cause
   // version headaches than to surface Scala regressions

proj/blaze.conf

@@ -2,7 +2,7 @@
 
 vars.proj.blaze: ${vars.base} {
   name: "blaze"
-  uri: "https://github.com/http4s/blaze.git#692a3eacad75e9f880800211ebc52b85189d7110"
+  uri: "https://github.com/http4s/blaze.git#a4f21f19572732dd81f2038ac68f9136990acf22"
 
   extra.commands: ${vars.default-commands} [
     "set every gpgWarnOnFailure := true"

proj/case-app.conf

@@ -2,7 +2,7 @@
 
 vars.proj.case-app: ${vars.base} {
   name: "case-app"
-  uri: "https://github.com/alexarchambault/case-app.git#3484a8ad9cff6df8c2cf6c61d0a714423b19a0fb"
+  uri: "https://github.com/alexarchambault/case-app.git#67c64c35da12d87461a8e9b4427a833ae42d61a5"
 
   // this is enough for scalafix, I didn't even try adding the rest
   extra.projects: ["coreJVM"]

proj/cats-effect.conf

@@ -2,7 +2,7 @@
 
 vars.proj.cats-effect: ${vars.base} {
   name: "cats-effect"
-  uri: "https://github.com/typelevel/cats-effect.git#7652ca1c765c395ff824786238ec6361cad1a52c"
+  uri: "https://github.com/typelevel/cats-effect.git#a2f2fb74e4a66fb71036a730bbef616cba968343"
 
   extra.exclude: ["*JS", "benchmarks", "docs"]
   extra.commands: ${vars.default-commands} [

proj/cats-parse.conf

@@ -2,9 +2,8 @@
 
 vars.proj.cats-parse: ${vars.base} {
   name: "cats-parse"
-  uri: "https://github.com/typelevel/cats-parse.git#bdc11c8936e214d2089f8c673a295fd0e63f923e"
+  uri: "https://github.com/typelevel/cats-parse.git#1623b12a0e9d87865b878c50e78c67d14ebbe5c5"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.exclude: ["bench", "docs", "*JS"]
   extra.commands: ${vars.default-commands} [
     "set every gpgWarnOnFailure := true"

proj/cats-testkit-scalatest.conf

@@ -2,7 +2,7 @@
 
 vars.proj.cats-testkit-scalatest: ${vars.base} {
   name: "cats-testkit-scalatest"
-  uri: "https://github.com/typelevel/cats-testkit-scalatest.git#bd436cee8aee290ac4ea7de30b0456d1001397be"
+  uri: "https://github.com/typelevel/cats-testkit-scalatest.git#a115ae300c7127a8685762203281157fb39a375d"
 
   extra.exclude: ["*JS", "docs"]
 }

proj/cats-time.conf

@@ -2,7 +2,7 @@
 
 vars.proj.cats-time: ${vars.base} {
   name: "cats-time"
-  uri: "https://github.com/ChristopherDavenport/cats-time.git#f9380bf28ed58069b03143ece3398045d2cb600b"
+  uri: "https://github.com/ChristopherDavenport/cats-time.git#65ddb72bfcb31f8c6e6835ebec8dd0b4fe731e76"
 
   extra.exclude: ["*JS", "docs"]
 }

proj/cats.conf

@@ -2,7 +2,7 @@
 
 vars.proj.cats: ${vars.base} {
   name: "cats"
-  uri: "https://github.com/typelevel/cats.git#84ce2570aafd901912fe539f1d0c4697a83b3551"
+  uri: "https://github.com/typelevel/cats.git#b19167169c46fa9182a89f20829bb60df4392afd"
 
   extra.exclude: ["bench", "docs", "*JS", "*Native", "js", "binCompatTest", "native", "cats"]
   // tests are memory-hungry. hard to tell if occasional OutOfMemoryErrors are because

proj/circe-config.conf

@@ -2,7 +2,7 @@
 
 vars.proj.circe-config: ${vars.base} {
   name: "circe-config"
-  uri: "https://github.com/circe/circe-config.git#14ba29490ff5bc99a658ebebc15e5cee20be33b1"
+  uri: "https://github.com/circe/circe-config.git#d3fab94edbc6045fed88445c8343c0912e9e5f55"
 
   extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
 }

proj/circe-generic-extras.conf

@@ -2,7 +2,7 @@
 
 vars.proj.circe-generic-extras: ${vars.base} {
   name: "circe-generic-extras"
-  uri: "https://github.com/circe/circe-generic-extras.git#70bdcee5f08fce3ebb049ad34ab145335ffe4ba8"
+  uri: "https://github.com/circe/circe-generic-extras.git#aa4974aebd6525d7d6c45e50f501dd227e7bc16f"
 
   extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.projects: ["genericExtras"]

proj/circe-jackson.conf

@@ -2,7 +2,7 @@
 
 vars.proj.circe-jackson: ${vars.base} {
   name: "circe-jackson"
-  uri: "https://github.com/circe/circe-jackson.git#acf2f36530059753104f5f24fec88cd1660cda0a"
+  uri: "https://github.com/circe/circe-jackson.git#2b5fe4c3d6ec50b4391507333c93962fc5972ca5"
 
   extra.sbt-version: "1.5.2"  // until they're on new enough sbt-scoverage
   // there are some others, but leaving it at this for now

proj/circe.conf

@@ -2,8 +2,7 @@
 
 vars.proj.circe: ${vars.base} {
   name: "circe"
-  uri: "https://github.com/circe/circe.git#be246e589eedc9dd16f395e3a754b68916c187ad"
+  uri: "https://github.com/circe/circe.git#3371143782c45d5466c549bbef1134e9aedb2eaa"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.exclude: ["*JS", "benchmark*", "scalajs*", "docs"]
 }

proj/ciris.conf

@@ -2,7 +2,7 @@
 
 vars.proj.ciris: ${vars.base} {
   name: "ciris"
-  uri: "https://github.com/vlovgr/ciris.git#c08069d62711fa56299e96705d915cefee335907"
+  uri: "https://github.com/vlovgr/ciris.git#f58486cf789b25d6e22407dab89af41feb9bddba"
 
   extra.exclude: ["docs"]
 }

proj/coulomb.conf

@@ -5,7 +5,7 @@
 
 vars.proj.coulomb: ${vars.base} {
   name: "coulomb"
-  uri: "https://github.com/erikerlandson/coulomb.git#9e66c0693ef356f154b3ff9701bacc1b6a05cf61"
+  uri: "https://github.com/erikerlandson/coulomb.git#945b5ea17448de44ed4f46d4b2cb4b2f403de32d"
 
   extra.projects: ["coulomb_testsJVM"] // builds & tests everything.... I think
   extra.commands: ${vars.default-commands} [

proj/decline.conf

@@ -2,7 +2,7 @@
 
 vars.proj.decline: ${vars.base} {
   name: "decline"
-  uri: "https://github.com/bkirwi/decline.git#79c6aa56bd121f01bf0dfd2c92832f719d07c73e"
+  uri: "https://github.com/bkirwi/decline.git#ae82ddcce25d2d21ff47fcaca33914288053f0cc"
 
   extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.projects: ["declineJVM", "refinedJVM"]  // no Scala.js, no doc

proj/discipline-specs2.conf

@@ -2,7 +2,10 @@
 
 vars.proj.discipline-specs2: ${vars.base} {
   name: "discipline-specs2"
-  uri: "https://github.com/typelevel/discipline-specs2.git#30aaca9f4e2a1b8910ce553e41082a3868733652"
+  uri: "https://github.com/typelevel/discipline-specs2.git#4643ee823db0bacf8cb4e0ae3575a4f6da65fb37"
 
   extra.exclude: ["*JS", "docs"]
+  extra.commands: ${vars.default-commands} [
+    "set every gpgWarnOnFailure := true"
+  ]
 }

proj/doobie.conf

@@ -1,4 +1,8 @@
-// https://github.com/tpolecat/doobie.git#master
+// https://github.com/tpolecat/doobie.git#1aa1225ee5868b2a5f9fa03557d64c31e5bcd2d8"  # was main
+
+// frozen (September 2021) because a more recent commit had weird backsliding
+// (older sbt version, presence of sbt-dotty) -- I didn't look into, let's check
+// again in a month or two?
 
 vars.proj.doobie: ${vars.base} {
   name: "doobie"

proj/droste.conf

@@ -2,7 +2,7 @@
 
 vars.proj.droste: ${vars.base} {
   name: "droste"
-  uri: "https://github.com/higherkindness/droste.git#1867d85cc51a41166ecc676d99ee79991cd9855a"
+  uri: "https://github.com/higherkindness/droste.git#1ae54f1b9ea98344f99ba43e159d9d2518a43dc2"
 
   extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   extra.exclude: [

proj/eff.conf

@@ -2,7 +2,7 @@
 
 vars.proj.eff: ${vars.base} {
   name: "eff"
-  uri: "https://github.com/atnos-org/eff.git#8013c00f13e38d51a186e457df545baf0c5e52d4"
+  uri: "https://github.com/atnos-org/eff.git#c0cd6140fa174ac75b29866147e29b937751f31c"
 
   extra.exclude: ["scalazJVM", "*JS", "*Native"]
 }

proj/expecty.conf

@@ -2,7 +2,7 @@
 
 vars.proj.expecty: ${vars.base} {
   name: "expecty"
-  uri: "https://github.com/eed3si9n/expecty.git#a280f8a814cd46927ff4b792b63e4653538d4cf0"
+  uri: "https://github.com/eed3si9n/expecty.git#0af90390eb8d5b7dae31682c0b14efe019b689bc"
 
   extra.projects: ["expecty"]  // this is the 2.13 one
   extra.settings: ${vars.base.extra.settings} [

proj/expression-evaluator.conf

@@ -2,7 +2,6 @@
 
 vars.proj.expression-evaluator: ${vars.base} {
   name: "expression-evaluator"
-  uri: "https://github.com/plokhotnyuk/expression-evaluator.git#05cd891bb9f4e82e5b2c918bbbf1c2934bc479eb"
+  uri: "https://github.com/plokhotnyuk/expression-evaluator.git#8a78a1da1cae9693f68dbf8db7ba460d829fd245"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
 }

proj/fast-string-interpolator.conf

@@ -2,9 +2,8 @@
 
 vars.proj.fast-string-interpolator: ${vars.base} {
   name: "fast-string-interpolator"
-  uri: "https://github.com/plokhotnyuk/fast-string-interpolator.git#033abfe95d46917049e435c55ec2fca93e487189"
+  uri: "https://github.com/plokhotnyuk/fast-string-interpolator.git#99b6c9e5971233c04554111764c933893f3dae3c"
 
-  extra.sbt-version: ${vars.sbt-1-5-version}  // https://github.com/scoverage/sbt-scoverage/issues/372
   // Missing dependency: com.dongxiguo#fastring. likely out of scope anyway
   extra.exclude: ["fsi-benchmark", "fsi-benchmark-core"]
 }

proj/fs2.conf

@@ -4,7 +4,7 @@
 
 vars.proj.fs2: ${vars.base} {
   name: "fs2"
-  uri: "https://github.com/typelevel/fs2.git#1a7ce3efeb0783f146527503e6cf672ad286c31a"
+  uri: "https://github.com/typelevel/fs2.git#fdcf03a76fe42a4aa03f34dfb2bc836107d2d84e"
 
   // no Scala.js, no benchmarks or docs
   extra.projects: ["coreJVM", "reactiveStreams", "io"]

proj/giter8.conf

@@ -2,7 +2,7 @@
 
 vars.proj.giter8: ${vars.base} {
   name: "giter8"
-  uri: "https://github.com/foundweekends/giter8.git#095e960ad6dfa5540bc4e603d03de5c4dbafe71b"
+  uri: "https://github.com/foundweekends/giter8.git#53e50f7aa81eb398e907ee902530cfe88844c1d0"
 
   extra.exclude: [
     // these are sbt plugins

proj/github4s.conf

@@ -2,7 +2,7 @@
 
 vars.proj.github4s: ${vars.base} {
   name: "github4s"
-  uri: "https://github.com/47deg/github4s.git#25028113c16513236e0b36999e38b8d811cb67ea"
+  uri: "https://github.com/47deg/github4s.git#4a3ab980ce0dda1b0c324c750e46b6e8f75e6d18"
 
   extra.sbt-version: "1.5.2"  // until they're on new enough sbt-scoverage
   extra.projects: ["github4s"]

proj/http4s.conf

@@ -2,7 +2,7 @@
 
 vars.proj.http4s: ${vars.base} {
   name: "http4s"
-  uri: "https://github.com/http4s/http4s.git#d49ffeab6fe93de611e2339378e51a7405cc534c"
+  uri: "https://github.com/http4s/http4s.git#4e52500e9b14629333f8335ce6e1f0a7146858c0"
 
   extra.commands: ${vars.default-commands} [
     "set every gpgWarnOnFailure := true"

proj/ip4s.conf

@@ -2,7 +2,7 @@
 
 vars.proj.ip4s: ${vars.base} {
   name: "ip4s"
-  uri: "https://github.com/Comcast/ip4s.git#3ec7bb658a947c22147e6015f64f5acb7eda25b0"
+  uri: "https://github.com/Comcast/ip4s.git#5a1975e26fb86ec281c8ca0d993652c178ce6ead"
 
   extra.exclude: ["*JS"]
   extra.settings: ${vars.base.extra.settings} [