deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

upgrade reactivemongo to 0.12.2-SNAPSHOT

pull/2876/head
Thibault Duplessis 2017-03-30 18:42:49 +02:00
parent eff267ca5a
commit 0235628442
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/db/src/main/BSON.scala
View File

@ -34,7 +34,7 @@ abstract class BSON[T]
object BSON extends Handlers {
def toDocHandler[A](implicit handler: BSONHandler[BSONDocument, A]): BSONDocumentHandler[A] =
new BSONDocumentReader[A] with BSONDocumentWriter[A] {
new BSONDocumentReader[A] with BSONDocumentWriter[A] with BSONHandler[BSONDocument, A] {
def read(doc: BSONDocument) = handler read doc
def write(o: A) = handler write o
}

2
modules/db/src/main/dsl.scala
View File

@ -37,8 +37,6 @@ trait dsl extends LowPriorityDsl {
type BSONArrayWriter[A] = BSONWriter[A, BSONArray]
type BSONArrayHandler[A] = BSONHandler[BSONArray, A]
type BSONDocumentHandler[A] = BSONDocumentReader[A] with BSONDocumentWriter[A]
implicit val LilaBSONDocumentZero: Zero[BSONDocument] =
Zero.instance($doc())

16
project/Dependencies.scala
View File

@ -7,14 +7,14 @@ object Dependencies {
val typesafe = "typesafe.com" at "http://repo.typesafe.com/typesafe/releases/"
val sonatype = "sonatype" at "https://oss.sonatype.org/content/repositories/releases"
// val sonatypeS = "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
val sonatypeS = "sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
val jgitMaven = "jgit-maven" at "http://download.eclipse.org/jgit/maven"
val awesomepom = "awesomepom" at "https://raw.github.com/jibs/maven-repo-scala/master"
val prismic = "Prismic.io kits" at "https://s3.amazonaws.com/prismic-maven-kits/repository/maven/"
// val ornicarMaven = "ornicar maven" at "https://raw.githubusercontent.com/ornicar/maven/master/oss.sonatype.org/content/repositories/snapshots"
val commons = Seq(
// sonatypeS,
sonatypeS,
// ornicarMaven,
sonatype,
awesomepom,
@ -41,9 +41,15 @@ object Dependencies {
val scaffeine = "com.github.blemale" %% "scaffeine" % "2.0.0" % "compile"
object reactivemongo {
val version = "0.12.1"
val driver = "org.reactivemongo" %% "reactivemongo" % version
val iteratees = "org.reactivemongo" %% "reactivemongo-iteratees" % version
val version = "0.12.2-SNAPSHOT"
val iterateeVersion = "0.12.1"
// val driver = "org.reactivemongo" %% "reactivemongo" % version
val driver = ("org.reactivemongo" %% "reactivemongo" % version)
.exclude("com.typesafe.akka", "*") // provided by Play
.exclude("com.typesafe.play", "*")
val iteratees = ("org.reactivemongo" %% "reactivemongo-iteratees" % iterateeVersion)
.exclude("com.typesafe.akka", "*") // provided by Play
.exclude("com.typesafe.play", "*")
}
object play {