add hasher (dependency of lila); also unfork scala-logging (#1361)

Author: SethTisue

community.conf

@@ -230,6 +230,7 @@ include "proj/gigahorse.conf"
 include "proj/giter8.conf"
 include "proj/github4s.conf"
 include "proj/grizzled.conf"
+include "proj/hasher.conf"
 include "proj/http4s-jwt-auth.conf"
 include "proj/http4s-parboiled2.conf"
 include "proj/http4s.conf"

dependencies.txt

@@ -10,6 +10,7 @@ sbt-util-relation: scala
 shaded-jawn-parser: scala
 shaded-scalajson: scala
 genjavadoc: cloc-plugin, scala
+hasher: cloc-plugin, scala
 kind-projector: cloc-plugin, scala
 machinist: cloc-plugin, scala
 portable-scala-reflect: cloc-plugin, scala
@@ -211,9 +212,9 @@ monix-bio: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, disci
 monix-nio: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, implicitbox, kind-projector, minitest, monix, munit, portable-scala-reflect, scala, scala-collection-compat, scala-parallel-collections, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, utest, wartremover
 multibot: cats, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, json4s, kind-projector, monocle, munit, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, utest
 cats-time: better-monadic-for, cats, cats-testkit-scalatest, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, kind-projector, munit, portable-scala-reflect, scala, scala-collection-compat, scala-parallel-collections, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, utest, wartremover
+scala-logging: cats, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, kind-projector, mockito-scala, munit, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, specs2, utest
 doodle: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, implicitbox, kind-projector, magnolia, mercator, minitest, monix, munit, portable-scala-reflect, scala, scala-collection-compat, scala-parallel-collections, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, utest, wartremover
 log4cats: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, kind-projector, munit, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, specs2, utest, wartremover
-scala-logging: cats, cloc-plugin, discipline, discipline-munit, discipline-scalatest, fastparse, fastparse-scalameta, geny, kind-projector, mockito-scala, munit, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, specs2, utest
 cats-effect-testing: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, kind-projector, minitest, munit, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, silencer, simulacrum-scalafix, sourcecode, specs2, utest, wartremover
 specs2-more: better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, kind-projector, munit, portable-scala-reflect, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, utest, wartremover
 avro4s: cats, cloc-plugin, discipline, discipline-munit, fastparse, fastparse-scalameta, geny, json4s, kind-projector, magnolia, mercator, munit, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatestplus-scalacheck, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, utest, wartremover
@@ -260,7 +261,7 @@ eff: better-monadic-for, cats, cats-effect, circe, claimant, cloc-plugin, discip
 skunk: better-monadic-for, cats, cats-effect, cats-testkit-scalatest, cats-time, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, enumeratum, fansi, fastparse, fastparse-scalameta, fs2, geny, jawn, json4s, kind-projector, munit, munit-cats-effect, natchez, play-json, portable-scala-reflect, pprint, refined, 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, scodec-bits, scodec-cats, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, utest, wartremover
 scalafix: acyclic, argonaut, argonaut-shapeless, bijection, cats, circe, claimant, cloc-plugin, coursier, coursier-cache, coursier-core, coursier-util, discipline, discipline-munit, discipline-scalatest, fansi, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, metaconfig, munit, paiges, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec-bits, sconfig, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, upickle, upickle-more, utest
 simulacrum-scalafix-more: acyclic, argonaut, argonaut-shapeless, bijection, cats, circe, claimant, cloc-plugin, coursier, coursier-cache, coursier-core, coursier-util, discipline, discipline-munit, discipline-scalatest, fansi, fastparse, fastparse-scalameta, geny, jawn, json4s, kind-projector, metaconfig, munit, paiges, play-json, portable-scala-reflect, pprint, refined, scala, scala-collection-compat, scala-java8-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalafix, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scodec-bits, sconfig, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, upickle, upickle-more, utest
-lila-ws: akka, algebra, better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, geny, kamon, kind-projector, macwire, mockito-scala, munit, play-json, portable-scala-reflect, reactive-mongo, reactive-mongo-bson, reactive-mongo-shaded, scaffeine, scala, scala-collection-compat, scala-common, scala-java8-compat, scala-js-stubs, scala-logging, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalachess, scalalib, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scapegoat, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, specs2-more, spire, utest, wartremover
+lila-ws: akka, algebra, better-monadic-for, cats, cats-effect, cloc-plugin, discipline, discipline-munit, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, geny, hasher, kamon, kind-projector, macwire, mockito-scala, munit, play-json, portable-scala-reflect, reactive-mongo, reactive-mongo-bson, reactive-mongo-shaded, scaffeine, scala, scala-collection-compat, scala-common, scala-java8-compat, scala-js-stubs, scala-logging, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalachess, scalalib, scalameta, scalapb, scalatest, scalatest-3-0, scalatestplus-junit, scalatestplus-scalacheck, scapegoat, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, specs2-more, spire, utest, wartremover
 fs2-chat: acyclic, argonaut, better-monadic-for, cats, cats-effect, circe, claimant, cloc-plugin, decline, discipline, discipline-munit, discipline-scalatest, fansi, fastparse, fastparse-scalameta, fs2, geny, ip4s, jawn, json4s, kind-projector, log4cats, mdoc, metaconfig, munit, munit-cats-effect, paiges, play-json, portable-scala-reflect, pprint, refined, 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, scodec-bits, scodec-stream, sconfig, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, spray-json, upickle, upickle-more, utest, wartremover
 http4s: better-monadic-for, blaze, boopickle, cats, cats-effect, cats-effect-testing, circe, claimant, cloc-plugin, discipline, discipline-munit, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, fs2, geny, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, munit, munit-cats-effect, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, shapeless, silencer, simulacrum-scalafix, 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-munit, discipline-scalatest, discipline-specs2, fastparse, fastparse-scalameta, fs2, geny, http4s, http4s-parboiled2, jawn, jawn-fs2, json4s, kind-projector, log4cats, log4s, minitest, munit, munit-cats-effect, play-json, portable-scala-reflect, refined, scala, scala-collection-compat, scala-js-stubs, scala-parallel-collections, scala-parser-combinators, scala-xml, scalacheck, scalacheck-effect, scalameta, scalapb, scalatags, scalatest, scalatest-3-0, scalatestplus-scalacheck, scalatestplus-testng, scodec-bits, shapeless, silencer, simulacrum-scalafix, sourcecode, specs2, specs2-more, spray-json, twirl, unique, utest, vault, wartremover

proj/hasher.conf

@@ -0,0 +1,13 @@
+// https://github.com/Nycto/Hasher.git#master
+
+vars.proj.hasher: ${vars.base} {
+  name: "hasher"
+  uri: "https://github.com/Nycto/Hasher.git#d5026fb095aa3d63a26e95b90157f93f4b3b6774"
+
+  // depends on ancient specs2 version. easiest way to bypass the problem is this.
+  // (we could submit an upgrade upstream...)
+  extra.run-tests: false
+  extra.commands: ${vars.default-commands} [
+    "removeDependency org.specs2 specs2"
+  ]
+}

proj/scala-logging.conf

@@ -1,14 +1,7 @@
-// https://github.com/scalacommunitybuild/scala-logging.git#community-build-2.13
+// https://github.com/lightbend/scala-logging.git#master
 
 vars.proj.scala-logging: ${vars.base} {
   name: "scala-logging"
-  uri: "https://github.com/scalacommunitybuild/scala-logging.git#a83a5472d79aab9eacfbf6012551d2d6a27719c9"
+  uri: "https://github.com/lightbend/scala-logging.git#cedbc552de9722563e5a87a2d04b62918fdf48f1"
 
-  // 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 libraryDependencies in ThisBuild += "scalacommunitybuild" %% "scalatest" % "0" % Test"""
-  ]
 }

projs.conf

@@ -97,6 +97,7 @@ build += {
   ${vars.proj.giter8}
   ${vars.proj.github4s}
   ${vars.proj.grizzled}
+  ${vars.proj.hasher}
   ${vars.proj.http4s-jwt-auth}
   ${vars.proj.http4s-parboiled2}
   ${vars.proj.http4s}