Update dependencies (#16)

build.sbt

@@ -9,22 +9,22 @@ import scalariform.formatter.preferences._
 
 name := "play-silhouette-persistence-reactivemongo"
 
-version := "5.0.2"
+version := "5.0.5"
 
-scalaVersion := "2.12.4"
+scalaVersion := "2.12.6"
 
-crossScalaVersions := Seq("2.12.4", "2.11.12")
+crossScalaVersions := Seq("2.12.6", "2.11.12")
 
 resolvers += Resolver.jcenterRepo
 
 resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"
 
 libraryDependencies ++= Seq(
-  "com.mohiva" %% "play-silhouette" % "5.0.3",
-  "com.mohiva" %% "play-silhouette-persistence" % "5.0.3",
-  "org.reactivemongo" %% "play2-reactivemongo" % "0.13.0-play26",
-  "net.codingwell" %% "scala-guice" % "4.1.1" % "test",
-  "de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "2.0.0" % "test",
+  "com.mohiva" %% "play-silhouette" % "5.0.5",
+  "com.mohiva" %% "play-silhouette-persistence" % "5.0.5",
+  "org.reactivemongo" %% "play2-reactivemongo" % "0.16.0-play26",
+  "net.codingwell" %% "scala-guice" % "4.2.1" % "test",
+  "de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "2.1.1" % "test",
   specs2 % Test
 )
 

src/main/scala/com/mohiva/play/silhouette/persistence/daos/MongoAuthInfoDAO.scala

@@ -20,7 +20,7 @@ import com.mohiva.play.silhouette.persistence.exceptions.MongoException
 import play.api.Configuration
 import play.api.libs.json.{ Format, JsObject, Json }
 import play.modules.reactivemongo.ReactiveMongoApi
-import play.modules.reactivemongo.json._
+import reactivemongo.play.json._
 import reactivemongo.api.commands.WriteResult
 import reactivemongo.play.json.collection.JSONCollection
 
@@ -71,7 +71,7 @@ class MongoAuthInfoDAO[A <: AuthInfo: ClassTag: Format](
    * @return The retrieved auth info or None if no auth info could be retrieved for the given login info.
    */
   def find(loginInfo: LoginInfo) = {
-    jsonCollection.flatMap(_.find(Json.obj("_id" -> loginInfo)).projection(Json.obj("_id" -> 0)).one[A])
+    jsonCollection.flatMap(_.find(Json.obj("_id" -> loginInfo), projection = Some(Json.obj("_id" -> 0))).one[A])
   }
 
   /**
@@ -119,7 +119,7 @@ class MongoAuthInfoDAO[A <: AuthInfo: ClassTag: Format](
    * @param loginInfo The login info for which the auth info should be removed.
    * @return A future to wait for the process to be completed.
    */
-  def remove(loginInfo: LoginInfo) = onSuccess(jsonCollection.flatMap(_.remove(Json.obj("_id" -> loginInfo))), ())
+  def remove(loginInfo: LoginInfo) = onSuccess(jsonCollection.flatMap(_.delete().one(Json.obj("_id" -> loginInfo))), ())
 
   /**
    * Merges the [[LoginInfo]] and the [[AuthInfo]] into one Json object.

src/test/scala/com/mohiva/play/silhouette/persistence/Helpers.scala

@@ -17,7 +17,7 @@ package com.mohiva.play.silhouette.persistence
 
 import java.io.InputStream
 
-import de.flapdoodle.embed.mongo.config.{ MongodConfigBuilder, Net, RuntimeConfigBuilder }
+import de.flapdoodle.embed.mongo.config.{ MongoCmdOptionsBuilder, MongodConfigBuilder, Net, RuntimeConfigBuilder }
 import de.flapdoodle.embed.mongo.distribution.Version
 import de.flapdoodle.embed.mongo.{ Command, MongodProcess, MongodStarter }
 import de.flapdoodle.embed.process.runtime.Network
@@ -30,10 +30,6 @@ import play.api.libs.json.{ JsObject, Json, Reads }
 import play.api.test.{ PlaySpecification, WithApplication }
 import play.api.{ Environment, Logger }
 import play.modules.reactivemongo.{ ReactiveMongoApi, ReactiveMongoModule }
-import reactivemongo.api.FailoverStrategy
-import reactivemongo.api.commands.DropDatabase
-import reactivemongo.api.commands.bson.BSONDropDatabaseImplicits._
-import reactivemongo.api.commands.bson.CommonImplicits._
 import reactivemongo.play.json.collection.JSONCollection
 
 import scala.concurrent.ExecutionContext.Implicits.global
@@ -119,6 +115,7 @@ trait MongoSpecification extends PlaySpecification {
     .prepare(new MongodConfigBuilder()
       .version(embedMongoDBVersion())
       .net(new Net(embedConnectionPort(), Network.localhostIsIPv6))
+      .cmdOptions(new MongoCmdOptionsBuilder().useNoJournal(false).build())
       .build
     )
 
@@ -168,7 +165,7 @@ trait MongoScope extends BeforeAfterWithinAround {
    * Inserts the test fixtures.
    */
   def before: Unit = {
-    import play.modules.reactivemongo.json._
+    import reactivemongo.play.json._
     Await.result(reactiveMongoAPI.database.flatMap { db =>
       Future.sequence(fixtures.flatMap {
         case (c, files) =>
@@ -186,7 +183,7 @@ trait MongoScope extends BeforeAfterWithinAround {
    */
   def after: Unit = {
     Await.result(reactiveMongoAPI.database.flatMap { db =>
-      db.runCommand(DropDatabase, FailoverStrategy.default)
+      db.drop()
     }, Duration(60, SECONDS))
   }
 }