Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove MediatorWorkaroundPlugin #9917

Merged
merged 1 commit into from
Dec 17, 2019
Merged

Remove MediatorWorkaroundPlugin #9917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 0 additions & 15 deletions ...ode/sbt-plugin/src/main/scala-sbt-0.13/play/sbt/test/MediatorWorkaroundPluginCompat.scala
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...mode/sbt-plugin/src/main/scala-sbt-1.0/play/sbt/test/MediatorWorkaroundPluginCompat.scala
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions dev-mode/sbt-plugin/src/main/scala/play/sbt/test/MediatorWorkaroundPlugin.scala
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/basic-service-with-routes-file/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/basic-service/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/dev-mode/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/disabled-assets-jar/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion ...mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution-without-documentation/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)
.settings(
name := "dist-no-documentation-sample",
version := "1.0-SNAPSHOT",
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/distribution/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)
.settings(
name := "dist-sample",
version := "1.0-SNAPSHOT",
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-false/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-auto-apply-true/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/evolutions-multiple-databases/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/generated-keystore/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/http-backend-system-property/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
5 changes: 1 addition & 4 deletions dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject-assets/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
3 changes: 0 additions & 3 deletions dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/multiproject/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/nested-secret/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/play-position-mapper/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)
.settings(
name := "secret-sample",
version := "1.0-SNAPSHOT",
Expand Down
5 changes: 0 additions & 5 deletions ...st/play-sbt-plugin/routes-compiler-aggregate-reverse-routes-with-request-passed/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
5 changes: 0 additions & 5 deletions ...bt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-aggregate-reverse-routes/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
1 change: 0 additions & 1 deletion ...sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-incremental-compilation/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion ...play-sbt-plugin/routes-compiler-injected-routes-compilation-with-request-passed/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//
lazy val root = (project in file("."))
.enablePlugins(PlayJava)
.enablePlugins(MediatorWorkaroundPlugin)

libraryDependencies ++= Seq(guice, specs2 % Test)

Expand Down
1 change: 0 additions & 1 deletion ...plugin/src/sbt-test/play-sbt-plugin/routes-compiler-injected-routes-compilation/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//
lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)

libraryDependencies ++= Seq(guice, specs2 % Test)

Expand Down
1 change: 0 additions & 1 deletion .../sbt-test/play-sbt-plugin/routes-compiler-no-package-declaration-in-routes-file/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//
lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)

libraryDependencies ++= Seq(guice, specs2 % Test)

Expand Down
1 change: 0 additions & 1 deletion ...mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//
lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)

libraryDependencies ++= Seq(guice, specs2 % Test)

Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-source-mapping/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import scala.reflect.{ ClassTag, classTag }

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)

libraryDependencies += guice

Expand Down
1 change: 0 additions & 1 deletion dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/secret/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.enablePlugins(MediatorWorkaroundPlugin)
.settings(
name := "secret-sample",
version := "1.0-SNAPSHOT",
Expand Down