Merge pull request #756 from mkurz/scala_3.3.1-RC4

Try Scala 3.3.1-RC4
playframework · Jul 16, 2023 · 2024fa6 · 2024fa6
2 parents b9b843d + a0dea4a
commit 2024fa6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -19,9 +19,9 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
 lazy val commonSettings = Seq(
   // Work around https://issues.scala-lang.org/browse/SI-9311
   scalacOptions ~= (_.filterNot(_ == "-Xfatal-warnings")),
-  scalaVersion       := "2.13.11",               // scala213,
-  crossScalaVersions := Seq("2.13.11", "3.3.0"), // scala213,
-  pomExtra           := scala.xml.NodeSeq.Empty, // Can be removed when dropping interplay
+  scalaVersion       := "2.13.11",                   // scala213,
+  crossScalaVersions := Seq("2.13.11", "3.3.1-RC4"), // scala213,
+  pomExtra           := scala.xml.NodeSeq.Empty,     // Can be removed when dropping interplay
   developers += Developer(
     "playframework",
     "The Play Framework Contributors",

diff --git a/src/core/src/test/scala/play/api/db/slick/DefaultSlickApiSpec.scala b/src/core/src/test/scala/play/api/db/slick/DefaultSlickApiSpec.scala
@@ -16,10 +16,10 @@ class DefaultSlickApiSpec extends Specification { self =>
   // A new injector should be created to ensure each test is independent of each other
   def injector: Injector = GuiceApplicationBuilder(configuration = TestData.configuration).injector()
 
-  def hooks(lifecycle: DefaultApplicationLifecycle): Array[_] = {
+  def hooks(lifecycle: DefaultApplicationLifecycle): Seq[_] = {
     val hooksField = lifecycle.getClass.getDeclaredField("hooks")
     hooksField.setAccessible(true)
-    hooksField.get(lifecycle).asInstanceOf[ConcurrentLinkedDeque[_]].toArray()
+    hooksField.get(lifecycle).asInstanceOf[ConcurrentLinkedDeque[_]].toArray().toSeq
   }
 
   "DefaultSlickApi" should {