play-2.12.0-RC2 patch

play-2.12.patch

diff --git a/framework/project/Build.scala b/framework/project/Build.scala
index 4f6a639..872b74e 100644
--- a/framework/project/Build.scala
+++ b/framework/project/Build.scala
@@ -51,7 +51,6 @@ object BuildSettings {
    * These settings are used by all projects
    */
   def playCommonSettings: Seq[Setting[_]] = {
-
     scalariformSettings ++ Seq(
       ScalariformKeys.preferences := ScalariformKeys.preferences.value
         .setPreference(SpacesAroundMultiImports, true)
@@ -81,6 +80,14 @@ object BuildSettings {
         }.get // fail hard if not found
         file(rtJar) -> url(Docs.javaApiUrl)
       },
+      scalacOptions in(Compile, doc) := {
+        // disable the new scaladoc feature for scala 2.12.0-RC2, might be removed in 2.12.0-1 (https://github.com/scala/scala-dev/issues/249)
+        if (scalaVersion.value == "2.12.0-RC2") {
+          Seq("-no-java-comments")
+        } else {
+          Seq()
+        }
+      },
       apiMappings ++= {
         // Finds appropriate scala apidoc from dependencies when autoAPIMappings are insufficient.
         // See the following:
diff --git a/framework/project/Dependencies.scala b/framework/project/Dependencies.scala
index 3d0e7ba..4e9e9d8 100644
--- a/framework/project/Dependencies.scala
+++ b/framework/project/Dependencies.scala
@@ -6,9 +6,9 @@ import buildinfo.BuildInfo
 
 object Dependencies {
 
-  val akkaVersion = "2.4.10"
+  val akkaVersion = "2.4.11"
 
-  val specsVersion = "3.8.5"
+  val specsVersion = "3.8.5.1"
   val specsBuild = Seq(
     "specs2-core",
     "specs2-junit",
@@ -54,7 +54,7 @@ object Dependencies {
     "org.hibernate" % "hibernate-entitymanager" % "5.1.0.Final" % "test"
   )
 
-  val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0-RC7"
+  val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0-RC8"
   def scalaParserCombinators(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
     case Some((2, major)) if major >= 11 => Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4")
     case _ => Nil
@@ -169,7 +169,7 @@ object Dependencies {
 
   // use partial version so that non-standard scala binary versions from dbuild also work
   def sbtIO(sbtVersion: String, scalaVersion: String): ModuleID = CrossVersion.partialVersion(scalaVersion) match {
-    case Some((2, major)) if major >= 11 => "org.scala-sbt" %% "io" % "0.13.11" % "provided"
+    case Some((2, major)) if major >= 11 => "org.scala-sbt" %% "io" % "0.13.13-RC3" % "provided"
     case _ => "org.scala-sbt" % "io" % sbtVersion % "provided"
   }
 
@@ -203,7 +203,7 @@ object Dependencies {
   )
 
   val playDocsDependencies = Seq(
-    "com.typesafe.play" %% "play-doc" % "1.6.0"
+    "com.typesafe.play" %% "play-doc" % "1.6.1-SNAPSHOT"
   ) ++ playdocWebjarDependencies
 
   val streamsDependencies = Seq(
diff --git a/framework/project/build.properties b/framework/project/build.properties
index d6b4f5b..bcd05d4 100644
--- a/framework/project/build.properties
+++ b/framework/project/build.properties
@@ -1,4 +1,4 @@
 #
 # Copyright (C) 2009-2016 Lightbend Inc. <https://www.lightbend.com>
 #
-sbt.version=0.13.11
+sbt.version=0.13.13-RC3
diff --git a/framework/project/plugins.sbt b/framework/project/plugins.sbt
index bd26b94..a0ec1af 100644
--- a/framework/project/plugins.sbt
+++ b/framework/project/plugins.sbt
@@ -5,7 +5,7 @@ buildInfoSettings
 sourceGenerators in Compile <+= buildInfo
 
 val sbtNativePackagerVersion = "1.1.1"
-val sbtTwirlVersion = sys.props.getOrElse("twirl.version", "1.2.0")
+val sbtTwirlVersion = sys.props.getOrElse("twirl.version", "1.2.1-SNAPSHOT")
 
 buildInfoKeys := Seq[BuildInfoKey](
   "sbtNativePackagerVersion" -> sbtNativePackagerVersion,
@@ -16,7 +16,7 @@ logLevel := Level.Warn
 
 scalacOptions ++= Seq("-deprecation", "-language:_")
 
-addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay.version", "1.1.2"))
+addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay.version", "1.2.1-SNAPSHOT"))
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % sbtTwirlVersion)
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8")
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
diff --git a/framework/src/run-support/src/main/scala/play/runsupport/FileWatchService.scala b/framework/src/run-support/src/main/scala/play/runsupport/FileWatchService.scala
index 404aadf..6ab4fc2 100644
--- a/framework/src/run-support/src/main/scala/play/runsupport/FileWatchService.scala
+++ b/framework/src/run-support/src/main/scala/play/runsupport/FileWatchService.scala
@@ -30,17 +30,6 @@ trait FileWatchService {
    */
   def watch(filesToWatch: Seq[File], onChange: () => Unit): FileWatcher
 
-  /**
-   * Watch the given sequence of files or directories.
-   *
-   * @param filesToWatch The files to watch.
-   * @param onChange A callback that is executed whenever something changes.
-   * @return A watcher
-   */
-  def watch(filesToWatch: List[File], onChange: Callable[Void]): FileWatcher = {
-    watch(JavaConversions.asScalaBuffer(filesToWatch), () => { onChange.call })
-  }
-
 }
 
 /**