diff --git a/dependencies.txt b/dependencies.txt index 54677bf99..84f645654 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -226,10 +226,10 @@ metrics-scala: akka, cats, cloc-plugin, discipline, discipline-munit, discipline 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 scodec-stream: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, fs2, geny, kind-projector, munit, munit-cats-effect, portable-scala-reflect, scala, scala-collection-compat, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, utest, wartremover atto: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, fs2, geny, kind-projector, munit, munit-cats-effect, portable-scala-reflect, refined, scala, scala-collection-compat, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, utest, wartremover +weaver-test: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, expecty, fastparse, fastparse-scalameta, fs2, geny, kind-projector, munit, munit-cats-effect, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, silencer, simulacrum-scalafix, sourcecode, utest, wartremover reactive-mongo-bson: algebra, cats, cloc-plugin, discipline, discipline-munit, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, geny, kind-projector, munit, portable-scala-reflect, reactive-mongo-shaded, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scapegoat, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spire, utest 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 droste: algebra, atto, better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, fs2, geny, kind-projector, munit, munit-cats-effect, portable-scala-reflect, refined, scala, scala-collection-compat, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, utest, wartremover -weaver-test: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, expecty, fastparse, fastparse-scalameta, fs2, geny, kind-projector, munit, munit-cats-effect, portable-scala-reflect, scala, scala-collection-compat, scala-java-time, scala-js-stubs, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, silencer, simulacrum-scalafix, sourcecode, utest, wartremover circe: cats, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, munit, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, utest zinc: claimant, cloc-plugin, jawn, json4s, kind-projector, play-json, portable-scala-reflect, sbinary, sbt-collections, sbt-core-macros, sbt-io, sbt-util-cache, sbt-util-control, sbt-util-logging, sbt-util-position, sbt-util-relation, sbt-util-tracking, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalatest, scalatest-3-0, shaded-jawn-parser, shaded-scalajson, shapeless, silencer, sjson-new, specs2, spray-json, verify circe-generic-extras: cats, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, munit, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, utest @@ -237,10 +237,10 @@ circe-jackson: cats, circe, claimant, cloc-plugin, discipline, discipline-munit, kafka: cats, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, jackson-module-scala, kind-projector, mockito-scala, munit, portable-scala-reflect, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-logging, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, specs2, utest enumeratum: cats, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fansi, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, munit, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, utest upickle-more: acyclic, argonaut, cats, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, munit, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, upickle, utest +weaver-test-monix: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, expecty, fastparse, fastparse-scalameta, fs2, geny, implicitbox, kind-projector, minitest, monix, monix-bio, munit, munit-cats-effect, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, silencer, simulacrum-scalafix, sourcecode, utest, wartremover, weaver-test weaver-test-more: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, expecty, fastparse, fastparse-scalameta, fs2, geny, kind-projector, munit, munit-cats-effect, portable-scala-reflect, scala, scala-collection-compat, scala-java-time, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, silencer, simulacrum-scalafix, sourcecode, specs2, utest, wartremover, weaver-test circe-config: better-monadic-for, cats, cats-effect, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, munit, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, utest, wartremover reactive-mongo: akka, algebra, cats, cloc-plugin, discipline, discipline-munit, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, geny, kind-projector, munit, portable-scala-reflect, reactive-mongo-bson, reactive-mongo-shaded, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-junit, scalatestplus-scalacheck, scapegoat, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spire, utest -weaver-test-monix: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, expecty, fastparse, fastparse-scalameta, fs2, geny, implicitbox, kind-projector, minitest, monix, monix-bio, munit, munit-cats-effect, portable-scala-reflect, scala, scala-collection-compat, scala-java-time, scala-js-stubs, scala-parallel-collections, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, silencer, simulacrum-scalafix, sourcecode, utest, wartremover, weaver-test jawn-fs2: better-monadic-for, cats, cats-effect, claimant, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, fs2, geny, jawn, json4s, kind-projector, munit, munit-cats-effect, play-json, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, utest, wartremover metaconfig: acyclic, argonaut, cats, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fansi, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, munit, paiges, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, scodec-bits, sconfig, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, upickle, upickle-more, utest 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, 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 diff --git a/proj/airframe.conf b/proj/airframe.conf index 822f33cde..5ec70ef4c 100644 --- a/proj/airframe.conf +++ b/proj/airframe.conf @@ -1,10 +1,13 @@ -// https://github.com/wvlet/airframe.git#master +// https://github.com/wvlet/airframe.git#bd13085beb3e8b117d4035f4ba2612bba27315e0 # was master -// at next advance, we'll have to do something about -// https://github.com/wvlet/airframe/pull/1380 , -// which is leading to: +// frozen (December 2020) before +// https://github.com/wvlet/airframe/pull/1380 +// which led to: // sbt.librarymanagement.ResolveException: Error downloading org.wvlet.airframe:airspec_2.11.12-bin-2e2f65a:20.12.1 +// I should probably do something about it for 2.13 +// (on 2.11 and 2.12 I'm fine with just leaving it frozen) + vars.proj.airframe: ${vars.base} { name: "airframe" uri: "https://github.com/wvlet/airframe.git#bd13085beb3e8b117d4035f4ba2612bba27315e0" diff --git a/proj/akka-http-cors.conf b/proj/akka-http-cors.conf index c80a5e23c..9693dba86 100644 --- a/proj/akka-http-cors.conf +++ b/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#653ea90a399a30d4bd855151c4d2c93b329bb053" + uri: "https://github.com/lomigmegard/akka-http-cors.git#1395bab309397c89962e625b58d2444f1fbb8776" extra.options: ["-Dakka.fail-mixed-versions=false"] extra.projects: ["akka-http-cors"] diff --git a/proj/akka-http-json.conf b/proj/akka-http-json.conf index bf2a35404..28c293e6e 100644 --- a/proj/akka-http-json.conf +++ b/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#fc968ac7976a2156a4be1631424a42037b3fccb3" + uri: "https://github.com/hseeberger/akka-http-json.git#34d7fb31273d9d55b89a53cd6d85941ace180d02" // 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 diff --git a/proj/bijection.conf b/proj/bijection.conf index 3cc17a18f..b537f84dd 100644 --- a/proj/bijection.conf +++ b/proj/bijection.conf @@ -2,7 +2,7 @@ vars.proj.bijection: ${vars.base} { name: "bijection" - uri: "https://github.com/twitter/bijection.git#bc540043cba86b505f4d6da8949f5faf8e8ec740" + uri: "https://github.com/twitter/bijection.git#ee83f75c9f42480444ef429eabe7de895c3f8dfd" // 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 diff --git a/proj/cats-effect.conf b/proj/cats-effect.conf index 0703486c8..9fc3044b4 100644 --- a/proj/cats-effect.conf +++ b/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#e6daea1dd09f79339673387d5861a57e89c4f641" + uri: "https://github.com/typelevel/cats-effect.git#0cae15c8d9c55bc13b8967343a0417f8a8755e6d" extra.projects: ["coreJVM", "lawsJVM"] // no Scala.js plz extra.commands: ${vars.default-commands} [ diff --git a/proj/cats-mtl.conf b/proj/cats-mtl.conf index e3533a9ed..5b4bdce9a 100644 --- a/proj/cats-mtl.conf +++ b/proj/cats-mtl.conf @@ -4,7 +4,7 @@ vars.proj.cats-mtl: ${vars.base} { name: "cats-mtl" - uri: "https://github.com/typelevel/cats-mtl.git#89afa9a4c08c957b1cf9587e81e1ca98103d0a0e" + uri: "https://github.com/typelevel/cats-mtl.git#20d85ea2e4374c5e264a831aa67c71f635b8ad5b" extra.exclude: ["*JS"] extra.commands: ${vars.default-commands} [ diff --git a/proj/cats-parse.conf b/proj/cats-parse.conf index 0ace802d3..cab625568 100644 --- a/proj/cats-parse.conf +++ b/proj/cats-parse.conf @@ -2,7 +2,7 @@ vars.proj.cats-parse: ${vars.base} { name: "cats-parse" - uri: "https://github.com/typelevel/cats-parse.git#e0d122695e434ca7c5f76f86d1aecf21f659fd68" + uri: "https://github.com/typelevel/cats-parse.git#aaac77cbe780562cf663317482730140ea9bc14e" extra.exclude: ["bench", "docs", "*JS"] extra.commands: ${vars.default-commands} [ diff --git a/proj/cats-retry.conf b/proj/cats-retry.conf index 3bee1b8b1..721ae3090 100644 --- a/proj/cats-retry.conf +++ b/proj/cats-retry.conf @@ -4,7 +4,7 @@ vars.proj.cats-retry: ${vars.base} { name: "cats-retry" - uri: "https://github.com/cb372/cats-retry.git#229e4ac9812749c9c015fa11e6028890bb4c2af4" + uri: "https://github.com/cb372/cats-retry.git#03c82180918c1d094078ecae131c59898f43010f" extra.projects: ["coreJVM"] // ScalaCheck 1.15 not 1.14 diff --git a/proj/circe-config.conf b/proj/circe-config.conf index 0ee3b640c..5ae37a897 100644 --- a/proj/circe-config.conf +++ b/proj/circe-config.conf @@ -4,7 +4,7 @@ vars.proj.circe-config: ${vars.base} { name: "circe-config" - uri: "https://github.com/circe/circe-config.git#6d4e8a74a7c0e7841c0854baade04c1524d40c85" + uri: "https://github.com/circe/circe-config.git#4009a2b595bee8382560ade1c05a1651b1c98ee0" extra.commands: ${vars.default-commands} [ """set every doctestScalaTestVersion := Some("3.2.1")""" diff --git a/proj/circe-generic-extras.conf b/proj/circe-generic-extras.conf index b9209d30c..30a1f15dc 100644 --- a/proj/circe-generic-extras.conf +++ b/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#b043dec78c745308e18f207cd4f87d19aa72c013" + uri: "https://github.com/circe/circe-generic-extras.git#465966ee13c107042937c6cd8f393ab75126f828" extra.projects: ["genericExtras"] // scalatestplus artifact name change diff --git a/proj/circe-jackson.conf b/proj/circe-jackson.conf index c70b43e23..83d31b7fa 100644 --- a/proj/circe-jackson.conf +++ b/proj/circe-jackson.conf @@ -4,7 +4,7 @@ vars.proj.circe-jackson: ${vars.base} { name: "circe-jackson" - uri: "https://github.com/circe/circe-jackson.git#bc569d9c83d1c0298c76aa853825c4c2d0476282" + uri: "https://github.com/circe/circe-jackson.git#62f6ecf4cc80a2925e038da80ea4ff9b9e7a87fe" // there are some others, but for now, just trying to get github4s green again extra.projects: ["jackson28"] diff --git a/proj/circe.conf b/proj/circe.conf index 6deaaa202..d5be465eb 100644 --- a/proj/circe.conf +++ b/proj/circe.conf @@ -2,7 +2,7 @@ vars.proj.circe: ${vars.base} { name: "circe" - uri: "https://github.com/circe/circe.git#baf113f49d79310c6cda789c54c31291a1189aee" + uri: "https://github.com/circe/circe.git#bd9a11b9465ef0e890ea7fa9b566ac0120f4a2eb" extra.projects: [ // easy diff --git a/proj/claimant.conf b/proj/claimant.conf index dd8b0d082..58ee65052 100644 --- a/proj/claimant.conf +++ b/proj/claimant.conf @@ -2,7 +2,7 @@ vars.proj.claimant: ${vars.base} { name: "claimant" - uri: "https://github.com/typelevel/claimant.git#a5458f7a0498f78c0b4d53de8cbe4c4bdf22567d" + uri: "https://github.com/typelevel/claimant.git#55d9633dd8759c9080004d67bc6bfa8e6cee1aa7" extra.exclude: ["root", "*JS"] } diff --git a/proj/coulomb.conf b/proj/coulomb.conf index 8183d635f..d1448f5df 100644 --- a/proj/coulomb.conf +++ b/proj/coulomb.conf @@ -5,7 +5,7 @@ vars.proj.coulomb: ${vars.base} { name: "coulomb" - uri: "https://github.com/erikerlandson/coulomb.git#3602f5233176eb96a0fb031f018327aaf961be4e" + uri: "https://github.com/erikerlandson/coulomb.git#b52a313201ddaa4940537886b54423e78db4d16a" extra.projects: ["coulomb_testsJVM"] // builds & tests everything.... I think extra.commands: ${vars.default-commands} [ diff --git a/proj/discipline-munit.conf b/proj/discipline-munit.conf index 2da0f5d15..d9731a8f6 100644 --- a/proj/discipline-munit.conf +++ b/proj/discipline-munit.conf @@ -2,7 +2,7 @@ vars.proj.discipline-munit: ${vars.base} { name: "discipline-munit" - uri: "https://github.com/typelevel/discipline-munit.git#6b91a8aefac4f94e6bdfcd5c7fea5c4923ecb368" + uri: "https://github.com/typelevel/discipline-munit.git#271e1ab097ab96d636ba41b49f9065f5f48ce956" extra.exclude: ["*JS"] } diff --git a/proj/discipline-scalatest.conf b/proj/discipline-scalatest.conf index 142159a65..fc7c64bfd 100644 --- a/proj/discipline-scalatest.conf +++ b/proj/discipline-scalatest.conf @@ -2,7 +2,7 @@ vars.proj.discipline-scalatest: ${vars.base} { name: "discipline-scalatest" - uri: "https://github.com/typelevel/discipline-scalatest.git#dfec936c6fb225aad79be0d5e0029913bea3d680" + uri: "https://github.com/typelevel/discipline-scalatest.git#05f32dfe0bf6bdec24dbe5abbbcbd13f5416aa31" extra.exclude: ["*JS", "docs"] extra.commands: ${vars.default-commands} [ diff --git a/proj/discipline-specs2.conf b/proj/discipline-specs2.conf index d5b6dd9da..713be614e 100644 --- a/proj/discipline-specs2.conf +++ b/proj/discipline-specs2.conf @@ -2,7 +2,7 @@ vars.proj.discipline-specs2: ${vars.base} { name: "discipline-specs2" - uri: "https://github.com/typelevel/discipline-specs2.git#db87e77eff0ea6d6a1ba21acde2d5fe298dea439" + uri: "https://github.com/typelevel/discipline-specs2.git#b296ac3ed2355d315c30ea96254a8b4048b73ceb" extra.exclude: ["*JS", "docs"] } diff --git a/proj/discipline.conf b/proj/discipline.conf index 19cd9fbd5..3a3ffc1a4 100644 --- a/proj/discipline.conf +++ b/proj/discipline.conf @@ -2,7 +2,7 @@ vars.proj.discipline: ${vars.base} { name: "discipline" - uri: "https://github.com/typelevel/discipline.git#25cee291bdf774ebe53ca4545ed5e122894855c0" + uri: "https://github.com/typelevel/discipline.git#70f44164ea664d3fde95db54a4d80b9eb3709292" extra.projects: ["coreJVM"] // no Scala.js please extra.commands: ${vars.default-commands} [ diff --git a/proj/fs2-chat.conf b/proj/fs2-chat.conf index 1974e931d..79e61cd15 100644 --- a/proj/fs2-chat.conf +++ b/proj/fs2-chat.conf @@ -1,4 +1,7 @@ -// https://github.com/typelevel/fs2-chat.git#master +// https://github.com/typelevel/fs2-chat.git#cb8470c1baf62c2fdb4b81be010a3b965d1c8c3c + +// frozen (December 2020) at the last commit (July 2020) before an upgrade +// to fs2 3.x vars.proj.fs2-chat: ${vars.base} { name: "fs2-chat" diff --git a/proj/genjavadoc.conf b/proj/genjavadoc.conf index ad6ffd817..5e853a2ee 100644 --- a/proj/genjavadoc.conf +++ b/proj/genjavadoc.conf @@ -2,6 +2,6 @@ vars.proj.genjavadoc: ${vars.base} { name: "genjavadoc" - uri: "https://github.com/lightbend/genjavadoc.git#c09f215337645ad31bb99248aee4240f77614004" + uri: "https://github.com/lightbend/genjavadoc.git#8ad1e8841643014c9a3c71a116cf669f37dd3f10" } diff --git a/proj/giter8.conf b/proj/giter8.conf index 513e96ac1..84790d270 100644 --- a/proj/giter8.conf +++ b/proj/giter8.conf @@ -2,7 +2,7 @@ vars.proj.giter8: ${vars.base} { name: "giter8" - uri: "https://github.com/foundweekends/giter8.git#50dbe9ca2640b54fc75d6547a042341b3639bd35" + uri: "https://github.com/foundweekends/giter8.git#68e439664255fa6a89cb72d05805b405b7350074" extra.exclude: [ // these are sbt plugins diff --git a/proj/http4s-jwt-auth.conf b/proj/http4s-jwt-auth.conf index 79339c3d8..0d32a5b80 100644 --- a/proj/http4s-jwt-auth.conf +++ b/proj/http4s-jwt-auth.conf @@ -4,7 +4,7 @@ vars.proj.http4s-jwt-auth: ${vars.base} { name: "http4s-jwt-auth" - uri: "https://github.com/profunktor/http4s-jwt-auth.git#1e16d0f57d478be4673bc5a4c589a7c716549d0a" + uri: "https://github.com/profunktor/http4s-jwt-auth.git#16f536c6822963a56135be3f08b3bb0199926a39" extra.projects: ["core"] extra.commands: ${vars.default-commands} [ diff --git a/proj/jsoniter-scala.conf b/proj/jsoniter-scala.conf index 690676f88..9268fffe0 100644 --- a/proj/jsoniter-scala.conf +++ b/proj/jsoniter-scala.conf @@ -2,7 +2,7 @@ vars.proj.jsoniter-scala: ${vars.base} { name: "jsoniter-scala" - uri: "https://github.com/plokhotnyuk/jsoniter-scala.git#2929695d616c6d4e47a9b6c1bf830fdcbc76db14" + uri: "https://github.com/plokhotnyuk/jsoniter-scala.git#54893e36d84b9610644fdb97538a793c722d2802" extra.exclude: ["*JS", "*benchmark*"] } diff --git a/proj/lift-json.conf b/proj/lift-json.conf index 67d135d27..e42d08c67 100644 --- a/proj/lift-json.conf +++ b/proj/lift-json.conf @@ -2,7 +2,7 @@ vars.proj.lift-json: ${vars.base} { name: "lift-json" - uri: "https://github.com/lift/framework.git#7136a14f65c65f9f03a3b930fbffa61d59b49891" + uri: "https://github.com/lift/framework.git#df68a1a012f51cc769e51cf0c7dde5cddbba092e" extra.projects: ["lift-json"] // because the tests use scala.util.parsing.json, which was removed from diff --git a/proj/lightbend-emoji.conf b/proj/lightbend-emoji.conf index 2ce63141d..fd31231ef 100644 --- a/proj/lightbend-emoji.conf +++ b/proj/lightbend-emoji.conf @@ -2,7 +2,7 @@ vars.proj.lightbend-emoji: ${vars.base} { name: "lightbend-emoji" - uri: "https://github.com/lightbend/lightbend-emoji.git#5f145499e91cb672b0c63c3fc146c2830e4c9a15" + uri: "https://github.com/lightbend/lightbend-emoji.git#fb828f8996ffb2182acccd8f260eeee4db214da1" extra.options: ["-Dsbt.sbtbintray=false"] } diff --git a/proj/lila-ws.conf b/proj/lila-ws.conf index d1b62456b..443938fdd 100644 --- a/proj/lila-ws.conf +++ b/proj/lila-ws.conf @@ -2,6 +2,6 @@ vars.proj.lila-ws: ${vars.base} { name: "lila-ws" - uri: "https://github.com/ornicar/lila-ws.git#9d3a6ab6c42b9810e496948e577286fa66adec26" + uri: "https://github.com/ornicar/lila-ws.git#404e41ea27f820f76c5534dd55a75a5877b626e5" } diff --git a/proj/log4cats.conf b/proj/log4cats.conf index 13bbd499e..73ccf3704 100644 --- a/proj/log4cats.conf +++ b/proj/log4cats.conf @@ -4,7 +4,7 @@ vars.proj.log4cats: ${vars.base} { name: "log4cats" - uri: "https://github.com/ChristopherDavenport/log4cats.git#cfd8781208732c97acd2d35201b51e1396a4254b" + uri: "https://github.com/ChristopherDavenport/log4cats.git#bf3558989f118c626dfd2c72ad8e6c7129199585" // for now, only adding the modules http4s needs extra.projects: ["coreJVM", "testingJVM", "slf4j"] diff --git a/proj/log4s.conf b/proj/log4s.conf index 1cd3738ca..bea533598 100644 --- a/proj/log4s.conf +++ b/proj/log4s.conf @@ -2,7 +2,7 @@ vars.proj.log4s: ${vars.base} { name: "log4s" - uri: "https://github.com/Log4s/log4s.git#18c9c20bf5dd6af6d1807cccaf287bb8b2ae6282" + uri: "https://github.com/Log4s/log4s.git#d723dc7aa8acb86f00df11466631ff116d9a6a12" extra.exclude: ["*JS", "testingJS"] } diff --git a/proj/mdoc.conf b/proj/mdoc.conf index 7ca908440..ce4b70a3d 100644 --- a/proj/mdoc.conf +++ b/proj/mdoc.conf @@ -2,7 +2,7 @@ vars.proj.mdoc: ${vars.base} { name: "mdoc" - uri: "https://github.com/scalameta/mdoc.git#b95d7be6185199257e67616eea0efc7ff5364cb0" + uri: "https://github.com/scalameta/mdoc.git#c0e6315ed07baba2d4d660eb7273c8f280f7c01f" extra.exclude: [ "js", "jsdocs", "docs", "unit", "plugin" diff --git a/proj/mockito-scala.conf b/proj/mockito-scala.conf index c5bf30441..eb2b9cf5f 100644 --- a/proj/mockito-scala.conf +++ b/proj/mockito-scala.conf @@ -4,7 +4,7 @@ vars.proj.mockito-scala: ${vars.base} { name: "mockito-scala" - uri: "https://github.com/mockito/mockito-scala.git#ac99c7c4d284668cf7c006c3c2e0f3a1845e2908" + uri: "https://github.com/mockito/mockito-scala.git#6966c6f200b9872373d8884a537472f194ee1ca2" extra.exclude: ["scalaz"] } diff --git a/proj/moduload.conf b/proj/moduload.conf index 5a6ada010..a8f1a64a9 100644 --- a/proj/moduload.conf +++ b/proj/moduload.conf @@ -2,6 +2,6 @@ vars.proj.moduload: ${vars.base} { name: "moduload" - uri: "https://github.com/outr/moduload.git#409a968eff560a8aa40c7130683e06367ab2b0be" + uri: "https://github.com/outr/moduload.git#8fb04381d8bb50c88635a3e708408f903f06f6e4" } diff --git a/proj/monocle.conf b/proj/monocle.conf index 8fa9cfd8f..a77f565bd 100644 --- a/proj/monocle.conf +++ b/proj/monocle.conf @@ -2,7 +2,7 @@ vars.proj.monocle: ${vars.base} { name: "monocle" - uri: "https://github.com/julien-truffaut/Monocle.git#063604930dd1915f93385cfa4146c7a433b1a3b5" + uri: "https://github.com/julien-truffaut/Monocle.git#6339fe4249d4cb602dcf0d66f7d95b2d3565c185" // try to enable more subprojects? extra.projects: ["coreJVM", "macrosJVM", "lawJVM", "genericJVM"] diff --git a/proj/mouse.conf b/proj/mouse.conf index cc1f6e8b9..08fb11d94 100644 --- a/proj/mouse.conf +++ b/proj/mouse.conf @@ -2,7 +2,7 @@ vars.proj.mouse: ${vars.base} { name: "mouse" - uri: "https://github.com/typelevel/mouse.git#70d6b6abd200685fdb9ff07cb6dac91ccac845d5" + uri: "https://github.com/typelevel/mouse.git#db9b3d120b209a643017d341358c686ffaadcbe0" extra.projects: ["crossJVM"] // no Scala.js please } diff --git a/proj/munit.conf b/proj/munit.conf index 42991c9d8..001862e40 100644 --- a/proj/munit.conf +++ b/proj/munit.conf @@ -2,7 +2,7 @@ vars.proj.munit: ${vars.base} { name: "munit" - uri: "https://github.com/scalameta/munit.git#c44d728beaac6867742004c0847ba6a1ff905a67" + uri: "https://github.com/scalameta/munit.git#d893869d48ea3fa03811a94312b34d3927c3d8a9" // https://github.com/sbt/sbt/issues/5934 extra.sbt-version: ${vars.sbt-1-3-version} diff --git a/proj/natchez.conf b/proj/natchez.conf index f1b212da2..499e6810c 100644 --- a/proj/natchez.conf +++ b/proj/natchez.conf @@ -4,7 +4,7 @@ vars.proj.natchez: ${vars.base} { name: "natchez" - uri: "https://github.com/tpolecat/natchez.git#072eee7ace84c72abd4722194d4ad8bf237111ae" + uri: "https://github.com/tpolecat/natchez.git#013431156948395c5354ac1f9fe715c92506cf6f" // let's try and squeak by with just the minimum, since our present goal is // just to get pfps-shopping-cart green diff --git a/proj/nscala-time.conf b/proj/nscala-time.conf index bc4297474..e1a6c5461 100644 --- a/proj/nscala-time.conf +++ b/proj/nscala-time.conf @@ -4,6 +4,6 @@ vars.proj.nscala-time: ${vars.base} { name: "nscala-time" - uri: "https://github.com/nscala-time/nscala-time.git#a406f4a5604ca03d6ed978e7fb34a777d46ce338" + uri: "https://github.com/nscala-time/nscala-time.git#19b897fdf8feb688e6622b6ddc86a6df55d91586" } diff --git a/proj/paiges.conf b/proj/paiges.conf index d6bbb1ef1..065b31e40 100644 --- a/proj/paiges.conf +++ b/proj/paiges.conf @@ -2,7 +2,7 @@ vars.proj.paiges: ${vars.base} { name: "paiges" - uri: "https://github.com/typelevel/paiges.git#2bc82ec2b2ccfe1c56e64b4d5db7c03c1b315992" + uri: "https://github.com/typelevel/paiges.git#9f151fba27d37dc5543dee46b6c3c015c78077d4" extra.projects: ["coreJVM", "catsJVM"] // but not "benchmark" } diff --git a/proj/parboiled.conf b/proj/parboiled.conf index c246e52e0..e966e7034 100644 --- a/proj/parboiled.conf +++ b/proj/parboiled.conf @@ -2,7 +2,7 @@ vars.proj.parboiled: ${vars.base} { name: "parboiled" - uri: "https://github.com/sirthias/parboiled.git#cc701cdd4e0c282f62d423c8f9969348bc4b02e9" + uri: "https://github.com/sirthias/parboiled.git#96c3a8d3049462079a7c50e391cd1e559bc2ade7" extra.projects: ["parboiled-scala"] } diff --git a/proj/parboiled2.conf b/proj/parboiled2.conf index d381f3a66..dbb13e56c 100644 --- a/proj/parboiled2.conf +++ b/proj/parboiled2.conf @@ -2,7 +2,7 @@ vars.proj.parboiled2: ${vars.base} { name: "parboiled2" - uri: "https://github.com/sirthias/parboiled2.git#524af13fcaa5d5418e73dc31bf4e41a6650f6717" + uri: "https://github.com/sirthias/parboiled2.git#ad79a4ac58197757835222e86e563fb82af77af7" extra.projects: ["parboiledJVM", "examples"] extra.commands: ${vars.default-commands} [ diff --git a/proj/playframework.conf b/proj/playframework.conf index 38f5aff83..fea31b2ad 100644 --- a/proj/playframework.conf +++ b/proj/playframework.conf @@ -2,7 +2,7 @@ vars.proj.playframework: ${vars.base} { name: "playframework" - uri: "https://github.com/playframework/playframework.git#ce4dadbd8e46bf15b2f61b6e54d447b3e988d8b1" + uri: "https://github.com/playframework/playframework.git#2febd37d987e3d19e3e631ac34a9531246ddecdc" // see https://github.com/sbt/sbt/issues/5808 ; we could probably move to 1.4 // once we have https://github.com/playframework/playframework/pull/10442 but diff --git a/proj/reactive-mongo-bson.conf b/proj/reactive-mongo-bson.conf index 30481e5d6..30451a3ba 100644 --- a/proj/reactive-mongo-bson.conf +++ b/proj/reactive-mongo-bson.conf @@ -2,7 +2,7 @@ vars.proj.reactive-mongo-bson: ${vars.base} { name: "reactive-mongo-bson" - uri: "https://github.com/ReactiveMongo/ReactiveMongo-BSON.git#3a012aa66165c47d1c2f766ebb796436169c0807" + uri: "https://github.com/ReactiveMongo/ReactiveMongo-BSON.git#a159d95cbc7dc1eb4a36ad125169fcfca40919f0" // present ambition level is: only what lila-ws needs extra.projects: ["api"] diff --git a/proj/refined.conf b/proj/refined.conf index bd561d6d7..955f22c61 100644 --- a/proj/refined.conf +++ b/proj/refined.conf @@ -2,7 +2,7 @@ vars.proj.refined: ${vars.base} { name: "refined" - uri: "https://github.com/fthomas/refined.git#0e2d5aae446d6ca62d2250f27939fe8762470fa7" + uri: "https://github.com/fthomas/refined.git#ac4a55fa06f240d2479b9cf000127d5b0427f496" // scodecJVM isn't included because the dependency wasn't found, maybe a version mismatch? // it's okay, we don't need to have absolutely every subproject @@ -11,7 +11,7 @@ vars.proj.refined: ${vars.base} { vars.proj.refined-more: ${vars.base} { name: "refined-more" - uri: "https://github.com/fthomas/refined.git#0e2d5aae446d6ca62d2250f27939fe8762470fa7" + uri: "https://github.com/fthomas/refined.git#ac4a55fa06f240d2479b9cf000127d5b0427f496" extra.exclude: [ // because we already built them in "refined" diff --git a/proj/scala-collection-compat.conf b/proj/scala-collection-compat.conf index 5b1b73bff..717d11836 100644 --- a/proj/scala-collection-compat.conf +++ b/proj/scala-collection-compat.conf @@ -2,7 +2,7 @@ vars.proj.scala-collection-compat: ${vars.base} { name: "scala-collection-compat" - uri: "https://github.com/scala/scala-collection-compat.git#a98ec84104b9475d1d43e49ef51df29f68ef289e" + uri: "https://github.com/scala/scala-collection-compat.git#a4e0dd3e245fb1599cb094802dc191b48aaa119e" extra.projects: ["compat213"] // no Scala.js or Scalafix rules plz extra.commands: ${vars.default-commands} [ diff --git a/proj/scala-collection-contrib.conf b/proj/scala-collection-contrib.conf index e57d3630c..0e53ed7e4 100644 --- a/proj/scala-collection-contrib.conf +++ b/proj/scala-collection-contrib.conf @@ -2,7 +2,7 @@ vars.proj.scala-collection-contrib: ${vars.base} { name: "scala-collection-contrib" - uri: "https://github.com/scala/scala-collection-contrib.git#bd5fa701cd07befdbeda288998e7916e2af26972" + uri: "https://github.com/scala/scala-collection-contrib.git#bad43da9263f2290e230aa90073a6c151e9bf4a3" extra.exclude: ["*JS"] extra.commands: ${vars.default-commands} [ diff --git a/proj/scala-collection-laws.conf b/proj/scala-collection-laws.conf index 2a40f37c0..b706a43c9 100644 --- a/proj/scala-collection-laws.conf +++ b/proj/scala-collection-laws.conf @@ -2,7 +2,7 @@ vars.proj.scala-collection-laws: ${vars.base} { name: "scala-collection-laws" - uri: "https://github.com/scala/scala-collection-laws.git#98c8769118a038885e4ef60baf758d71126f5730" + uri: "https://github.com/scala/scala-collection-laws.git#c26028ad9698fb6c57c7d761f559a6bcb8bd806f" // as per the repo readme extra.options: ["-XX:MaxMetaspaceSize=1G", "-Xmx6G"] diff --git a/proj/scala-java8-compat.conf b/proj/scala-java8-compat.conf index 98e161d6e..f9c966791 100644 --- a/proj/scala-java8-compat.conf +++ b/proj/scala-java8-compat.conf @@ -2,7 +2,7 @@ vars.proj.scala-java8-compat: ${vars.base} { name: "scala-java8-compat" - uri: "https://github.com/scala/scala-java8-compat.git#27b208e1d0c381705b6615c3082eac39c78bc212" + uri: "https://github.com/scala/scala-java8-compat.git#c344af4a3e6409070e87087eadd21c287ad973cc" // as per https://github.com/scala/scala-java8-compat/issues/160 // genjavadoc is disabled except on JDK 8, but we don't want to diff --git a/proj/scala-library-next.conf b/proj/scala-library-next.conf index 9523d0979..ae3a62c6b 100644 --- a/proj/scala-library-next.conf +++ b/proj/scala-library-next.conf @@ -2,7 +2,7 @@ vars.proj.scala-library-next: ${vars.base} { name: "scala-library-next" - uri: "https://github.com/scala/scala-library-next.git#c774bcb5130028a7c8ea50c7324c4d9a24a4ff02" + uri: "https://github.com/scala/scala-library-next.git#7e83c0c01202d822eb40663db5f0d774514faf5e" extra.exclude: ["*JS"] } diff --git a/proj/scala-parallel-collections.conf b/proj/scala-parallel-collections.conf index c3a954185..f3ac8c37a 100644 --- a/proj/scala-parallel-collections.conf +++ b/proj/scala-parallel-collections.conf @@ -2,6 +2,6 @@ vars.proj.scala-parallel-collections: ${vars.base} { name: "scala-parallel-collections" - uri: "https://github.com/scala/scala-parallel-collections.git#0d8cdab0b16cc1c17dd2867cb2300b30f1e53cc6" + uri: "https://github.com/scala/scala-parallel-collections.git#d25efa217bfcf07185f9bd39bb2dd80a8fa575e8" } diff --git a/proj/scala-parser-combinators.conf b/proj/scala-parser-combinators.conf index 750af821b..1c3d1d667 100644 --- a/proj/scala-parser-combinators.conf +++ b/proj/scala-parser-combinators.conf @@ -2,7 +2,7 @@ vars.proj.scala-parser-combinators: ${vars.base} { name: "scala-parser-combinators" - uri: "https://github.com/scala/scala-parser-combinators.git#0ef509b92dc88720e9c4a634a2693e37987d1909" + uri: "https://github.com/scala/scala-parser-combinators.git#ac460f1af812ebcdc6672122adfd1888703675a8" extra.exclude: ["*JS", "*Native"] extra.commands: ${vars.default-commands} [ diff --git a/proj/scala-sculpt.conf b/proj/scala-sculpt.conf index db45a7cd1..70c55f7fb 100644 --- a/proj/scala-sculpt.conf +++ b/proj/scala-sculpt.conf @@ -5,6 +5,6 @@ vars.proj.scala-sculpt: ${vars.base} { name: "scala-sculpt" - uri: "https://github.com/lightbend/scala-sculpt.git#0fa032a1aa1c68b1970d58567d0a3b4e520ae63d" + uri: "https://github.com/lightbend/scala-sculpt.git#a2488c0b64b7d2b3fa621fa5d18ed3a564f821f9" } diff --git a/proj/scala-xml.conf b/proj/scala-xml.conf index 396719dff..facfd4484 100644 --- a/proj/scala-xml.conf +++ b/proj/scala-xml.conf @@ -2,7 +2,7 @@ vars.proj.scala-xml: ${vars.base} { name: "scala-xml" - uri: "https://github.com/scala/scala-xml.git#13c3e29f75cbdae81102a3ad5f1966bb5513724c" + uri: "https://github.com/scala/scala-xml.git#2dcbb85ffd5314e74c16e9a28c1f0bbc9bc55d77" extra.projects: ["xml"] extra.commands: ${vars.default-commands} [ diff --git a/proj/scalacheck-effect.conf b/proj/scalacheck-effect.conf index 6650e47b0..b082d1db4 100644 --- a/proj/scalacheck-effect.conf +++ b/proj/scalacheck-effect.conf @@ -2,7 +2,7 @@ vars.proj.scalacheck-effect: ${vars.base} { name: "scalacheck-effect" - uri: "https://github.com/typelevel/scalacheck-effect.git#8818f15f5fa11676532883a7d1dbfd8f8e1a9b99" + uri: "https://github.com/typelevel/scalacheck-effect.git#ae6068f9c83655b93116a645285d76ca226e7293" extra.exclude: ["*JS"] extra.commands: ${vars.default-commands} [ diff --git a/proj/scalacheck.conf b/proj/scalacheck.conf index ebcfb307d..a3fb8f1d6 100644 --- a/proj/scalacheck.conf +++ b/proj/scalacheck.conf @@ -2,7 +2,7 @@ vars.proj.scalacheck: ${vars.base} { name: "scalacheck" - uri: "https://github.com/typelevel/scalacheck.git#6d423089cd9b6420599b665f462d22411ccbaa3e" + uri: "https://github.com/typelevel/scalacheck.git#4546bb8c8cb49a11eca17ee340caf10f3e2133af" extra.projects: ["jvm"] // no Scala.js please } diff --git a/proj/scalafmt.conf b/proj/scalafmt.conf index a0fbc7d1f..8d20bb5be 100644 --- a/proj/scalafmt.conf +++ b/proj/scalafmt.conf @@ -2,7 +2,7 @@ vars.proj.scalafmt: ${vars.base} { name: "scalafmt" - uri: "https://github.com/scalameta/scalafmt.git#39c3bf7e93fc4a47ee66d81b5909c2866fdb50aa" + uri: "https://github.com/scalameta/scalafmt.git#73ea9a95d94082a2c54a61979ec99210cbda49ac" extra.projects: ["coreJVM", "cli", "tests"] // not investigated. at first glance they all look environment-dependent diff --git a/proj/scalamock.conf b/proj/scalamock.conf index 769f45b34..cc9e234ce 100644 --- a/proj/scalamock.conf +++ b/proj/scalamock.conf @@ -2,7 +2,7 @@ vars.proj.scalamock: ${vars.base} { name: "scalamock" - uri: "https://github.com/paulbutcher/ScalaMock.git#f777df6baed7942e31cfeb386cbe98f845d2e8d7" + uri: "https://github.com/paulbutcher/ScalaMock.git#6d02dff2d88609b1336425736332563e929e751d" extra.projects: ["scalamockJVM", "examples"] } diff --git a/proj/scalaprops.conf b/proj/scalaprops.conf index 059fee5a1..86a273a7d 100644 --- a/proj/scalaprops.conf +++ b/proj/scalaprops.conf @@ -2,7 +2,7 @@ vars.proj.scalaprops: ${vars.base} { name: "scalaprops" - uri: "https://github.com/scalaprops/scalaprops.git#5aaa8a49a19abf32b0f983baaf8a10066f668720" + uri: "https://github.com/scalaprops/scalaprops.git#2bcb3de5e19119d71949710134e10b520a30ee5b" extra.projects: ["scalapropsJVM"] // no Scala.js please } diff --git a/proj/scalastyle.conf b/proj/scalastyle.conf index af5e9aa36..8064c9a5a 100644 --- a/proj/scalastyle.conf +++ b/proj/scalastyle.conf @@ -4,6 +4,6 @@ vars.proj.scalastyle: ${vars.base} { name: "scalastyle" - uri: "https://github.com/beautiful-scala/scalastyle.git#5c7102f9f913b676ebe8b35081ab7fde58f9c910" + uri: "https://github.com/beautiful-scala/scalastyle.git#a9ec90feed632cc53883da8e459772eca8d654ac" } diff --git a/proj/scalikejdbc.conf b/proj/scalikejdbc.conf index 9482dbec4..7e0e6ef2b 100644 --- a/proj/scalikejdbc.conf +++ b/proj/scalikejdbc.conf @@ -2,7 +2,7 @@ vars.proj.scalikejdbc: ${vars.base} { name: "scalikejdbc" - uri: "https://github.com/scalikejdbc/scalikejdbc.git#5dbf26c236ac257b66d41b4f304a39f7c42850d7" + uri: "https://github.com/scalikejdbc/scalikejdbc.git#7a98bc5527d4520895270eb0ad397171afef75e1" // don't build sbt plugin extra.exclude: ["mapper-generator"] diff --git a/proj/scallop.conf b/proj/scallop.conf index ec2ffe940..12d16001f 100644 --- a/proj/scallop.conf +++ b/proj/scallop.conf @@ -5,7 +5,7 @@ vars.proj.scallop: ${vars.base} { name: "scallop" - uri: "https://github.com/scallop/scallop.git#9191d86119720c2ab9503b55ad9cfee48d0c0015" + uri: "https://github.com/scallop/scallop.git#fd0191fbbb5c65f5baf279488a7c5cecdb1f502e" extra.projects: ["scallopJVM"] // no Scala.js or Scala Native plz } diff --git a/proj/sconfig.conf b/proj/sconfig.conf index 1cbb51f44..f642c4a84 100644 --- a/proj/sconfig.conf +++ b/proj/sconfig.conf @@ -2,7 +2,7 @@ vars.proj.sconfig: ${vars.base} { name: "sconfig" - uri: "https://github.com/ekrich/sconfig.git#08d69fc615420283cda8ed7e6f7225f1c1442320" + uri: "https://github.com/ekrich/sconfig.git#f1edca53dbef16f7d8edfa9a610c1f3ca9f717fb" extra.exclude: ["sconfigNative", "sconfigJS"] extra.commands: ${vars.default-commands} [ diff --git a/proj/scribe.conf b/proj/scribe.conf index 72042832e..5013ff52a 100644 --- a/proj/scribe.conf +++ b/proj/scribe.conf @@ -2,7 +2,7 @@ vars.proj.scribe: ${vars.base} { name: "scribe" - uri: "https://github.com/outr/scribe.git#83da5bbf7817c6b328c3b612b4d666c54cd39f6f" + uri: "https://github.com/outr/scribe.git#cc4d70161ba3588ba45149bd989393a779c3cac4" extra.projects: ["coreJVM", "slf4j"] extra.commands: ${vars.default-commands} [ diff --git a/proj/shapeless-java-records.conf b/proj/shapeless-java-records.conf index ed8ae8578..32e06327c 100644 --- a/proj/shapeless-java-records.conf +++ b/proj/shapeless-java-records.conf @@ -2,7 +2,7 @@ vars.proj.shapeless-java-records: ${vars.base} { name: "shapeless-java-records" - uri: "https://github.com/xuwei-k/shapeless-java-records.git#8b10ada3ab5d3ce9922b6ed902d0ad8f7cc0ec5f" + uri: "https://github.com/xuwei-k/shapeless-java-records.git#151a993fed9fdf868b1baaef65df3e7ee3505208" extra.options: ["--enable-preview", "-XX:+IgnoreUnrecognizedVMOptions"] } diff --git a/proj/simulacrum-scalafix.conf b/proj/simulacrum-scalafix.conf index b0f96eb4b..179abe971 100644 --- a/proj/simulacrum-scalafix.conf +++ b/proj/simulacrum-scalafix.conf @@ -2,7 +2,7 @@ vars.proj.simulacrum-scalafix: ${vars.base} { name: "simulacrum-scalafix" - uri: "https://github.com/typelevel/simulacrum-scalafix.git#fa3c7213af8e77aad31d688ce02980e238c6216c" + uri: "https://github.com/typelevel/simulacrum-scalafix.git#3d1b270df4c0b5422dca2ca4934352d03b6d0895" extra.projects: ["annotation"] } @@ -12,7 +12,7 @@ vars.proj.simulacrum-scalafix: ${vars.base} { vars.proj.simulacrum-scalafix-more: ${vars.base} { name: "simulacrum-scalafix-more" - uri: "https://github.com/typelevel/simulacrum-scalafix.git#fa3c7213af8e77aad31d688ce02980e238c6216c" + uri: "https://github.com/typelevel/simulacrum-scalafix.git#3d1b270df4c0b5422dca2ca4934352d03b6d0895" extra.exclude: ["*JS", "annotation"] } diff --git a/proj/singleton-ops.conf b/proj/singleton-ops.conf index 9b36338f4..20f33b6ae 100644 --- a/proj/singleton-ops.conf +++ b/proj/singleton-ops.conf @@ -2,7 +2,7 @@ vars.proj.singleton-ops: ${vars.base} { name: "singleton-ops" - uri: "https://github.com/fthomas/singleton-ops.git#1265076289fe204f9f8064e1e075a78ad0710254" + uri: "https://github.com/fthomas/singleton-ops.git#107c532f9a8b47891b59fa03b93534b47d8f6fd6" extra.projects: ["singleton_opsJVM"] } diff --git a/proj/slick.conf b/proj/slick.conf index 69aafd3b7..c269ae21d 100644 --- a/proj/slick.conf +++ b/proj/slick.conf @@ -2,7 +2,7 @@ vars.proj.slick: ${vars.base} { name: "slick" - uri: "https://github.com/slick/slick.git#e26ccf77c2bcccafbb7ab54730c7c39e1305e1cf" + uri: "https://github.com/slick/slick.git#bdd55e8c4d18dbac4c8830a2786df0829349cf29" // some WIP on upgrading to sbt 1 is at https://github.com/SethTisue/slick/tree/sbt-1 , // but it wasn't as easy as I'd hoped when I started diff --git a/proj/splain.conf b/proj/splain.conf index f907289ad..3fd166508 100644 --- a/proj/splain.conf +++ b/proj/splain.conf @@ -2,7 +2,7 @@ vars.proj.splain: ${vars.base} { name: "splain" - uri: "https://github.com/tek/splain.git#cdbb2759993cdb1ae638bdcb71e5e51ba595f379" + uri: "https://github.com/tek/splain.git#ee55f874c790616f7a3f9fe3576e8c91b95b7259" extra.commands: [ "set every gpgWarnOnFailure := true" diff --git a/proj/squants.conf b/proj/squants.conf index a97419996..318aed426 100644 --- a/proj/squants.conf +++ b/proj/squants.conf @@ -2,7 +2,7 @@ vars.proj.squants: ${vars.base} { name: "squants" - uri: "https://github.com/typelevel/squants.git#c5503272682f2fc0d3f5576aa67a624e56466902" + uri: "https://github.com/typelevel/squants.git#2590bf1c1918c02e101cb9680bbe917efb50625e" extra.projects: ["squantsJVM"] } diff --git a/proj/ssl-config.conf b/proj/ssl-config.conf index bf33b7e8d..f3727eed6 100644 --- a/proj/ssl-config.conf +++ b/proj/ssl-config.conf @@ -2,7 +2,7 @@ vars.proj.ssl-config: ${vars.base} { name: "ssl-config" - uri: "https://github.com/lightbend/ssl-config.git#449e325d131d12d5e63be330a2a457bb1a06573e" + uri: "https://github.com/lightbend/ssl-config.git#62f0b76efba06c3e68e576d7a34067a33af71143" extra.projects: ["sslConfigCore"] // repeated hangs during testing; see diff --git a/proj/wartremover.conf b/proj/wartremover.conf index 1026621c4..2b44a573d 100644 --- a/proj/wartremover.conf +++ b/proj/wartremover.conf @@ -2,7 +2,7 @@ vars.proj.wartremover: ${vars.base} { name: "wartremover" - uri: "https://github.com/wartremover/wartremover.git#5c6d42b76aafb05141315badcfa1d1d226ed403b" + uri: "https://github.com/wartremover/wartremover.git#2de5c82f9d3e7f0ad93f1456b700afa4d519b81d" extra.exclude: [ "sbt-plugin" diff --git a/proj/weaver-test.conf b/proj/weaver-test.conf index 21ef6f423..0bb6ec896 100644 --- a/proj/weaver-test.conf +++ b/proj/weaver-test.conf @@ -2,25 +2,25 @@ vars.proj.weaver-test: ${vars.base} { name: "weaver-test" - uri: "https://github.com/disneystreaming/weaver-test.git#fbf0a614116390753b488d16778fc35663e9493f" + uri: "https://github.com/disneystreaming/weaver-test.git#c1bf3e0ab3313b2d114ee466a0c2e2938bacbc49" - extra.projects: ["coreJVM", "frameworkJVM"] + extra.projects: ["core", "framework"] } vars.proj.weaver-test-more: ${vars.base} { name: "weaver-test-more" - uri: "https://github.com/disneystreaming/weaver-test.git#fbf0a614116390753b488d16778fc35663e9493f" + uri: "https://github.com/disneystreaming/weaver-test.git#c1bf3e0ab3313b2d114ee466a0c2e2938bacbc49" - extra.projects: ["scalacheckJVM", "specs2JVM"] + extra.projects: ["scalacheck", "specs2"] // already built these above - extra.exclude: ["coreJVM", "frameworkJVM"] + extra.exclude: ["core", "framework"] } vars.proj.weaver-test-monix: ${vars.base} { name: "weaver-test-monix" - uri: "https://github.com/disneystreaming/weaver-test.git#fbf0a614116390753b488d16778fc35663e9493f" + uri: "https://github.com/disneystreaming/weaver-test.git#c1bf3e0ab3313b2d114ee466a0c2e2938bacbc49" - extra.projects: ["monix*JVM"] + extra.projects: ["monix", "monixBio"] // already built these above - extra.exclude: ["coreJVM", "frameworkJVM"] + extra.exclude: ["core", "framework"] } diff --git a/proj/zinc.conf b/proj/zinc.conf index ed3a9cb54..779da95a0 100644 --- a/proj/zinc.conf +++ b/proj/zinc.conf @@ -2,7 +2,7 @@ vars.proj.zinc: ${vars.base} { name: "zinc" - uri: "https://github.com/sbt/zinc.git#bad35ca5112f0b087d21c746f525b6078b5acb5f" + uri: "https://github.com/sbt/zinc.git#45c7f4b757303b205a491041ee2661728930fec8" extra.exclude: ["*2_10", "*2_11", "*2_12", "compilerBridgeTest", "*Benchmarks*"] extra.options: ["-Dbintray.user=dummy", "-Dbintray.pass=dummy"]