Merge branch 'main' into update/htmlunit-driver-4.13.0

playframework · Oct 22, 2023 · 547ea4b · 547ea4b
2 parents 738523e + 42cb246
commit 547ea4b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git 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.13.0"
 val MockitoVersion           = "4.6.1"
 val CssParserVersion         = "1.14.0"
@@ -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
@@ -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
@@ -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
@@ -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/...le/src/test/scala/org/scalatestplus/play/OneServerPerSuiteWithConfiguredBrowserSpec.scala b/...le/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
@@ -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()