Add Scala 2.12.0-M2 as a cross build

.travis.yml

@@ -12,7 +12,8 @@ env:
 script:
   - admin/build.sh
 scala:
-  - 2.11.6
+  - 2.11.7
+  - 2.12.0-M2
 jdk:
   - oraclejdk8
 notifications:

build.sbt

@@ -9,7 +9,8 @@ def jwrite(dir: java.io.File)(name: String, content: String) = {
 }
 
 lazy val commonSettings = Seq(
-  scalaVersion := "2.11.6",
+  scalaVersion := "2.11.7",
+  crossScalaVersions := List("2.11.7", "2.12.0-M2"),
   organization := "org.scala-lang.modules",
   version := "0.6.0-SNAPSHOT",
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
@@ -100,8 +101,8 @@ lazy val root = (project in file(".")).
       },
       javacOptions in JavaDoc := Seq(),
       artifactName in packageDoc in JavaDoc := ((sv, mod, art) => "" + mod.name + "_" + sv.binary + "-" + mod.revision + "-javadoc.jar"),
-      libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.8" cross CrossVersion.full),
-      scalacOptions in Compile <+= target map (t => "-P:genjavadoc:out=" + (t / "java"))
+      libraryDependencies += compilerPlugin("com.typesafe.genjavadoc" % "genjavadoc-plugin" % "0.9" cross CrossVersion.full),
+      scalacOptions in Compile += "-P:genjavadoc:out=" + (target.value / "java")
     ))): _*
   ).
   settings(

src/main/scala/scala/compat/java8/FutureConverters.scala

@@ -71,8 +71,14 @@ object FutureConverters {
    * @return a Scala Future that represents the CompletionStage's completion
    */
   def toScala[T](cs: CompletionStage[T]): Future[T] = {
-    val p = new P[T]
-    cs whenComplete p
+    val p = Promise[T]()
+    val bc = new BiConsumer[T, Throwable] {
+      override def accept(v: T, e: Throwable): Unit = {
+        if (e == null) p.complete(Success(v))
+        else p.complete(Failure(e))
+      }
+    }
+    cs whenComplete bc
     p.future
   }
 

src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala

@@ -71,11 +71,4 @@ object FuturesConvertersImpl {
 
     override def toString: String = super[CompletableFuture].toString
   }
-
-  class P[T] extends impl.Promise.DefaultPromise[T] with BiConsumer[T, Throwable] {
-    override def accept(v: T, e: Throwable): Unit = {
-      if (e == null) complete(Success(v))
-      else complete(Failure(e))
-    }
-  }
 }