Skip to content

reinstate spire, breeze, multibot #722

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions configs/community.dbuild
Original file line number Diff line number Diff line change
Expand Up @@ -1550,6 +1550,41 @@ build += {
]
}

${vars.base} {
name: "spire"
uri: ${vars.uris.spire-uri}
extra.sbt-version: ${vars.sbt-1-version}
// hopefully avoid intermittent OutOfMemoryErrors during compilation
extra.options: ["-Xmx2560m"]
extra.projects: ["spireJVM"] // no Scala.js please
}

${vars.base} {
name: "breeze"
uri: ${vars.uris.breeze-uri}
extra.sbt-version: ${vars.sbt-1-version}
// spire moved from org.spire to org.typelevel but breeze hasn't
// changed their dependency yet
deps.ignore: ["org.spire-math#spire"]
deps.inject: ${vars.base.deps.inject} ["org.typelevel#spire"]
check-missing: false
// tests don't compile, could be a ScalaCheck 1.13 vs 1.14 thing?
// see https://github.com/scala/community-builds/pull/722
extra.run-tests: false
}

// OlegYch's fork hangs out in scala/scala (Gitter) and #scala (IRC)
${vars.base} {
name: "multibot"
uri: ${vars.uris.multibot-uri}
// linter isn't essential to the build
deps.ignore: ["org.psywerx.hairyfotr#linter"]
check-missing: false
// testScalaInterpreter fails with a java.lang.SecurityException;
// see https://github.com/scala/community-builds/pull/722
extra.test-tasks: ["compile"]
}

]}

//// space: jawn_0_10
Expand Down
29 changes: 16 additions & 13 deletions configs/project-refs.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,31 @@

vars.uris: {
acyclic-uri: "https://github.com/lihaoyi/acyclic.git"
akka-uri: "https://github.com/akka/akka.git#c15c22622e" # was master
akka-contrib-extra-uri: "https://github.com/typesafehub/akka-contrib-extra.git"
akka-http-uri: "https://github.com/akka/akka-http.git#bc849bb03" # was master
akka-http-cors-uri: "https://github.com/lomigmegard/akka-http-cors.git"
akka-http-json-uri: "https://github.com/hseeberger/akka-http-json.git"
akka-http-session-uri: "https://github.com/softwaremill/akka-http-session.git"
akka-http-uri: "https://github.com/akka/akka-http.git#bc849bb03" # was master
akka-persistence-cassandra-uri: "https://github.com/akka/akka-persistence-cassandra.git"
akka-persistence-jdbc-uri: "https://github.com/dnvriend/akka-persistence-jdbc.git"
akka-uri: "https://github.com/akka/akka.git#c15c22622e" # was master
algebra-uri: "https://github.com/denisrosset/algebra.git#topic/cats-compatibility" # was typelevel, master
ammonite-uri: "https://github.com/lihaoyi/ammonite.git#af54e9d1" # was master
argonaut-uri: "https://github.com/argonaut-io/argonaut.git"
argonaut-shapeless-uri: "https://github.com/alexarchambault/argonaut-shapeless.git"
argonaut-uri: "https://github.com/argonaut-io/argonaut.git"
atto-uri: "https://github.com/tpolecat/atto.git#series/0.5.x"
autowire-uri: "https://github.com/lihaoyi/autowire.git"
base64-uri: "https://github.com/marklister/base64.git"
better-files-uri: "https://github.com/pathikrit/better-files.git#d898255fd446" # was master
blaze-uri: "https://github.com/http4s/blaze.git#release-0.12.x"
breeze-uri: "https://github.com/scalanlp/breeze.git"
cachecontrol-uri: "https://github.com/playframework/cachecontrol.git"
case-app-uri: "https://github.com/scalacommunitybuild/case-app.git#community-build-2.12"
catalysts-uri: "https://github.com/typelevel/catalysts.git#f8676a18" # was master
cats-uri: "https://github.com/typelevel/cats.git#1.0"
cats-effect-uri: "https://github.com/typelevel/cats-effect.git#v0.10" # was master
circe-uri: "https://github.com/circe/circe.git#c23f22547"
cats-uri: "https://github.com/typelevel/cats.git#1.0"
circe-config-uri: "https://github.com/circe/circe-config.git"
circe-uri: "https://github.com/circe/circe.git#c23f22547"
classutil-uri: "https://github.com/bmc/classutil.git"
conductr-lib-uri: "https://github.com/typesafehub/conductr-lib.git"
coursier-uri: "https://github.com/coursier/coursier.git#4177b0adc70a" # was master
Expand All @@ -48,13 +49,13 @@ vars.uris: {
giter8-uri: "https://github.com/foundweekends/giter8.git"
github4s-uri: "https://github.com/47deg/github4s.git"
grizzled-uri: "https://github.com/bmc/grizzled-scala.git"
http4s-uri: "https://github.com/http4s/http4s.git#d803035b56d"
http4s-parboiled2-uri: "https://github.com/http4s/parboiled2.git"
http4s-uri: "https://github.com/http4s/http4s.git#d803035b56d"
http4s-websocket-uri: "https://github.com/http4s/http4s-websocket.git"
jackson-module-scala-uri: "https://github.com/FasterXML/jackson-module-scala.git#abacab34f065abda49c4575a8dfb941498c02b3b"
jawn-fs2-uri: "https://github.com/rossabaker/jawn-fs2.git"
jawn-0-10-uri: "https://github.com/non/jawn.git#v0.10.4"
jawn-0-11-uri: "https://github.com/non/jawn.git#v0.11.1"
jawn-fs2-uri: "https://github.com/rossabaker/jawn-fs2.git"
json4s-uri: "https://github.com/json4s/json4s.git#3.5"
kind-projector-uri: "https://github.com/non/kind-projector.git"
kxbmap-configs-uri: "https://github.com/kxbmap/configs.git"
Expand All @@ -68,14 +69,15 @@ vars.uris: {
macro-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12"
magnolia-uri: "https://github.com/scalacommunitybuild/magnolia.git#community-build-2.12" # was propensive, master
meta-paradise-uri: "https://github.com/scalacommunitybuild/paradise.git#community-build-2.12-meta-paradise"
metaconfig-old-uri: "https://github.com/olafurpg/metaconfig.git#b13e6bbbf"
metaconfig-new-uri: "https://github.com/olafurpg/metaconfig.git#v0.6.0"
metaconfig-old-uri: "https://github.com/olafurpg/metaconfig.git#b13e6bbbf"
metrics-scala-uri: "https://github.com/erikvanoosten/metrics-scala.git"
mima-uri: "https://github.com/lightbend/migration-manager.git"
minitest-uri: "https://github.com/monix/minitest.git"
monix-uri: "https://github.com/monix/monix.git#4b99f39a7ccd084fd"
monocle-uri: "https://github.com/julien-truffaut/Monocle.git"
mouse-uri: "https://github.com/typelevel/mouse.git"
multibot-uri: "https://github.com/OlegYch/multibot.git"
nscala-time-uri: "https://github.com/nscala-time/nscala-time.git"
nyaya-uri: "https://github.com/japgolly/nyaya.git"
paiges-uri: "https://github.com/typelevel/paiges.git"
Expand Down Expand Up @@ -105,9 +107,8 @@ vars.uris: {
scala-debugger-uri: "https://github.com/ensime/scala-debugger.git"
scala-gopher-uri: "https://github.com/rssh/scala-gopher.git"
scala-java8-compat-uri: "https://github.com/scala/scala-java8-compat.git"
scala-js-uri: "https://github.com/scala-js/scala-js.git"
scala-js-stubs-uri: "https://github.com/scala-js/scala-js.git#313da6a532"
scalajson-uri: "https://github.com/mdedetrich/scalajson.git"
scala-js-uri: "https://github.com/scala-js/scala-js.git"
scala-logging-uri: "https://github.com/lightbend/scala-logging.git"
scala-newtype-uri: "https://github.com/estatico/scala-newtype.git"
scala-parser-combinators-uri: "https://github.com/scala/scala-parser-combinators.git#1.1.x"
Expand All @@ -119,13 +120,14 @@ vars.uris: {
scala-stm-uri: "https://github.com/nbronson/scala-stm.git"
scala-swing-uri: "https://github.com/scala/scala-swing.git#2.0.x"
scala-xml-quote-uri: "https://github.com/allanrenucci/scala-xml-quote.git#bintray"
scalacheck-uri: "https://github.com/rickynils/scalacheck.git"
scalacheck-shapeless-uri: "https://github.com/alexarchambault/scalacheck-shapeless.git"
scalacheck-uri: "https://github.com/rickynils/scalacheck.git"
scalachess-uri: "https://github.com/ornicar/scalachess.git"
scaladex-uri: "https://github.com/scalacenter/scaladex.git#8f943f1961" # was master
scalafix-uri: "https://github.com/scalacommunitybuild/scalafix.git#community-build-2.12"
scalafmt-uri: "https://github.com/scalacommunitybuild/scalafmt.git#community-build-2.12"
scalaj-http-uri: "https://github.com/scalaj/scalaj-http.git"
scalachess-uri: "https://github.com/ornicar/scalachess.git"
scaladex-uri: "https://github.com/scalacenter/scaladex.git#8f943f1961" # was master
scalajson-uri: "https://github.com/mdedetrich/scalajson.git"
scalalib-uri: "https://github.com/ornicar/scalalib.git"
scalameta-1-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12-scalameta1" # was v1.7.0
scalameta-2-uri: "https://github.com/scalacommunitybuild/scalameta.git#community-build-2.12"
Expand Down Expand Up @@ -159,6 +161,7 @@ vars.uris: {
slick-uri: "https://github.com/slick/slick.git"
sourcecode-uri: "https://github.com/lihaoyi/sourcecode.git"
specs2-uri: "https://github.com/etorreborre/specs2.git"
spire-uri: "https://github.com/non/spire.git"
spray-json-uri: "https://github.com/spray/spray-json.git"
ssl-config-uri: "https://github.com/lightbend/ssl-config.git"
sttp-uri: "https://github.com/scalacommunitybuild/sttp.git#community-build-2.12" # was softwaremill, master
Expand Down