Merge commit 'd99107e94b12fa9715f3c5f213d633b410c64699' into 2.13.x

Author: SethTisue

build.sbt

@@ -46,11 +46,11 @@ lazy val root = (project in file(".")).
 
     OsgiKeys.privatePackage := List("scala.concurrent.java8.*"),
 
-    libraryDependencies += "junit" % "junit" % "4.11" % "test",
+    libraryDependencies += "junit" % "junit" % "4.12" % "test",
 
-    libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.4" % "test",
+    libraryDependencies += "org.apache.commons" % "commons-lang3" % "3.8.1" % "test",
 
-    libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test",
+    libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
 
     mimaPreviousVersion := None,
 
@@ -95,12 +95,7 @@ lazy val root = (project in file(".")).
         sys.error("Java 8 or higher is required for this project.")
     },
 
-    publishArtifact in packageDoc := !disableDocs,
-
-    sources in (Compile, doc) := {
-      val orig = (sources in (Compile, doc)).value
-      orig.filterNot(_.getName.endsWith(".java")) // raw types not cooked by scaladoc: https://issues.scala-lang.org/browse/SI-8449
-    }
+    publishArtifact in packageDoc := !disableDocs
   ).
   settings(
     (inConfig(JavaDoc)(Defaults.configSettings) ++ (if (disableDocs) Nil else Seq(

project/plugins.sbt

@@ -1,3 +1,8 @@
-scalacOptions += "-Xfatal-warnings"
+scalacOptions ++= (sys.props("java.specification.version") match {
+  // work around weird dbuild thing for JDK 12 community build; see
+  // https://github.com/scala/community-builds/issues/862#issuecomment-464227096
+  case "12" => Seq()
+  case _ => Seq("-Xfatal-warnings")
+})
 
 addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")

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

@@ -11,7 +11,7 @@ import scala.concurrent.impl.Promise.DefaultPromise
 import scala.util.{ Try, Success, Failure }
 import java.util.function.{ BiConsumer, Function ⇒ JF, Consumer, BiFunction }
 
-// TODO: make thie private[scala] when genjavadoc allows for that.
+// TODO: make this private[scala] when genjavadoc allows for that.
 object FuturesConvertersImpl {
   def InternalCallbackExecutor = Future.InternalCallbackExecutor