Remove MediatorWorkaroundPlugin (#9917)

Remove MediatorWorkaroundPlugin
playframework · Dec 17, 2019 · d0f53a1 · d0f53a1
2 parents c335189 + bc237fe
commit d0f53a1
Show file tree

Hide file tree

Showing 27 changed files with 2 additions and 83 deletions.
diff --git a/...ode/sbt-plugin/src/main/scala-sbt-0.13/play/sbt/test/MediatorWorkaroundPluginCompat.scala b/...ode/sbt-plugin/src/main/scala-sbt-0.13/play/sbt/test/MediatorWorkaroundPluginCompat.scala
diff --git a/...mode/sbt-plugin/src/main/scala-sbt-1.0/play/sbt/test/MediatorWorkaroundPluginCompat.scala b/...mode/sbt-plugin/src/main/scala-sbt-1.0/play/sbt/test/MediatorWorkaroundPluginCompat.scala
diff --git a/dev-mode/sbt-plugin/src/main/scala/play/sbt/test/MediatorWorkaroundPlugin.scala b/dev-mode/sbt-plugin/src/main/scala/play/sbt/test/MediatorWorkaroundPlugin.scala
diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/basic-service-with-routes-file/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/basic-service-with-routes-file/build.sbt
@@ -5,7 +5,6 @@
 lazy val root = (project in file("."))
   .enablePlugins(PlayService)
   .enablePlugins(RoutesCompiler)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/basic-service/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/basic-service/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayService)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/dev-mode/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/dev-mode/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/disabled-assets-jar/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/disabled-assets-jar/build.sbt
@@ -7,7 +7,6 @@ import com.typesafe.sbt.packager.Keys.executableScriptName
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     name := "assets-sample",
     version := "1.0-SNAPSHOT",

diff --git a/...mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/build.sbt b/...mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     name := "dist-no-documentation-sample",
     version := "1.0-SNAPSHOT",

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     name := "dist-sample",
     version := "1.0-SNAPSHOT",

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-false/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-false/build.sbt
@@ -8,7 +8,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-true/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-true/build.sbt
@@ -8,7 +8,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-multiple-databases/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-multiple-databases/build.sbt
@@ -8,7 +8,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/generated-keystore/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/generated-keystore/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayService)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/http-backend-system-property/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/http-backend-system-property/build.sbt
@@ -2,7 +2,7 @@
 // Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
 //
 
-lazy val root = (project in file(".")).enablePlugins(PlayScala).enablePlugins(MediatorWorkaroundPlugin)
+lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
 name := "http-backend-system-property"
 

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject-assets/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject-assets/build.sbt
@@ -7,7 +7,6 @@ import com.typesafe.sbt.packager.Keys.executableScriptName
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .dependsOn(module)
   .aggregate(module)
   .settings(
@@ -20,9 +19,7 @@ lazy val root = (project in file("."))
     excludeFilter in (Assets, LessKeys.less) := "_*.less"
   )
 
-lazy val module = (project in file("module"))
-  .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
+lazy val module = (project in file("module")).enablePlugins(PlayScala)
 
 TaskKey[Unit]("unzipAssetsJar") := {
   IO.unzip(

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject/build.sbt
@@ -4,20 +4,17 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .dependsOn(playmodule, nonplaymodule)
   .settings(common: _*)
 
 lazy val playmodule = (project in file("playmodule"))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .dependsOn(transitive)
   .settings(common: _*)
 
 // A transitive dependency of playmodule, to check that we are pulling in transitive deps
 lazy val transitive = (project in file("transitive"))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(common: _*)
 
 // A non play module, to check that play settings that are not defined don't cause errors

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/nested-secret/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/nested-secret/build.sbt
@@ -7,7 +7,6 @@ import com.typesafe.config.ConfigFactory
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     name := "secret-sample",
     version := "1.0-SNAPSHOT",

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/play-position-mapper/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/play-position-mapper/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     name := "secret-sample",
     version := "1.0-SNAPSHOT",

diff --git a/...st/play-sbt-plugin/routes-compiler-aggregate-reverse-routes-with-request-passed/build.sbt b/...st/play-sbt-plugin/routes-compiler-aggregate-reverse-routes-with-request-passed/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(a, c)
   .aggregate(common, a, b, c, nonplay)
@@ -21,7 +20,6 @@ def commonSettings: Seq[Setting[_]] = Seq(
 
 lazy val common = (project in file("common"))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .settings(
     aggregateReverseRoutes := Seq(a, b, c)
@@ -32,18 +30,15 @@ lazy val nonplay = (project in file("nonplay"))
 
 lazy val a: Project = (project in file("a"))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(nonplay, common)
 
 lazy val b: Project = (project in file("b"))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(common)
 
 lazy val c: Project = (project in file("c"))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(b)
diff --git a/...bt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-aggregate-reverse-routes/build.sbt b/...bt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-aggregate-reverse-routes/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(a, c)
   .aggregate(common, a, b, c, nonplay)
@@ -21,7 +20,6 @@ def commonSettings: Seq[Setting[_]] = Seq(
 
 lazy val common = (project in file("common"))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .settings(
     aggregateReverseRoutes := Seq(a, b, c)
@@ -32,18 +30,15 @@ lazy val nonplay = (project in file("nonplay"))
 
 lazy val a: Project = (project in file("a"))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(nonplay, common)
 
 lazy val b: Project = (project in file("b"))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(common)
 
 lazy val c: Project = (project in file("c"))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(commonSettings: _*)
   .dependsOn(b)
diff --git a/...sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-incremental-compilation/build.sbt b/...sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-incremental-compilation/build.sbt
@@ -3,7 +3,6 @@
 //
 lazy val root = (project in file("."))
   .enablePlugins(RoutesCompiler)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     scalaVersion := sys.props("scala.version"),
     updateOptions := updateOptions.value.withLatestSnapshots(false),

diff --git a/...play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/build.sbt b/...play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/build.sbt
@@ -3,7 +3,6 @@
 //
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
-  .enablePlugins(MediatorWorkaroundPlugin)
 
 libraryDependencies ++= Seq(guice, specs2 % Test)
 

diff --git a/...plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/build.sbt b/...plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/build.sbt
@@ -3,7 +3,6 @@
 //
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
 
 libraryDependencies ++= Seq(guice, specs2 % Test)
 

diff --git a/.../sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/build.sbt b/.../sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/build.sbt
@@ -3,7 +3,6 @@
 //
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
 
 libraryDependencies ++= Seq(guice, specs2 % Test)
 

diff --git a/...mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/build.sbt b/...mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/build.sbt
@@ -3,7 +3,6 @@
 //
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
 
 libraryDependencies ++= Seq(guice, specs2 % Test)
 

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-source-mapping/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-source-mapping/build.sbt
@@ -6,7 +6,6 @@ import scala.reflect.{ ClassTag, classTag }
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
 
 libraryDependencies += guice
 

diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/secret/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/secret/build.sbt
@@ -4,7 +4,6 @@
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
-  .enablePlugins(MediatorWorkaroundPlugin)
   .settings(
     name := "secret-sample",
     version := "1.0-SNAPSHOT",