diff --git a/app/actors/DocumentationActor.scala b/app/actors/DocumentationActor.scala index 59d01fb9..06e9484c 100644 --- a/app/actors/DocumentationActor.scala +++ b/app/actors/DocumentationActor.scala @@ -271,8 +271,8 @@ class DocumentationActor( import DocumentationActor._ import actors.{ DocumentationLoadingActor => Loader } - implicit val timeout: Timeout = Timeout(5.seconds) - implicit val system: ActorSystem[Nothing] = context.system + given timeout: Timeout = Timeout(5.seconds) + given system: ActorSystem[Nothing] = context.system import system.executionContext private def createRepo(config: TranslationConfig) = { diff --git a/app/actors/DocumentationPollingActor.scala b/app/actors/DocumentationPollingActor.scala index 3cc590cd..e1212611 100644 --- a/app/actors/DocumentationPollingActor.scala +++ b/app/actors/DocumentationPollingActor.scala @@ -120,7 +120,7 @@ class DocumentationPollingActor( // The version hasn't changed, don't rescan case Some(same: TranslationVersion) if same.cacheId == newCacheId => same case _ => - implicit val lang = repos.default.config.lang + given lang: Lang = repos.default.config.lang if (old.isDefined) { log.info2("Updating default documentation for {}: {}", version, cacheId) @@ -151,8 +151,8 @@ class DocumentationPollingActor( ).map(v => (v._1, v._2, v._1.name)) val mainVersion = determineMainVersion(t).map(v => (v._1, v._2, "main")) - implicit val lang = t.config.lang - val versions = versionsToTranslations( + given lang: Lang = t.config.lang + val versions = versionsToTranslations( t.repo, gitTags ++ gitBranches ++ mainVersion, defaultTranslation, @@ -179,7 +179,7 @@ class DocumentationPollingActor( versions: Seq[(Version, ObjectId, String)], aggregate: Translation, old: Option[Translation], - )(implicit lang: Lang): List[TranslationVersion] = { + )(using lang: Lang): List[TranslationVersion] = { versions .sortBy(_._1) .reverse diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala index ee86f776..4bfbf0b5 100644 --- a/app/controllers/Application.scala +++ b/app/controllers/Application.scala @@ -28,7 +28,7 @@ class Application @Inject() ( exampleProjectsService: PlayExampleProjectsService, components: ControllerComponents, cacheApi: SyncCacheApi, -)(implicit ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter) +)(using ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter) extends AbstractController(components) with Common with I18nSupport { diff --git a/app/controllers/Blog.scala b/app/controllers/Blog.scala index 8c94e7b7..f7f01101 100644 --- a/app/controllers/Blog.scala +++ b/app/controllers/Blog.scala @@ -21,7 +21,7 @@ import scala.concurrent.Future @Singleton class Blog @Inject() ( components: ControllerComponents, -)(implicit ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter) +)(using ec: ExecutionContext, val reverseRouter: _root_.controllers.documentation.ReverseRouter) extends AbstractController(components) with Common with I18nSupport { diff --git a/app/controllers/Common.scala b/app/controllers/Common.scala index e9276d61..b86bbecf 100644 --- a/app/controllers/Common.scala +++ b/app/controllers/Common.scala @@ -4,7 +4,7 @@ import play.api.mvc._ import play.api.mvc.Results._ trait Common { - def notFound(implicit request: RequestHeader) = NotFound(views.html.notfound()) + def notFound(using request: RequestHeader) = NotFound(views.html.notfound()) - implicit def reverseRouter: documentation.ReverseRouter + given reverseRouter: documentation.ReverseRouter } diff --git a/app/controllers/Modules.scala b/app/controllers/Modules.scala index adf025a5..87184e7b 100644 --- a/app/controllers/Modules.scala +++ b/app/controllers/Modules.scala @@ -12,7 +12,7 @@ import scala.concurrent.Future @Singleton class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, components: ControllerComponents)( - implicit + using ec: ExecutionContext, reverseRouter: documentation.ReverseRouter, ) extends AbstractController(components) { @@ -77,5 +77,5 @@ class Modules @Inject() (modulesLookup: ModulesLookup, moduleDao: ModuleDao, com } } - private def PageNotFound(implicit request: RequestHeader) = NotFound(views.html.notfound()) + private def PageNotFound(using request: RequestHeader) = NotFound(views.html.notfound()) } diff --git a/app/controllers/Outreachy.scala b/app/controllers/Outreachy.scala index c1809750..8f6eda92 100644 --- a/app/controllers/Outreachy.scala +++ b/app/controllers/Outreachy.scala @@ -10,7 +10,7 @@ import scala.concurrent.Future /** * The outreachy controller */ -class Outreachy @Inject() (components: ControllerComponents)(implicit +class Outreachy @Inject() (components: ControllerComponents)(using reverseRouter: documentation.ReverseRouter, ) extends AbstractController(components) { diff --git a/app/controllers/documentation/DocumentationController.scala b/app/controllers/documentation/DocumentationController.scala index 5f00f608..4508ba65 100644 --- a/app/controllers/documentation/DocumentationController.scala +++ b/app/controllers/documentation/DocumentationController.scala @@ -33,18 +33,18 @@ class DocumentationController @Inject() ( documentationActor: ActorRef[Command], releases: PlayReleases, components: ControllerComponents, -)(implicit actorSystem: org.apache.pekko.actor.ActorSystem, reverseRouter: ReverseRouter) +)(using actorSystem: org.apache.pekko.actor.ActorSystem, reverseRouter: ReverseRouter) extends AbstractController(components) { - private implicit val timeout: Timeout = Timeout(10.seconds) - private implicit val typedSystem: ActorSystem[Nothing] = actorSystem.toTyped + private given timeout: Timeout = Timeout(10.seconds) + private given typedSystem: ActorSystem[Nothing] = actorSystem.toTyped import typedSystem.executionContext private val Rfc1123DateTimeFormat = DateTimeFormat.forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'").withZoneUTC() private val EmptyContext = TranslationContext(Lang("en"), true, None, Nil, Nil) - private def pageNotFound(context: TranslationContext, title: String, alternateVersions: Seq[Version])(implicit + private def pageNotFound(context: TranslationContext, title: String, alternateVersions: Seq[Version])(using req: RequestHeader, ) = NotFound(views.html.documentation.v2(messages, context, title, alternateVersions = alternateVersions)) @@ -81,7 +81,7 @@ class DocumentationController @Inject() ( } } - private def preferredLang(langs: Seq[Lang])(implicit request: RequestHeader) = { + private def preferredLang(langs: Seq[Lang])(using request: RequestHeader) = { val maybeLangFromCookie = request.cookies.get(messages.langCookieName).flatMap(c => Lang.get(c.value)) val candidateLangs = maybeLangFromCookie match { case Some(cookieLang) => cookieLang +: request.acceptLanguages @@ -97,7 +97,7 @@ class DocumentationController @Inject() ( actor: ActorRef[Command], page: String, msg: ActorRef[Response[T]] => DocumentationActor.Request[T], - )(block: T => Result)(implicit req: RequestHeader): Future[Result] = { + )(block: T => Result)(using req: RequestHeader): Future[Result] = { actor.ask[Response[T]](replyTo => msg(replyTo)).flatMap { case DocsNotFound(context) => val future = Future.sequence(context.displayVersions.map(pageExists(_, page))) @@ -371,7 +371,7 @@ class DocumentationController @Inject() ( } } - def withLangHeaders(result: Result, page: String, context: TranslationContext)(implicit + def withLangHeaders(result: Result, page: String, context: TranslationContext)(using req: RequestHeader, ) = { val linkHeader = context.alternatives diff --git a/app/models/PlayExampleProjects.scala b/app/models/PlayExampleProjects.scala index 08d2330b..c6f56503 100644 --- a/app/models/PlayExampleProjects.scala +++ b/app/models/PlayExampleProjects.scala @@ -26,7 +26,7 @@ case class TemplateParameter( ) object TemplateParameter { - implicit val format: Format[TemplateParameter] = Json.format + given format: Format[TemplateParameter] = Json.format } case class ExampleProject( @@ -42,7 +42,7 @@ case class ExampleProject( } object ExampleProject { - implicit val format: Format[ExampleProject] = Json.format + given format: Format[ExampleProject] = Json.format } class ExamplesModule extends AbstractModule { @@ -57,7 +57,7 @@ class PlayExampleProjectsService @Inject() ( ws: WSClient, cache: SyncCacheApi, environment: Environment, -)(implicit ec: ExecutionContext) { +)(using ec: ExecutionContext) { val validPlayVersions: Seq[String] = configuration.get[Seq[String]]("examples.playVersions") diff --git a/app/models/Releases.scala b/app/models/Releases.scala index b31cff93..0a9ef4d5 100644 --- a/app/models/Releases.scala +++ b/app/models/Releases.scala @@ -14,7 +14,7 @@ case class PlayRelease( } object PlayRelease { - implicit val releaseReads: Reads[PlayRelease] = Json.reads[PlayRelease] + given releaseReads: Reads[PlayRelease] = Json.reads[PlayRelease] } case class PlayReleases( @@ -25,7 +25,7 @@ case class PlayReleases( ) object PlayReleases { - implicit val playReleasesReads: Reads[PlayReleases] = Json.reads[PlayReleases] + given playReleasesReads: Reads[PlayReleases] = Json.reads[PlayReleases] } private[models] object SecurifyUrl { diff --git a/app/models/github/GitHub.scala b/app/models/github/GitHub.scala index 36c62b51..4217377a 100644 --- a/app/models/github/GitHub.scala +++ b/app/models/github/GitHub.scala @@ -13,7 +13,7 @@ case class Team(id: Long, name: String, url: String, members_url: String) { } object Team { - implicit val jsonReads: Reads[Team] = Json.reads[Team] + given jsonReads: Reads[Team] = Json.reads[Team] } /** @@ -37,7 +37,7 @@ case class GitHubUser( } object GitHubUser { - implicit val jsonReads: Reads[GitHubUser] = Json.reads[GitHubUser] + given jsonReads: Reads[GitHubUser] = Json.reads[GitHubUser] } case class Repository(id: Long, name: String, full_name: String, fork: Boolean, contributors_url: String) { @@ -46,7 +46,7 @@ case class Repository(id: Long, name: String, full_name: String, fork: Boolean, } object Repository { - implicit val jsonReads: Reads[Repository] = Json.reads[Repository] + given jsonReads: Reads[Repository] = Json.reads[Repository] } case class Organisation(id: Long, login: String, url: String, repos_url: String, members_url: String) { @@ -55,5 +55,5 @@ case class Organisation(id: Long, login: String, url: String, repos_url: String, } object Organisation { - implicit val jsonReads: Reads[Organisation] = Json.reads[Organisation] + given jsonReads: Reads[Organisation] = Json.reads[Organisation] } diff --git a/app/models/modules/Module.scala b/app/models/modules/Module.scala index 0cd465c7..d7034cc8 100644 --- a/app/models/modules/Module.scala +++ b/app/models/modules/Module.scala @@ -16,15 +16,15 @@ case class Module( ) object Module { - implicit val modulesWrites: Writes[Seq[(Module, Seq[Release])]] = { + given modulesWrites: Writes[Seq[(Module, Seq[Release])]] = { - implicit val releaseWrites: Writes[Release] = ( + given releaseWrites: Writes[Release] = ( (__ \ "isDefault").write[Boolean] ~ (__ \ "version").write[String] ~ (__ \ "matches").write[String] ).apply(r => (r.isDefault, r.version, r.frameworkMatch)) - implicit val moduleWrites: Writes[(Module, Seq[Release])] = ( + given moduleWrites: Writes[(Module, Seq[Release])] = ( (__ \ "name").write[String] ~ (__ \ "fullname").write[String] ~ (__ \ "versions").write[Seq[Release]] diff --git a/app/models/opencollective/OpenCollective.scala b/app/models/opencollective/OpenCollective.scala index a79796be..e25cdae9 100644 --- a/app/models/opencollective/OpenCollective.scala +++ b/app/models/opencollective/OpenCollective.scala @@ -44,5 +44,5 @@ case class OpenCollectiveMember( } object OpenCollectiveMember { - implicit val jsonReads: Reads[OpenCollectiveMember] = Json.reads[OpenCollectiveMember] + given jsonReads: Reads[OpenCollectiveMember] = Json.reads[OpenCollectiveMember] } diff --git a/app/services/github/ContributorsSummariser.scala b/app/services/github/ContributorsSummariser.scala index 37d988a3..4f1ec2e2 100644 --- a/app/services/github/ContributorsSummariser.scala +++ b/app/services/github/ContributorsSummariser.scala @@ -22,7 +22,7 @@ trait ContributorsSummariser { def fetchContributors: Future[Contributors] } -class DefaultContributorsSummariser @Inject() (gitHub: GitHub, config: GitHubConfig)(implicit +class DefaultContributorsSummariser @Inject() (gitHub: GitHub, config: GitHubConfig)(using ec: ExecutionContext, ) extends ContributorsSummariser { @@ -93,7 +93,7 @@ class DefaultContributorsSummariser @Inject() (gitHub: GitHub, config: GitHubCon class CachingContributorsSummariser @Inject() ( actorSystem: ActorSystem, @Named("gitHubContributorsSummariser") delegate: ContributorsSummariser, -)(implicit ec: ExecutionContext) +)(using ec: ExecutionContext) extends ContributorsSummariser { private val log = LoggerFactory.getLogger(classOf[CachingContributorsSummariser]) diff --git a/app/services/github/GitHub.scala b/app/services/github/GitHub.scala index 99792b47..bd8721e6 100644 --- a/app/services/github/GitHub.scala +++ b/app/services/github/GitHub.scala @@ -60,8 +60,7 @@ case class GitHubConfig( committerTeams: Seq[String], ) -class DefaultGitHub @Inject() (ws: WSClient, config: GitHubConfig)(implicit ec: ExecutionContext) - extends GitHub { +class DefaultGitHub @Inject() (ws: WSClient, config: GitHubConfig)(using ec: ExecutionContext) extends GitHub { private def authCall(url: String) = { ws.url(url).withHttpHeaders(HeaderNames.AUTHORIZATION -> ("token " + config.accessToken)) diff --git a/app/services/opencollective/MembersSummariser.scala b/app/services/opencollective/MembersSummariser.scala index 8a514237..5ffabd8c 100644 --- a/app/services/opencollective/MembersSummariser.scala +++ b/app/services/opencollective/MembersSummariser.scala @@ -22,7 +22,7 @@ trait MembersSummariser { def fetchMembers: Future[Seq[OpenCollectiveMember]] } -class DefaultMembersSummariser @Inject() (openCollective: OpenCollective)(implicit +class DefaultMembersSummariser @Inject() (openCollective: OpenCollective)(using ec: ExecutionContext, ) extends MembersSummariser { @@ -42,7 +42,7 @@ class DefaultMembersSummariser @Inject() (openCollective: OpenCollective)(implic class CachingMembersSummariser @Inject() ( actorSystem: ActorSystem, @Named("openCollectiveMembersSummariser") delegate: MembersSummariser, -)(implicit ec: ExecutionContext) +)(using ec: ExecutionContext) extends MembersSummariser { private val log = LoggerFactory.getLogger(classOf[CachingMembersSummariser]) diff --git a/app/services/opencollective/OpenCollective.scala b/app/services/opencollective/OpenCollective.scala index 5f303623..b949aae5 100644 --- a/app/services/opencollective/OpenCollective.scala +++ b/app/services/opencollective/OpenCollective.scala @@ -26,7 +26,7 @@ trait OpenCollective { } -class DefaultOpenCollective @Inject() (ws: WSClient, config: OpenCollectiveConfig)(implicit +class DefaultOpenCollective @Inject() (ws: WSClient, config: OpenCollectiveConfig)(using ec: ExecutionContext, ) extends OpenCollective { diff --git a/app/views/allreleases.scala.html b/app/views/allreleases.scala.html index 2b336704..f9736d68 100644 --- a/app/views/allreleases.scala.html +++ b/app/views/allreleases.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(releases: PlayReleases, platform: Platform.Platform, title: String = "Play Releases")(implicit requestHeader: RequestHeader, reverseRouter: ReverseRouter) +@(releases: PlayReleases, platform: Platform.Platform, title: String = "Play Releases")(using requestHeader: RequestHeader, reverseRouter: ReverseRouter) @renderRelease(linkClass: String, release: PlayRelease) = { @if(release.secureUrl) { diff --git a/app/views/blog/graal.scala.html b/app/views/blog/graal.scala.html index 13105255..ada8b4b7 100644 --- a/app/views/blog/graal.scala.html +++ b/app/views/blog/graal.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter - @(blogName:String, title: String)(implicit req: RequestHeader, reverseRouter: ReverseRouter) + @(blogName:String, title: String)(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, blogName){
diff --git a/app/views/blog/index.scala.html b/app/views/blog/index.scala.html index ef468409..65eeb17d 100644 --- a/app/views/blog/index.scala.html +++ b/app/views/blog/index.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter - @(title: String)(implicit req: RequestHeader, reverseRouter: ReverseRouter) + @(title: String)(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "blog"){
diff --git a/app/views/blog/ossPledgeLaunch.scala.html b/app/views/blog/ossPledgeLaunch.scala.html index 73420be9..91b776bd 100644 --- a/app/views/blog/ossPledgeLaunch.scala.html +++ b/app/views/blog/ossPledgeLaunch.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(blogName:String,title: String)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(blogName:String,title: String)(using req: RequestHeader, reverseRouter: ReverseRouter) @main( title, blogName){
diff --git a/app/views/blog/socketio.scala.html b/app/views/blog/socketio.scala.html index 4218f328..18a90d44 100644 --- a/app/views/blog/socketio.scala.html +++ b/app/views/blog/socketio.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(blogName:String,title: String)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(blogName:String,title: String)(using req: RequestHeader, reverseRouter: ReverseRouter) @main( title, blogName){
@@ -32,7 +32,7 @@

Example code

import play.engineio.EngineIOController import play.socketio.scaladsl.SocketIO -class ChatEngine(socketIO: SocketIO)(implicit mat: Materializer) { +class ChatEngine(socketIO: SocketIO)(using mat: Materializer) { import play.socketio.scaladsl.SocketIOEventCodec._ // codec to encode/codec chat message events to/from strings diff --git a/app/views/changelog.scala.html b/app/views/changelog.scala.html index 7b02f084..831180b1 100644 --- a/app/views/changelog.scala.html +++ b/app/views/changelog.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(markdown: Html)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(markdown: Html)(using req: RequestHeader, reverseRouter: ReverseRouter) @main("Play Change Log", "changelog"){
diff --git a/app/views/clipboard.scala.html b/app/views/clipboard.scala.html index 8ab025cd..aa2616dd 100644 --- a/app/views/clipboard.scala.html +++ b/app/views/clipboard.scala.html @@ -1,4 +1,4 @@ -@()(implicit request: RequestHeader) +@()(using request: RequestHeader) @views.html.helper.script(Symbol("type") -> "text/javascript") { diff --git a/app/views/code.scala.html b/app/views/code.scala.html index bbb2b4bf..4fbdc0e3 100644 --- a/app/views/code.scala.html +++ b/app/views/code.scala.html @@ -1,6 +1,6 @@ @import models.github._ @import controllers.documentation.ReverseRouter -@(contributors: Contributors, title: String = "Code & contributors")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(contributors: Contributors, title: String = "Code & contributors")(using req: RequestHeader, reverseRouter: ReverseRouter) @avatar(url: String, size: Int) = @{ val doubleSize = size * 2 diff --git a/app/views/commonSidebar.scala.html b/app/views/commonSidebar.scala.html index c459801f..837cd419 100644 --- a/app/views/commonSidebar.scala.html +++ b/app/views/commonSidebar.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(hn: String = "h3")(implicit reverseRouter: ReverseRouter) +@(hn: String = "h3")(using reverseRouter: ReverseRouter) <@hn>Documentation
    diff --git a/app/views/documentation/Helpers.scala b/app/views/documentation/Helpers.scala index 32dcc6b9..a13df4c7 100644 --- a/app/views/documentation/Helpers.scala +++ b/app/views/documentation/Helpers.scala @@ -11,16 +11,16 @@ import play.twirl.api.Html object Helpers { - def isNotMostRecentVersion(implicit context: TranslationContext): Boolean = { + def isNotMostRecentVersion(using context: TranslationContext): Boolean = { !context.version.equals(latestCurrent) } def displayVersionMessage( pageFileName: String, - )(implicit messagesApi: MessagesApi, context: TranslationContext, reverseRouter: ReverseRouter): Html = { - implicit val alternateLang = context.alternateLang - implicit val lang = context.alternateLang.getOrElse(Lang.defaultLang) - val version = context.version.get + )(using messagesApi: MessagesApi, context: TranslationContext, reverseRouter: ReverseRouter): Html = { + given alternateLang: Option[Lang] = context.alternateLang + given lang: Lang = context.alternateLang.getOrElse(Lang.defaultLang) + val version = context.version.get if (isDevelopmentVersion(version)) { upgrade(unstableMessage(link(version, pageFileName)), pageFileName) } else { @@ -45,25 +45,25 @@ object Helpers { private def upgrade( originalHtml: Html, pageFileName: String, - )(implicit messagesApi: MessagesApi, context: TranslationContext, reverseRouter: ReverseRouter): Html = { + )(using messagesApi: MessagesApi, context: TranslationContext, reverseRouter: ReverseRouter): Html = { import scala.collection.immutable.Seq new Html(Seq(originalHtml, Html(" "), displayUpgradeMessage(pageFileName))) } // 2.6.0 - private def unstableMessage(specificLink: Html)(implicit messagesApi: MessagesApi, lang: Lang) = { + private def unstableMessage(specificLink: Html)(using messagesApi: MessagesApi, lang: Lang) = { // documentation.unstable.message=You are viewing the documentation for the {0} development release. Html(messagesApi("documentation.unstable.message", specificLink.toString())) } // Current release 2.5.0. (Displayed because latest is 2.5.x) - private def currentReleaseMessage(specificLink: Html)(implicit messagesApi: MessagesApi, lang: Lang): Html = { + private def currentReleaseMessage(specificLink: Html)(using messagesApi: MessagesApi, lang: Lang): Html = { // You are viewing the documentation for the {0} release. Html(messagesApi("documentation.current.release.message", specificLink.toString())) } // Used to point people to 2.5.x - private def currentLatestMessage(seriesLink: Html)(implicit messagesApi: MessagesApi, lang: Lang): Html = { + private def currentLatestMessage(seriesLink: Html)(using messagesApi: MessagesApi, lang: Lang): Html = { // The latest stable release series is {0}. Html(messagesApi("documentation.current.latest.message", seriesLink.toString())) } @@ -72,13 +72,13 @@ object Helpers { private def oldReleaseMessage( specificLink: Html, seriesLink: Html, - )(implicit messagesApi: MessagesApi, lang: Lang): Html = { + )(using messagesApi: MessagesApi, lang: Lang): Html = { // You are viewing the documentation for the {0} release in the {1} series of releases. Html(messagesApi("documentation.old.release.message", specificLink.toString(), seriesLink.toString())) } // 2.3.x - private def oldLatestMessage(seriesLink: Html)(implicit messagesApi: MessagesApi, lang: Lang): Html = { + private def oldLatestMessage(seriesLink: Html)(using messagesApi: MessagesApi, lang: Lang): Html = { // You are viewing the documentation for the {0} release series. Html(messagesApi("documentation.old.latest.message", seriesLink.toString())) } @@ -86,31 +86,31 @@ object Helpers { private def link( version: Version, pageFileName: String, - )(implicit alternateLang: Option[Lang], reverseRouter: ReverseRouter): Html = { + )(using alternateLang: Option[Lang], reverseRouter: ReverseRouter): Html = { val url = reverseRouter.page(alternateLang, version.toString, pageFileName) Html(s"""${version.toString}""") } private def displayUpgradeMessage( pageFileName: String, - )(implicit messagesApi: MessagesApi, context: TranslationContext, reverseRouter: ReverseRouter): Html = { - val version = latestCurrent.get - implicit val alternateLang = context.alternateLang - implicit val lang = context.alternateLang.getOrElse(Lang.defaultLang) + )(using messagesApi: MessagesApi, context: TranslationContext, reverseRouter: ReverseRouter): Html = { + val version = latestCurrent.get + given alternateLang: Option[Lang] = context.alternateLang + given lang: Lang = context.alternateLang.getOrElse(Lang.defaultLang) currentLatestMessage(link(version, pageFileName)) } /** Returns the most current version, i.e. 2.6.x. */ - def latestCurrent(implicit context: TranslationContext): Option[Version] = { + def latestCurrent(using context: TranslationContext): Option[Version] = { Version.findDefaultVersion(context.displayVersions) } /** Returns the latest compatible version for the context.version, i.e. 2.3.0 will return 2.3.x */ - private def latestCompatible(implicit context: TranslationContext): Option[Version] = { + private def latestCompatible(using context: TranslationContext): Option[Version] = { context.version.flatMap(v => Version.findCurrentPatchVersions(context.displayVersions, v).headOption) } - private def isDevelopmentVersion(version: Version)(implicit context: TranslationContext): Boolean = { + private def isDevelopmentVersion(version: Version)(using context: TranslationContext): Boolean = { version.versionType match { case rc: ReleaseCandidate => true case m: Milestone => true diff --git a/app/views/documentation/algolia.scala.html b/app/views/documentation/algolia.scala.html index 3b2e47ac..cb38b8bb 100644 --- a/app/views/documentation/algolia.scala.html +++ b/app/views/documentation/algolia.scala.html @@ -1,4 +1,4 @@ -@(context: models.documentation.TranslationContext)(implicit request: RequestHeader) +@(context: models.documentation.TranslationContext)(using request: RequestHeader) @views.html.helper.script(Symbol("type") -> "text/javascript") { diff --git a/app/views/documentation/cheatsheet.scala.html b/app/views/documentation/cheatsheet.scala.html index 13812072..5ced16a9 100644 --- a/app/views/documentation/cheatsheet.scala.html +++ b/app/views/documentation/cheatsheet.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(context: models.documentation.TranslationContext, title: String, otherCategories: Map[String,String], sheets: Seq[String])(implicit reverseRouter: ReverseRouter) +@(context: models.documentation.TranslationContext, title: String, otherCategories: Map[String,String], sheets: Seq[String])(using reverseRouter: ReverseRouter) diff --git a/app/views/documentation/header.scala.html b/app/views/documentation/header.scala.html index 9899d429..ed8331b5 100644 --- a/app/views/documentation/header.scala.html +++ b/app/views/documentation/header.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(page: String, maybeContext: Option[models.documentation.TranslationContext] = None)(content: Html)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(page: String, maybeContext: Option[models.documentation.TranslationContext] = None)(content: Html)(using req: RequestHeader, reverseRouter: ReverseRouter) @main(page, "documentation", maybeContext) { diff --git a/app/views/documentation/nav.scala.html b/app/views/documentation/nav.scala.html index 7c304b7f..ec160362 100644 --- a/app/views/documentation/nav.scala.html +++ b/app/views/documentation/nav.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(messages: MessagesApi, context: models.documentation.TranslationContext, pageFileName: String, apis: Seq[(String, String)])(implicit reverseRouter: ReverseRouter) +@(messages: MessagesApi, context: models.documentation.TranslationContext, pageFileName: String, apis: Seq[(String, String)])(using reverseRouter: ReverseRouter) @language(lang: Lang, isDefault: Boolean, version: Option[models.documentation.Version]) = {

    Browse versions

    - @for(version <- Helpers.latestCurrent(context)) { + @for(version <- Helpers.latestCurrent(using context)) { @version.name }
    diff --git a/app/views/documentation/v1.scala.html b/app/views/documentation/v1.scala.html index bf7fbb41..224f868d 100644 --- a/app/views/documentation/v1.scala.html +++ b/app/views/documentation/v1.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(messages: MessagesApi, context: models.documentation.TranslationContext, page: String, content: String)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(messages: MessagesApi, context: models.documentation.TranslationContext, page: String, content: String)(using req: RequestHeader, reverseRouter: ReverseRouter) @title = { @page @context.version.map(" - " + _).getOrElse("") diff --git a/app/views/documentation/v2.scala.html b/app/views/documentation/v2.scala.html index a41ba488..83d48217 100644 --- a/app/views/documentation/v2.scala.html +++ b/app/views/documentation/v2.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(messages: MessagesApi, context: models.documentation.TranslationContext, pageFileName:String, pageTitle: String = "Documentation", content: Option[String] = None, sidebar: Option[String] = None, source: Option[String] = None, alternateVersions: Seq[models.documentation.Version] = Nil, breadcrumbs: Option[String] = None)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(messages: MessagesApi, context: models.documentation.TranslationContext, pageFileName:String, pageTitle: String = "Documentation", content: Option[String] = None, sidebar: Option[String] = None, source: Option[String] = None, alternateVersions: Seq[models.documentation.Version] = Nil, breadcrumbs: Option[String] = None)(using req: RequestHeader, reverseRouter: ReverseRouter) @import Helpers._ @@ -20,7 +20,7 @@
    @content.map { html => @if(!req.headers.get(play.api.http.HeaderNames.USER_AGENT).exists(_.toLowerCase.startsWith("algolia crawler"))) { - @versionInfo(pageFileName)(messages, context, reverseRouter) + @versionInfo(pageFileName)(using messages, context, reverseRouter) } @for(version <- context.version) { diff --git a/app/views/documentation/versionInfo.scala.html b/app/views/documentation/versionInfo.scala.html index 76da115a..5ace1ab8 100644 --- a/app/views/documentation/versionInfo.scala.html +++ b/app/views/documentation/versionInfo.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(page: String)(implicit messages: MessagesApi, context: models.documentation.TranslationContext, reverseRouter: ReverseRouter) +@(page: String)(using messages: MessagesApi, context: models.documentation.TranslationContext, reverseRouter: ReverseRouter) @import Helpers._ diff --git a/app/views/getInvolved.scala.html b/app/views/getInvolved.scala.html index 2897c683..51f2e96d 100644 --- a/app/views/getInvolved.scala.html +++ b/app/views/getInvolved.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String = "Get involved")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String = "Get involved")(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "getInvolved"){
    diff --git a/app/views/gettingStarted.scala.html b/app/views/gettingStarted.scala.html index 7b53b1a0..002da98d 100644 --- a/app/views/gettingStarted.scala.html +++ b/app/views/gettingStarted.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(examples: PlayExamples)(implicit requestHeader: RequestHeader, reverseRouter: ReverseRouter) +@(examples: PlayExamples)(using requestHeader: RequestHeader, reverseRouter: ReverseRouter) @renderBaseTech(version: String) = @{ version match { diff --git a/app/views/index.scala.html b/app/views/index.scala.html index 2fa79070..965b00c4 100644 --- a/app/views/index.scala.html +++ b/app/views/index.scala.html @@ -1,6 +1,6 @@ @import controllers.documentation.ReverseRouter @import models.opencollective.OpenCollectiveMember -@(backers: Seq[OpenCollectiveMember], releases: PlayReleases, title: String = "Play Framework - Build Modern & Scalable Web Apps with Java and Scala")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(backers: Seq[OpenCollectiveMember], releases: PlayReleases, title: String = "Play Framework - Build Modern & Scalable Web Apps with Java and Scala")(using req: RequestHeader, reverseRouter: ReverseRouter) @renderBackers(backers: Seq[OpenCollectiveMember]) = { @for(backer <- backers) { diff --git a/app/views/main.scala.html b/app/views/main.scala.html index 9445d0cc..d24c38a2 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String, scope: String = "home", maybeContext: Option[models.documentation.TranslationContext] = None)(content: Html)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String, scope: String = "home", maybeContext: Option[models.documentation.TranslationContext] = None)(content: Html)(using req: RequestHeader, reverseRouter: ReverseRouter) diff --git a/app/views/markdownPage.scala.html b/app/views/markdownPage.scala.html index f4e3eef1..d6cac27a 100644 --- a/app/views/markdownPage.scala.html +++ b/app/views/markdownPage.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String, markdown: Html)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String, markdown: Html)(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "markdown"){
    diff --git a/app/views/modules/documentation.scala.html b/app/views/modules/documentation.scala.html index 5ac92e0a..7f7f788b 100644 --- a/app/views/modules/documentation.scala.html +++ b/app/views/modules/documentation.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(module: String, content: String)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(module: String, content: String)(using req: RequestHeader, reverseRouter: ReverseRouter) @main("Modules", "documentation") { diff --git a/app/views/modules/layout.scala.html b/app/views/modules/layout.scala.html index 3c1b00bc..9e41b20a 100644 --- a/app/views/modules/layout.scala.html +++ b/app/views/modules/layout.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(content: Html)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(content: Html)(using req: RequestHeader, reverseRouter: ReverseRouter) @main("Modules", "documentation") { diff --git a/app/views/modules/list.scala.html b/app/views/modules/list.scala.html index e9bee2ab..10458802 100644 --- a/app/views/modules/list.scala.html +++ b/app/views/modules/list.scala.html @@ -1,6 +1,6 @@ @import models.modules._ @import controllers.documentation.ReverseRouter -@(modules: Seq[Module])(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(modules: Seq[Module])(using req: RequestHeader, reverseRouter: ReverseRouter) @layout { diff --git a/app/views/modules/show.scala.html b/app/views/modules/show.scala.html index 157834d9..a1b1d166 100644 --- a/app/views/modules/show.scala.html +++ b/app/views/modules/show.scala.html @@ -1,6 +1,6 @@ @import models.modules._ @import controllers.documentation.ReverseRouter -@(module: Module, releases: Seq[Release])(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(module: Module, releases: Seq[Release])(using req: RequestHeader, reverseRouter: ReverseRouter) @layout { diff --git a/app/views/notfound.scala.html b/app/views/notfound.scala.html index 887e8837..d4523def 100644 --- a/app/views/notfound.scala.html +++ b/app/views/notfound.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String = "Play Framework - Build Modern & Scalable Web Apps with Java and Scala")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String = "Play Framework - Build Modern & Scalable Web Apps with Java and Scala")(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "notfound") {
    diff --git a/app/views/outreachy/round10.scala.html b/app/views/outreachy/round10.scala.html index 8ee58532..d8402d56 100644 --- a/app/views/outreachy/round10.scala.html +++ b/app/views/outreachy/round10.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String = "Outreachy")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String = "Outreachy")(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "outreachy"){
    diff --git a/app/views/outreachy/round15.scala.html b/app/views/outreachy/round15.scala.html index a461712d..b6a07ad9 100644 --- a/app/views/outreachy/round15.scala.html +++ b/app/views/outreachy/round15.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String = "Outreachy")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String = "Outreachy")(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "outreachy"){
    diff --git a/app/views/prettify.scala.html b/app/views/prettify.scala.html index 626d3ba6..f9d38d09 100644 --- a/app/views/prettify.scala.html +++ b/app/views/prettify.scala.html @@ -1,4 +1,4 @@ -@()(implicit request: RequestHeader) +@()(using request: RequestHeader) @views.html.helper.script(Symbol("type") -> "text/javascript") { diff --git a/app/views/security.scala.html b/app/views/security.scala.html index b31a105e..18daa8d6 100644 --- a/app/views/security.scala.html +++ b/app/views/security.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String, markdown: Html)(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String, markdown: Html)(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "security"){
    diff --git a/app/views/sponsors.scala.html b/app/views/sponsors.scala.html index 8634d3bc..7e45dd24 100644 --- a/app/views/sponsors.scala.html +++ b/app/views/sponsors.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@(title: String = "Sponsoring")(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@(title: String = "Sponsoring")(using req: RequestHeader, reverseRouter: ReverseRouter) @main(title, "sponsors") {
    diff --git a/app/views/vulnerabilities.scala.html b/app/views/vulnerabilities.scala.html index ab021be6..ed28e7f4 100644 --- a/app/views/vulnerabilities.scala.html +++ b/app/views/vulnerabilities.scala.html @@ -1,5 +1,5 @@ @import controllers.documentation.ReverseRouter -@()(implicit req: RequestHeader, reverseRouter: ReverseRouter) +@()(using req: RequestHeader, reverseRouter: ReverseRouter) @main("Play Security Vulnerabilities", "security"){
    diff --git a/test/services/github/GitHubSpec.scala b/test/services/github/GitHubSpec.scala index 172f20f3..272aacd1 100644 --- a/test/services/github/GitHubSpec.scala +++ b/test/services/github/GitHubSpec.scala @@ -16,7 +16,7 @@ import scala.concurrent.Future object GitHubSpec extends PlaySpecification { - implicit val fileMimeTypes: DefaultFileMimeTypes = new DefaultFileMimeTypesProvider( + given fileMimeTypes: DefaultFileMimeTypes = new DefaultFileMimeTypesProvider( FileMimeTypesConfiguration(Map("json" -> "application/json")), ).get