diff --git a/common-2.11.x.conf b/common-2.11.x.conf index 9f2f91a58..0c779e1e0 100644 --- a/common-2.11.x.conf +++ b/common-2.11.x.conf @@ -63,7 +63,7 @@ vars: { playframework-ref : "playframework/playframework.git#3b63ece20430f202363dc025a36fd00ed5d0283f" // fixed sha from master that has Scala 2.11 patches merged parboiled-ref : "sirthias/parboiled.git#c53e650212f222c9b1f75fa1ab13d7cab9db164e" - // fixed sha/tag (a compromise), the sha points at master that does support Scala 2.11 + // fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11 // but haven't diverged from 1.3 release yet scala-arm-ref : "jsuereth/scala-arm.git#9c5e817a88de804c82a6b2f1447ef6fed9a46a57" // fixed sha/tag (a compromise) @@ -77,6 +77,8 @@ vars: { // https://github.com/valotrading/zeromq-scala-binding/commit/c2a8a87673a1a3468486d1af9a6460bfed25c7a2 // therefore (which has a broken libdep of scalatest, however (cross full)): zeromq-scala-binding-ref : "valotrading/zeromq-scala-binding.git#062e9438e322ec29d75b9649cb2aafa6ba3198a6" + // fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11 + spire-ref : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d" // tracking upstream (the ideal) akka-ref : "akka/akka.git" @@ -95,6 +97,7 @@ vars: { sbt-ref : "sbt/sbt.git#0.13" scalaz-ref : "scalaz/scalaz.git#series/7.0.x" shapeless-ref : "milessabin/shapeless.git#scala-2.11.x" + discipline-ref : "typelevel/discipline.git#v0.2" // version settings sbt-version-override : "0.13.1" @@ -277,6 +280,18 @@ build += { } } + ${vars.base} { + name: "discipline" + uri: "https://github.com/"${vars.discipline-ref} + extra.sbt-version: ${vars.sbt-version-override} + } + + ${vars.base} { + name: "spire" + uri: "https://github.com/"${vars.spire-ref} + extra.sbt-version: ${vars.sbt-version-override} + } + ${vars.base} { name: "genjavadoc-plugin", uri: "https://github.com/"${vars.genjavadoc-ref}