Upgrades various dependencies for 2.12

playframework · Nov 16, 2016 · 2ee4e03 · 2ee4e03
1 parent 0973e37
commit 2ee4e03
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 27 deletions.
diff --git a/framework/project/BuildSettings.scala b/framework/project/BuildSettings.scala
@@ -56,6 +56,14 @@ object BuildSettings {
         Resolver.typesafeRepo("releases"),
         Resolver.typesafeIvyRepo("releases")
       ),
+      scalacOptions in(Compile, doc) := {
+        // disable the new scaladoc feature for scala 2.12.0, might be removed in 2.12.0-1 (https://github.com/scala/scala-dev/issues/249)
+        if (scalaVersion.value == "2.12.0") {
+          Seq("-no-java-comments")
+        } else {
+          Seq()
+        }
+      },
       fork in Test := true,
       parallelExecution in Test := false,
       testListeners in (Test,test) := Nil,

diff --git a/framework/project/Dependencies.scala b/framework/project/Dependencies.scala
@@ -7,7 +7,7 @@ import buildinfo.BuildInfo
 object Dependencies {
 
   val akkaVersion = "2.4.12"
-  val akkaHttpVersion = "2.4.11"
+  val akkaHttpVersion = "10.0.0-RC2"
 
   val specsVersion = "3.8.6"
   val specsBuild = Seq(
@@ -55,7 +55,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"
   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
@@ -145,8 +145,7 @@ object Dependencies {
   val nettyUtilsDependencies = slf4j
 
   val akkaHttp = Seq(
-    "com.typesafe.akka" %% "akka-http-core" % akkaHttpVersion,
-    "com.typesafe.akka" %% "akka-http-experimental" % akkaHttpVersion
+    "com.typesafe.akka" %% "akka-http" % akkaHttpVersion
   )
 
   def routesCompilerDependencies(scalaVersion: String) = Seq(
@@ -203,8 +202,9 @@ object Dependencies {
     "org.webjars" % "prettify" % "4-Mar-2013" % "webjars"
   )
 
+  val playDocVersion = "1.7.0"
   val playDocsDependencies = Seq(
-    "com.typesafe.play" %% "play-doc" % "1.6.1-SNAPSHOT"
+    "com.typesafe.play" %% "play-doc" % playDocVersion
   ) ++ playdocWebjarDependencies
 
   val streamsDependencies = Seq(
@@ -257,7 +257,7 @@ object Dependencies {
     mockitoAll % Test
 
   val playDocsSbtPluginDependencies = Seq(
-    "com.typesafe.play" %% "play-doc" % "1.3.0"
+    "com.typesafe.play" %% "play-doc" % playDocVersion
   )
 
 }
diff --git a/framework/project/plugins.sbt b/framework/project/plugins.sbt
@@ -16,7 +16,7 @@ logLevel := Level.Warn
 
 scalacOptions ++= Seq("-deprecation", "-language:_")
 
-addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay.version", "1.3.0-SNAPSHOT"))
+addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.getOrElse("interplay.version", "1.3.0"))
 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
@@ -3,19 +3,16 @@
  */
 package play.runsupport
 
+import java.io.File
 import java.net.URLClassLoader
-import java.util.List
 import java.util.Locale
 
-import sbt._
 import sbt.Path._
+import sbt._
 
-import scala.collection.JavaConversions
 import scala.reflect.ClassTag
-import scala.util.{ Properties, Try }
 import scala.util.control.NonFatal
-import java.io.File
-import java.util.concurrent.Callable
+import scala.util.{ Properties, Try }
 
 /**
  * A service that can watch files
@@ -30,17 +27,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 })
-  }
-
 }
 
 /**
@@ -150,7 +136,7 @@ private[play] class JNotifyFileWatchService(delegate: JNotifyFileWatchService.JN
 
 private object JNotifyFileWatchService {
 
-  import java.lang.reflect.{ Method, InvocationHandler, Proxy }
+  import java.lang.reflect.{ InvocationHandler, Method, Proxy }
 
   /**
    * Captures all the reflection invocations in one place.
@@ -349,10 +335,10 @@ private[play] class OptionalFileWatchServiceDelegate(val watchService: Try[FileW
  * mbean operation, so that the value can be retrieved.
  */
 private[runsupport] object GlobalStaticVar {
-  import javax.management._
-  import javax.management.modelmbean._
   import java.lang.management._
   import java.util.concurrent.atomic.AtomicReference
+  import javax.management._
+  import javax.management.modelmbean._
 
   private def objectName(name: String) = {
     new ObjectName(":type=GlobalStaticVar,name=" + name)