From b693b3b5fe408b7908d77d69537d593ac223db25 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 15 Oct 2023 07:55:26 +0900 Subject: [PATCH 1/2] remove "-Xmigration" --- build.sbt | 2 +- .../test/scala/org/scalatestplus/play/ConfiguredAppSpec.scala | 2 +- .../scala/org/scalatestplus/play/ConfiguredServerSpec.scala | 2 +- .../play/ConfiguredServerWithConfiguredBrowserSpec.scala | 3 ++- .../play/OneServerPerSuiteWithConfiguredBrowserSpec.scala | 3 ++- .../play/OneServerPerTestWithConfiguredBrowserSpec.scala | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 9a432913..c6bb00c6 100644 --- a/build.sbt +++ b/build.sbt @@ -115,7 +115,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"), diff --git a/module/src/test/scala/org/scalatestplus/play/ConfiguredAppSpec.scala b/module/src/test/scala/org/scalatestplus/play/ConfiguredAppSpec.scala index be9e0a66..cb5a55fe 100644 --- a/module/src/test/scala/org/scalatestplus/play/ConfiguredAppSpec.scala +++ b/module/src/test/scala/org/scalatestplus/play/ConfiguredAppSpec.scala @@ -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() diff --git a/module/src/test/scala/org/scalatestplus/play/ConfiguredServerSpec.scala b/module/src/test/scala/org/scalatestplus/play/ConfiguredServerSpec.scala index ca513591..f2278379 100644 --- a/module/src/test/scala/org/scalatestplus/play/ConfiguredServerSpec.scala +++ b/module/src/test/scala/org/scalatestplus/play/ConfiguredServerSpec.scala @@ -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() diff --git a/module/src/test/scala/org/scalatestplus/play/ConfiguredServerWithConfiguredBrowserSpec.scala b/module/src/test/scala/org/scalatestplus/play/ConfiguredServerWithConfiguredBrowserSpec.scala index 93c197e2..781690d4 100644 --- a/module/src/test/scala/org/scalatestplus/play/ConfiguredServerWithConfiguredBrowserSpec.scala +++ b/module/src/test/scala/org/scalatestplus/play/ConfiguredServerWithConfiguredBrowserSpec.scala @@ -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() diff --git a/module/src/test/scala/org/scalatestplus/play/OneServerPerSuiteWithConfiguredBrowserSpec.scala b/module/src/test/scala/org/scalatestplus/play/OneServerPerSuiteWithConfiguredBrowserSpec.scala index 65f47d7d..0fcfb4ad 100644 --- a/module/src/test/scala/org/scalatestplus/play/OneServerPerSuiteWithConfiguredBrowserSpec.scala +++ b/module/src/test/scala/org/scalatestplus/play/OneServerPerSuiteWithConfiguredBrowserSpec.scala @@ -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() diff --git a/module/src/test/scala/org/scalatestplus/play/OneServerPerTestWithConfiguredBrowserSpec.scala b/module/src/test/scala/org/scalatestplus/play/OneServerPerTestWithConfiguredBrowserSpec.scala index 25ed24db..5d620f18 100644 --- a/module/src/test/scala/org/scalatestplus/play/OneServerPerTestWithConfiguredBrowserSpec.scala +++ b/module/src/test/scala/org/scalatestplus/play/OneServerPerTestWithConfiguredBrowserSpec.scala @@ -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() From 05325ba73687320a3f2b16d87da560902b369c08 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 17 Oct 2023 00:42:52 +0000 Subject: [PATCH 2/2] selenium-java 4.14.1 (was 4.12.1) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9a432913..2967e74a 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,7 @@ import sbt.util.{ Level => _, _ } import sbt.io.Path._ -val SeleniumVersion = "4.12.1" +val SeleniumVersion = "4.14.1" val SeleniumHtmlunitVersion = "4.12.0" val MockitoVersion = "4.6.1" val CssParserVersion = "1.14.0"