Explicitly define the return type of overridden bindings method

mkurz · mkurz · commit cf46644c56d8 · 2024-02-26T18:04:56.000+01:00
Otherwise Scala 2.13.13 will create wrong bytecode
diff --git a/core/play/src/main/scala/play/api/controllers/Assets.scala b/core/play/src/main/scala/play/api/controllers/Assets.scala
@@ -32,6 +32,7 @@ import org.apache.pekko.stream.scaladsl.StreamConverters
 import play.api._
 import play.api.http._
 import play.api.inject.ApplicationLifecycle
+import play.api.inject.Binding
 import play.api.inject.Module
 import play.api.libs._
 import play.api.mvc._
@@ -42,7 +43,7 @@ import play.utils.Resources
 import play.utils.UriEncoding
 
 class AssetsModule extends Module {
-  override def bindings(environment: Environment, configuration: Configuration) = Seq(
+  override def bindings(environment: Environment, configuration: Configuration): scala.collection.Seq[Binding[_]] = Seq(
     bind[Assets].toSelf,
     bind[AssetsMetadata].toProvider[AssetsMetadataProvider],
     bind[AssetsFinder].toProvider[AssetsFinderProvider],
diff --git a/core/play/src/main/scala/play/api/i18n/I18nModule.scala b/core/play/src/main/scala/play/api/i18n/I18nModule.scala
@@ -5,12 +5,13 @@
 package play.api.i18n
 
 import play.api.http.HttpConfiguration
+import play.api.inject.Binding
 import play.api.inject.Module
 import play.api.Configuration
 import play.api.Environment
 
 class I18nModule extends Module {
-  def bindings(environment: Environment, configuration: Configuration) = {
+  def bindings(environment: Environment, configuration: Configuration): scala.collection.Seq[Binding[_]] = {
     Seq(
       bind[Langs].toProvider[DefaultLangsProvider],
       bind[MessagesApi].toProvider[DefaultMessagesApiProvider],
diff --git a/core/play/src/main/scala/play/api/inject/Module.scala b/core/play/src/main/scala/play/api/inject/Module.scala
@@ -90,7 +90,10 @@ abstract class Module {
 class SimpleModule(bindingsFunc: (Environment, Configuration) => Seq[Binding[_]]) extends Module {
   def this(bindings: Binding[_]*) = this((_, _) => bindings)
 
-  final override def bindings(environment: Environment, configuration: Configuration) =
+  final override def bindings(
+      environment: Environment,
+      configuration: Configuration
+  ): scala.collection.Seq[Binding[_]] =
     bindingsFunc(environment, configuration)
 }
 
diff --git a/web/play-filters-helpers/src/main/scala/play/filters/csrf/csrf.scala b/web/play-filters-helpers/src/main/scala/play/filters/csrf/csrf.scala
@@ -319,7 +319,7 @@ object CSRF {
  * The CSRF module.
  */
 class CSRFModule extends Module {
-  def bindings(environment: Environment, configuration: Configuration) =
+  def bindings(environment: Environment, configuration: Configuration): scala.collection.Seq[Binding[_]] =
     Seq(
       bind[play.libs.crypto.CSRFTokenSigner].to(classOf[play.libs.crypto.DefaultCSRFTokenSigner]),
       bind[CSRFTokenSigner].toProvider[CSRFTokenSignerProvider],
