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.

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

[6.0.x] remove "-Xmigration" (backport #458) by @xuwei-k #462

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ lazy val `scalatestplus-play` = project
),
scalacOptions ++= Seq("-deprecation", "-feature", "-unchecked", "-encoding", "utf8") ++
(CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 13)) => Seq("-Xsource:3", "-Xmigration")
case Some((2, 13)) => Seq("-Xsource:3")
case _ => Seq.empty
}),
javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options", "--release", "11"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ConfiguredAppSpec extends UnitSpec with SequentialNestedSuiteExecution wit
}
}

override def nestedSuites = Vector(new NestedSuite)
override def nestedSuites: Vector[NestedSuite] = Vector(new NestedSuite)

override def fakeApplication(): Application = {
GuiceApplicationBuilder().configure("foo" -> "bar").build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import play.api.inject.guice._

class ConfiguredServerSpec extends UnitSpec with SequentialNestedSuiteExecution with GuiceOneServerPerSuite {

override def nestedSuites = Vector(new ConfiguredServerNestedSuite)
override def nestedSuites: Vector[ConfiguredServerNestedSuite] = Vector(new ConfiguredServerNestedSuite)

override def fakeApplication(): Application = {
GuiceApplicationBuilder().configure("foo" -> "bar").build()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class ConfiguredServerWithConfiguredBrowserSpec
with OneBrowserPerSuite
with HtmlUnitFactory {

override def nestedSuites = Vector(new ConfiguredServerWithConfiguredBrowserNestedSpec)
override def nestedSuites: Vector[ConfiguredServerWithConfiguredBrowserNestedSpec] =
Vector(new ConfiguredServerWithConfiguredBrowserNestedSpec)

override def fakeApplication(): Application = {
GuiceApplicationBuilder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class OneServerPerSuiteWithConfiguredBrowserSpec
with OneBrowserPerSuite
with HtmlUnitFactory {

override def nestedSuites = Vector(new OneServerPerSuiteWithConfiguredBrowserNestedSpec)
override def nestedSuites: Vector[OneServerPerSuiteWithConfiguredBrowserNestedSpec] =
Vector(new OneServerPerSuiteWithConfiguredBrowserNestedSpec)

override def fakeApplication(): Application = {
GuiceApplicationBuilder()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class OneServerPerTestWithConfiguredBrowserSpec
with OneBrowserPerSuite
with HtmlUnitFactory {

override def nestedSuites = Vector(new OneServerPerTestWithConfiguredBrowserNestedSpec)
override def nestedSuites: Vector[OneServerPerTestWithConfiguredBrowserNestedSpec] =
Vector(new OneServerPerTestWithConfiguredBrowserNestedSpec)

override def fakeApplication(): Application = {
GuiceApplicationBuilder()
Expand Down
Loading