Merge pull request #673 from xuwei-k/for-latest-scala-3

Fix old syntax and warnings. prepare for latest Scala 3.x

Author: mkurz

app/actors/DocumentationActor.scala

@@ -142,7 +142,7 @@ object DocumentationActor extends ActorModule {
    * @param content The content of the resource.
    * @param size The size of the resource.
    */
-  case class Resource(content: Source[ByteString, _], size: Long, cacheId: String) extends Found[Resource]
+  case class Resource(content: Source[ByteString, ?], size: Long, cacheId: String) extends Found[Resource]
 
   /**
    * Update the documentation.

app/actors/DocumentationLoadingActor.scala

@@ -40,7 +40,7 @@ object DocumentationLoadingActor {
   case class V1PageExists(page: String, repo: FileRepository, replyTo: ActorRef[Boolean]) extends Command
 
   case class V1Cheatsheet(sheets: Seq[String], title: String, otherCategories: Map[String, String])
-  case class Resource(content: Source[ByteString, _], size: Long)
+  case class Resource(content: Source[ByteString, ?], size: Long)
 
   def apply(): Behavior[Command] = Behaviors.receiveMessage {
     case RenderPage(page, playDoc, replyTo) =>

app/controllers/documentation/DocumentationController.scala

@@ -229,7 +229,7 @@ class DocumentationController @Inject() (
     for {
       link   <- linkFuture
       result <- resultFuture
-    } yield result.withHeaders(link: _*)
+    } yield result.withHeaders(link*)
   }
 
   def resource(lang: Option[Lang], v: String, resource: String) =
@@ -320,7 +320,7 @@ class DocumentationController @Inject() (
           }
           val entity =
             HttpEntity.Streamed(source, Some(size), Some(fileMimeTypes.forFileName(fileName).getOrElse(BINARY)))
-          cacheable(Ok.sendEntity(entity).withHeaders(contentDisposition: _*), cacheId)
+          cacheable(Ok.sendEntity(entity).withHeaders(contentDisposition*), cacheId)
       }
     }
   }

app/models/PlayExampleProjects.scala

@@ -109,7 +109,7 @@ class PlayExampleProjectsService @Inject() (
         }
       })
       .map { response =>
-        response.flatMap((convertExampleProjects _).tupled)
+        response.flatMap(convertExampleProjects.tupled)
       }
   }
 

app/models/modules/Module.scala

@@ -30,7 +30,7 @@ object Module {
         (__ \ "versions").write[Seq[Release]]
     ).apply(m => (m._1.name, m._1.fullname, m._2))
 
-    (__ \ "modules").write(Writes.iterableWrites[(Module, Seq[Release]), Seq])
+    (__ \ "modules").write(using Writes.iterableWrites[(Module, Seq[Release]), Seq])
   }
 }
 

app/services/github/GitHub.scala

@@ -134,7 +134,7 @@ class DefaultGitHub @Inject() (ws: WSClient, config: GitHubConfig)(using ec: Exe
     load[GitHubUser](expand(user.url))
 
   def fetchRepoContributors(repo: Repository) =
-    loadWithPaging[(GitHubUser, Int)](expand(repo.contributorsUrl))(
+    loadWithPaging[(GitHubUser, Int)](expand(repo.contributorsUrl))(using
       implicitly[Reads[GitHubUser]].and((__ \ "contributions").read[Int]).tupled,
     )
 

app/views/documentation/nav.scala.html

@@ -12,7 +12,7 @@
           lang.language,
           reverseRouter.page(Some(lang).filterNot(_ => isDefault), v.name, pageFileName)
         )
-    )">@messages("lang.name")(lang)</a>
+    )">@messages("lang.name")(using lang)</a>
 }
 
 <nav id="toolbar">

app/views/documentation/v2.scala.html

@@ -41,7 +41,7 @@
                       s"""<a href="$source">""", "</a>",
                       s"""<a href="${reverseRouter.latest(context.alternateLang, "Documentation")}">""", "</a>",
                       s"""<a href="https://github.com/playframework/playframework/discussions">""", "</a>"
-                  )(context.lang))
+                  )(using context.lang))
               </p>
             }
         }.getOrElse {