Merge pull request #10223 from mkurz/rm_outdated

Remove outdated code and comments
playframework · Apr 28, 2020 · 4827177 · 4827177
2 parents 27edeef + d9e5963
commit 4827177
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/core/play-streams/src/main/scala/play/api/libs/streams/Execution.scala b/core/play-streams/src/main/scala/play/api/libs/streams/Execution.scala
@@ -10,11 +10,7 @@ import scala.annotation.tailrec
 import scala.concurrent.ExecutionContext
 import scala.concurrent.ExecutionContextExecutor
 
-/**
- * Contains the default ExecutionContext used by Play.
- */
 private[play] object Execution {
-  def defaultExecutionContext: ExecutionContext = Implicits.trampoline
 
   object Implicits {
     implicit def trampoline: ExecutionContextExecutor = Execution.trampoline

diff --git a/core/play/src/main/scala/play/core/Execution.scala b/core/play/src/main/scala/play/core/Execution.scala
@@ -4,9 +4,6 @@
 
 package play.core
 
-/**
- * Provides access to Play's internal ExecutionContext.
- */
 private[play] object Execution {
   def trampoline = play.api.libs.streams.Execution.trampoline
 

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -223,6 +223,8 @@ object BuildSettings {
       ProblemFilters.exclude[ReversedMissingMethodProblem]("play.api.libs.typedmap.TypedMap.+"),
       ProblemFilters.exclude[ReversedMissingMethodProblem]("play.api.libs.typedmap.TypedMap.-"),
       ProblemFilters.exclude[IncompatibleMethTypeProblem]("play.api.libs.typedmap.DefaultTypedMap.-"),
+      // Remove outdated (internal) method
+      ProblemFilters.exclude[DirectMissingMethodProblem]("play.api.libs.streams.Execution.defaultExecutionContext"),
     ),
     unmanagedSourceDirectories in Compile += {
       val suffix = CrossVersion.partialVersion(scalaVersion.value) match {