Upgrade Scala version to 2.12.1

bson/src/main/scala/com/github/jeroenr/bson/BsonDocument.scala

@@ -2,9 +2,7 @@ package com.github.jeroenr.bson
 
 import akka.util.{ByteString, ByteStringBuilder}
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.element.{BsonNullValue, BsonNull, BsonElement, BsonObject}
-
-import language.postfixOps
+import com.github.jeroenr.bson.element.{BsonElement, BsonNullValue, BsonObject}
 
 case class BsonDocument(private val elems: BsonElement*) extends BsonValue {
 

bson/src/main/scala/com/github/jeroenr/bson/reader/BsonDocumentReader.scala

@@ -28,7 +28,7 @@ object BsonDocumentReader extends Reader[BsonDocument] {
 
   override def read(buffer: ByteBuffer): Option[BsonDocument] = {
     val elements: ArrayBuffer[Option[BsonElement]] = new ArrayBuffer[Option[BsonElement]]
-    val size = buffer.getInt()
+    buffer.getInt()
 
     breakable {
       while (buffer.hasRemaining) {

bson/src/test/scala/com/github/jeroenr/bson/BsonDslSpec.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.bson
 
-import BsonDsl._
-import com.github.jeroenr.bson.Implicits.{BsonValueArray, BsonValueString}
+import com.github.jeroenr.bson.BsonDsl._
+import com.github.jeroenr.bson.Implicits.BsonValueString
 import org.scalatest.{Matchers, WordSpec}
 
 class BsonDslSpec extends WordSpec with Matchers {

build.sbt

@@ -2,7 +2,7 @@ import ReleaseTransformations._
 
 lazy val commonSettings = Seq(
   organization := "com.github.jeroenr",
-  scalaVersion := "2.11.7",
+  scalaVersion := "2.12.1",
   scalacOptions := Seq(
     "-deprecation",
     "-encoding", "UTF-8", // yes, this is 2 args

pide/src/main/scala/com/github/jeroenr/pide/Dao.scala

@@ -3,8 +3,8 @@ package com.github.jeroenr.pide
 import akka.actor.ActorRef
 import akka.stream.scaladsl.Source
 import akka.util.Timeout
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 import com.github.jeroenr.tepkin.MongoCollection
 import com.github.jeroenr.tepkin.protocol.WriteConcern
 import com.github.jeroenr.tepkin.protocol.result.{InsertResult, UpdateResult}

pide/src/main/scala/com/github/jeroenr/pide/Pide.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.pide
 
 import com.github.jeroenr.bson.Implicits._
-import com.github.jeroenr.bson.{BsonDocument, BsonValue, Implicits}
+import com.github.jeroenr.bson.{BsonDocument, BsonValue}
 
 trait Pide[ID, E <: Entity[ID]] {
 

project/Dependencies.scala

@@ -1,5 +1,5 @@
 object Dependencies {
   val akkaV = "2.4.17"
   val akkaStreamV = "2.4.17"
-  val scalatestV = "2.2.4"
+  val scalatestV = "3.0.1"
 }

tepkin/build.sbt

@@ -1,13 +1,12 @@
 name := "tepkin"
 
 libraryDependencies ++= Seq(
-  "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.3",
+  "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.5",
   "com.typesafe.akka" %% "akka-actor" % Dependencies.akkaV,
   "com.typesafe.akka" %% "akka-stream" % Dependencies.akkaStreamV,
   "org.slf4j" % "slf4j-api" % "1.7.5",
   "ch.qos.logback" % "logback-classic" % "1.0.13" % Test,
   "org.scalatest" %% "scalatest" % Dependencies.scalatestV % Test,
-  "com.github.simplyscala" %% "scalatest-embedmongo" % "0.2.2" % Test intransitive(),
+  "com.github.simplyscala" %% "scalatest-embedmongo" % "0.2.4" % Test intransitive(),
   "de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "1.50.2" % Test
-//  "com.github.simplyscala" %% "scalatest-embedmongo" % "0.2.2" % Test exclude("de.flapdoodle.embed","de.flapdoodle.embedmongo")
 )

tepkin/src/main/scala/com/github/jeroenr/tepkin/GridFs.scala

@@ -7,12 +7,12 @@ import akka.actor.ActorRef
 import akka.stream.Materializer
 import akka.stream.scaladsl.{FileIO, Source}
 import akka.util.{ByteString, Timeout}
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
 import com.github.jeroenr.bson.Implicits._
 import com.github.jeroenr.bson.element.BinarySubtype.Generic
-import com.github.jeroenr.bson.element.{BinarySubtype, BsonObjectId}
+import com.github.jeroenr.bson.element.BsonObjectId
 import com.github.jeroenr.bson.util.Converters
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl, Implicits}
 import com.github.jeroenr.tepkin.GridFs.Chunk
 import com.github.jeroenr.tepkin.protocol.command.Index
 import com.github.jeroenr.tepkin.protocol.result.DeleteResult

tepkin/src/main/scala/com/github/jeroenr/tepkin/MongoClientUriParser.scala

@@ -30,15 +30,15 @@ object MongoClientUriParser extends RegexParsers {
   }
 
   def credentials: Parser[MongoCredentials] = credential ~ opt(":" ~ credential) ^^ {
-    case username ~ None =>
-      MongoCredentials(username = username)
     case username ~ Some(":" ~ password) =>
       MongoCredentials(username = username, password = Some(password))
+    case username ~ _ =>
+      MongoCredentials(username = username)
   }
 
   def host: Parser[InetSocketAddress] = hostName ~ opt(":" ~ port) ^^ {
-    case hostName ~ None => new InetSocketAddress(hostName, 27017)
     case hostName ~ Some(":" ~ port) => new InetSocketAddress(hostName, port)
+    case hostName ~ _ => new InetSocketAddress(hostName, 27017)
   }
 
   def uri: Parser[MongoClientUri] = {

tepkin/src/main/scala/com/github/jeroenr/tepkin/MongoCursor.scala

@@ -9,6 +9,8 @@ import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.tepkin.TepkinMessage.{CursorClosed, CursorOpened, Fetch}
 import com.github.jeroenr.tepkin.protocol.message.{GetMoreMessage, KillCursorsMessage, Message, Reply}
 
+import scala.util.{Failure, Success}
+
 /**
  * Represents a cursor to read data from Mongo. This actor is an ActorPublisher so it can be passed directly to a
  * `akka.stream.scaladsl.Source`
@@ -31,8 +33,9 @@ class MongoCursor(pool: ActorRef,
 
   import context.dispatcher
 
-  pool.?(message)(timeout).pipeTo(self).onFailure {
-    case cause: Throwable => onErrorThenStop(cause)
+  pool.?(message)(timeout).pipeTo(self).onComplete {
+    case Failure(cause) => onErrorThenStop(cause)
+    case Success(_) => ()
   }
 
   override def receive: Receive = {

tepkin/src/main/scala/com/github/jeroenr/tepkin/auth/ScramSha1Authentication.scala

@@ -7,7 +7,7 @@ import com.github.jeroenr.bson.BsonDsl._
 import com.github.jeroenr.bson.Implicits._
 import com.github.jeroenr.bson.element.BinarySubtype
 import com.github.jeroenr.bson.util.Converters
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl, BsonValueNumber, Implicits}
+import com.github.jeroenr.bson.{BsonDocument, BsonValueNumber}
 import com.github.jeroenr.tepkin.MongoCredentials
 import com.github.jeroenr.tepkin.protocol.command.Command
 import com.github.jeroenr.tepkin.protocol.message.Reply

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/Authenticate.scala

@@ -1,9 +1,8 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.util.Converters
 import com.github.jeroenr.bson.util.Converters.md5Hex
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 case class Authenticate(databaseName: String,
                         username: String,

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/Distinct.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 /**
  * Finds the distinct values for a specified field across a single collection.

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/Drop.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 /**
  * Removes an entire collection from a database.

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/FindAndModify.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 /**
  * The findAndModify command modifies and returns a single document. By default, the returned document does not include

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/GetNonce.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 /**
  * Use getnonce to generate a one-time password for authentication.

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/IsMaster.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 case object IsMaster extends AdminCommand {
   override val command: BsonDocument = "isMaster" := 1

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/ListCollections.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 /**
  * Retrieve information, i.e. the name and options, about the collections in a database.

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/ListIndexes.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 case class ListIndexes(databaseName: String,
                        collectionName: String) extends Command {

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/command/Logout.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.command
 
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 
 /**
  * Terminates the current authenticated session

tepkin/src/main/scala/com/github/jeroenr/tepkin/protocol/result/DistinctResult.scala

@@ -1,7 +1,7 @@
 package com.github.jeroenr.tepkin.protocol.result
 
 import com.github.jeroenr.bson.Implicits.BsonValueArray
-import com.github.jeroenr.bson.{BsonDocument, BsonValue, BsonValueNumber, Implicits}
+import com.github.jeroenr.bson.{BsonDocument, BsonValue, BsonValueNumber}
 
 case class DistinctResult(ok: Boolean,
                           values: Seq[BsonValue],

tepkin/src/test/scala/com/github/jeroenr/tepkin/GridFsSpec.scala

@@ -8,8 +8,7 @@ import akka.util.Timeout
 import com.github.jeroenr.bson.BsonDsl._
 import com.github.jeroenr.bson.Implicits._
 import com.github.jeroenr.bson.util.Converters
-import com.github.jeroenr.bson.{BsonDsl, Implicits}
-import com.github.simplyscala.{MongodProps, MongoEmbedDatabase}
+import com.github.simplyscala.MongoEmbedDatabase
 import org.scalatest._
 import org.scalatest.concurrent.ScalaFutures
 

tepkin/src/test/scala/com/github/jeroenr/tepkin/MongoCollectionSpec.scala

@@ -3,12 +3,11 @@ package com.github.jeroenr.tepkin
 import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.Source
 import akka.util.Timeout
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
 import com.github.jeroenr.bson.Implicits._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl, Implicits}
 import com.github.jeroenr.tepkin.protocol.command.Index
 import com.github.jeroenr.tepkin.protocol.exception.{OperationException, WriteException}
-import com.github.simplyscala.{MongodProps, MongoEmbedDatabase}
 import org.scalatest._
 import org.scalatest.concurrent.ScalaFutures
 

tepkin/src/test/scala/com/github/jeroenr/tepkin/protocol/CommandSpec.scala

@@ -3,8 +3,8 @@ package com.github.jeroenr.tepkin.protocol
 import java.nio.ByteOrder
 
 import akka.util.ByteString
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 import com.github.jeroenr.tepkin.protocol.command._
 import org.scalatest.{FlatSpec, Matchers}
 

tepkin/src/test/scala/com/github/jeroenr/tepkin/protocol/MessageSpec.scala

@@ -3,8 +3,8 @@ package com.github.jeroenr.tepkin.protocol
 import java.nio.ByteOrder
 
 import akka.util.ByteString
+import com.github.jeroenr.bson.BsonDocument
 import com.github.jeroenr.bson.BsonDsl._
-import com.github.jeroenr.bson.{BsonDocument, BsonDsl}
 import com.github.jeroenr.tepkin.protocol.message._
 import org.scalatest.{FlatSpec, Matchers}