Merge pull request #461 from mkurz/Play_2.8.11

mkurz · web-flow · commit ce7669debcba · 2021-12-17T13:03:18.000+01:00
Play 2.8.11 / Scala 2.13.7
diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
@@ -51,13 +51,13 @@ class Application @Inject()(
       .map { _ =>
         s"""<p class="vulnerability-warning">You are using a version of Play Framework that has a
         <a href="${routes.Security.vulnerability("20130806-SessionInjection")}">known vulnerability</a>.</p>
-          <p>Please upgrade to a later version <a href="${routes.Application.download()}">here</a>.</p>"""
+          <p>Please upgrade to a later version <a href="${routes.Application.download}">here</a>.</p>"""
 
       }
       .orElse {
         if (!version.contains(releases.latest.version)) {
           Some(s"""Play framework ${releases.latest.version} is out!  Check it out <a href="${routes.Application
-            .download()}">here</a>.""")
+            .download}">here</a>.""")
         } else {
           None
         }
diff --git a/app/controllers/Outreachy.scala b/app/controllers/Outreachy.scala
@@ -11,7 +11,7 @@ import play.api.mvc.ControllerComponents
 class Outreachy @Inject()(components: ControllerComponents)(implicit reverseRouter: documentation.ReverseRouter)
     extends AbstractController(components) {
 
-  def outreachy = Action(Redirect(routes.Outreachy.round15()))
+  def outreachy = Action(Redirect(routes.Outreachy.round15))
 
   def round10 = Action { implicit req =>
     Ok(views.html.outreachy.round10())
diff --git a/app/models/documentation/Sitemap.scala b/app/models/documentation/Sitemap.scala
@@ -40,7 +40,7 @@ case class Sitemap(urls: Seq[SitemapUrl]) {
       urls.map { url =>
         <url>
         <loc>{url.loc}</loc>
-        <priority>{url.priority.value.formatted("%.2f")}</priority>
+        <priority>{"%.2f".format(url.priority.value)}</priority>
         {
           url.alternates.map {
             case (lang, href) =>
diff --git a/app/views/allreleases.scala.html b/app/views/allreleases.scala.html
@@ -35,10 +35,10 @@ <h2>Release List</h2>
       <p>
         We recommend that you use the latest version of Play. However, if you need to work with an older version, you will find links on this page. Versions of Play older than 2.2 are packaged in zip files. The traditional Play zip provides a <code>play</code> command to create new applications, run tests,
         and run the application. After 2.3.0, the <code>play</code> command was replaced with <code>sbt</code>. Version 2.6.x and 2.7.x projects can be
-        created from an <a href="@routes.Application.download()">example project or template</a>.
+        created from an <a href="@routes.Application.download">example project or template</a>.
       </p>
       <p>
-        <p class="changelogLink"><a href="@routes.Application.changelog()">See the Changelog</a> for the history of changes in each release.</p>
+        <p class="changelogLink"><a href="@routes.Application.changelog">See the Changelog</a> for the history of changes in each release.</p>
       </p>
 
       @if(releases.development.nonEmpty) {
@@ -47,7 +47,7 @@ <h3>Development versions</h3>
         <p>
           Previews of releases in the pipeline.
         </p>
-        <p class="changelogLink"><a href="@routes.Application.changelog()">Changelog</a></p>
+        <p class="changelogLink"><a href="@routes.Application.changelog">Changelog</a></p>
         <table>
         @for(release <- releases.development) {
           <tr>
diff --git a/app/views/code.scala.html b/app/views/code.scala.html
@@ -33,7 +33,7 @@ <h1>About the code</h1>
                 <p>If you're looking for the code for the previous Play 1.x series, it's available in another repository:</p>
                 <pre><code>git clone git://github.com/playframework/play.git</code></pre>
                 <p>
-                    To contribute, check out the <a href="@routes.Application.contributing()">contributor guide</a> and learn how to <a href="@reverseRouter.latest(None, "BuildingFromSource")">build Play from source</a>.
+                    To contribute, check out the <a href="@routes.Application.contributing">contributor guide</a> and learn how to <a href="@reverseRouter.latest(None, "BuildingFromSource")">build Play from source</a>.
                 </p>
 
                 <h2>License</h2>
diff --git a/app/views/commonSidebar.scala.html b/app/views/commonSidebar.scala.html
@@ -6,8 +6,8 @@
     <li><a href="@reverseRouter.latest(None, "Requirements")">Play Requirements</a></li>
     <li><a href="@reverseRouter.latest(None, "NewApplication")">Build your first app</a></li>
     <li><a href="@reverseRouter.index(None)">Full documentation</a></li>
-    <li><a href="@routes.Application.changelog()">Change log</a></li>
-    <li><a href="@routes.Security.index()">Security advisories</a></li>
+    <li><a href="@routes.Application.changelog">Change log</a></li>
+    <li><a href="@routes.Security.index">Security advisories</a></li>
 </ul>
 <@hn>Find help</@hn>
 <ul>
@@ -18,13 +18,13 @@
 </ul>
 <@hn>Contribute</@hn>
 <ul>
-    <li><a href="@routes.Code.index()">Code and contributors</a></li>
+    <li><a href="@routes.Code.index">Code and contributors</a></li>
     <li><a href="https://www.lightbend.com/conduct">Code of conduct</a></li>
-    <li><a href="@routes.Application.getInvolved()">Get involved</a></li>
-    <li><a href="@routes.Application.communityProcess()">Community process</a></li>
-    <li><a href="@routes.Security.index()">Reporting security vulnerabilities</a></li>
+    <li><a href="@routes.Application.getInvolved">Get involved</a></li>
+    <li><a href="@routes.Application.communityProcess">Community process</a></li>
+    <li><a href="@routes.Security.index">Reporting security vulnerabilities</a></li>
 </ul>
 <@hn>Programs</@hn>
 <ul>
-    <li><a href="@routes.Outreachy.outreachy()">Outreachy</a></li>
+    <li><a href="@routes.Outreachy.outreachy">Outreachy</a></li>
 </ul>
diff --git a/app/views/getInvolved.scala.html b/app/views/getInvolved.scala.html
@@ -23,7 +23,7 @@ <h3 class="opencollective">Donate to our Open Collective</h3>
                 <a href="//opencollective.com/playframework#section-contributors">35+ backers</a>
                 <p>
                     Play uses <a href="//opencollective.com/playframework">Open Collective</a> to collect donations from sponsors. These funds are used to pay contributors and cover project costs, openly and transparently.
-                    Individuals and companies alike can support Play financially by <a href="@routes.Application.sponsors()">becoming backers or premium sponsors</a>.
+                    Individuals and companies alike can support Play financially by <a href="@routes.Application.sponsors">becoming backers or premium sponsors</a>.
                 </p>
 
                 <h3 class="mailing">Join the Discuss Play forum</h3>
@@ -61,7 +61,7 @@ <h3 class="patch">Patch the core</h3>
                     You're welcome to work on any feature you like&mdash;Play is open source after all!&mdash;but if you'd like some good ideas, look for issues tagged with the <a href="//github.com/playframework/playframework/issues?labels=community"><span class="issueLabel">community label</a>. These issues are ready and waiting for volunteers to pick them up.
                 </p>
                 <p>
-                    To keep our code tidy and to make sure we work together smoothly there are some <a href="@routes.Application.contributing()">Contributor Guidelines</a> that you'll need to make sure you follow.
+                    To keep our code tidy and to make sure we work together smoothly there are some <a href="@routes.Application.contributing">Contributor Guidelines</a> that you'll need to make sure you follow.
                 </p>
 
                 <h3 class="modules">Create modules</h3>
diff --git a/app/views/index.scala.html b/app/views/index.scala.html
@@ -24,7 +24,7 @@ <h1>
         <div id="actions">
             <div id="start">
                 <h2>Get Started</h2>
-                    <a href="@routes.Application.download()" class="button">Try Play <br> @releases.latest.version@for(name <- releases.latest.name){ "@name"}</a>
+                    <a href="@routes.Application.download" class="button">Try Play <br> @releases.latest.version@for(name <- releases.latest.name){ "@name"}</a>
                 <p>
                     or <a href="@routes.Application.allreleases()">browse all versions</a>
                 </p>
@@ -247,8 +247,8 @@ <h2>They already use Play Framework</h2>
         <article id="sponsors-backers">
             <h2>Sponsors & Backers</h2>
             <p>
-                If you find Play useful for work, please consider asking your company to support this Open Source project by <a href="@routes.Application.sponsors()">becoming a sponsor</a>.
-                    You can also individually sponsor the project by <a href="@routes.Application.sponsors()">becoming a backer</a>.
+                If you find Play useful for work, please consider asking your company to support this Open Source project by <a href="@routes.Application.sponsors">becoming a sponsor</a>.
+                    You can also individually sponsor the project by <a href="@routes.Application.sponsors">becoming a backer</a>.
             </p>
             <div class="donate-button">
                 <a href="//opencollective.com/playframework">Donate to our Collective</a>
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -58,10 +58,10 @@
             <div class="wrapper">
                 <a href="/" id="logo">Lightbend</a>
                 <nav id="sections">
-                    <a href="@routes.Application.gettingStarted()">Try Play</a>
+                    <a href="@routes.Application.gettingStarted">Try Play</a>
                     <a href="@reverseRouter.index(None)">Documentation</a>
-                    <a href="@routes.Application.support()">Support</a>
-                    <a href="@routes.Application.getInvolved()">Get Involved</a>
+                    <a href="@routes.Application.support">Support</a>
+                    <a href="@routes.Application.getInvolved">Get Involved</a>
                 </nav>
                 <nav id="social">
                     <a href="//opencollective.com/playframework"><span>Open Collective</span></a>
@@ -131,15 +131,15 @@ <h3>Community support</h3>
                 <article class="professional">
                     <h3>Donate to our Collective</h3>
                     <ul>
-                        <li><a href="@routes.Application.sponsors()">If you like Play consider becoming a sponsor</a></li>
+                        <li><a href="@routes.Application.sponsors">If you like Play consider becoming a sponsor</a></li>
                     </ul>
                 </article>
             </div>
             <div class="wrapper">
                 <div>
                     <h3>Play Framework</h3>
                     <ul>
-                        <li><a href="@routes.Application.download()">Try Play</a></li>
+                        <li><a href="@routes.Application.download">Try Play</a></li>
                         <li><a href="@reverseRouter.latest(None, "Tutorials")">Tutorials</a></li>
                         <li><a href="@reverseRouter.index(None)">Documentation</a></li>
                     </ul>
@@ -153,9 +153,9 @@ <h3>Community links</h3>
                 <div>
                     <h3>Code &amp; contribution</h3>
                     <ul>
-                        <li><a href="@routes.Code.index()">Code &amp; contributors</a></li>
+                        <li><a href="@routes.Code.index">Code &amp; contributors</a></li>
                         <li><a href="//github.com/playframework/playframework/issues">Bug tracker <em>GitHub</em></a></li>
-                        <li><a href="@routes.Application.getInvolved()">Get involved</a></li>
+                        <li><a href="@routes.Application.getInvolved">Get involved</a></li>
                     </ul>
                 </div>
                 <div>
@@ -180,7 +180,7 @@ <h3>Social networks</h3>
                     <a href="https://www.lightbend.com/legal/licenses" target="_blank">Licenses</a> |
                     <a href="https://www.lightbend.com/legal/terms" target="_blank">Terms</a> |
                     <a href="https://www.lightbend.com/legal/privacy" target="_blank">Privacy Policy</a> |
-                    <a href="@routes.Application.cookie()">Cookie Listing</a> |
+                    <a href="@routes.Application.cookie">Cookie Listing</a> |
                     <a class="optanon-toggle-display">Cookie Settings</a>
                 </p>
             </div>
diff --git a/app/views/outreachy/round10.scala.html b/app/views/outreachy/round10.scala.html
@@ -31,7 +31,7 @@ <h2>Outreachy - Round 10</h2>
             <h2>Getting started</h2>
 
             <p>
-                The best way to get started is to read Play's <a href="@routes.Application.getInvolved()">Get Involved</a>
+                The best way to get started is to read Play's <a href="@routes.Application.getInvolved">Get Involved</a>
                 page.  From there you can find information about the project issue tracker and mailing lists, links to
                 instructions for building Play from source.
             </p>
diff --git a/app/views/outreachy/round15.scala.html b/app/views/outreachy/round15.scala.html
@@ -31,7 +31,7 @@ <h2>Outreachy - Round 15</h2>
             <h2>Getting started</h2>
 
             <p>
-                The best way to get started is to read Play's <a href="@routes.Application.getInvolved()">Get Involved</a>
+                The best way to get started is to read Play's <a href="@routes.Application.getInvolved">Get Involved</a>
                 page. From there you can find information about the project issue tracker and mailing lists, links to
                 instructions for building Play from source.
             </p>
diff --git a/app/views/sponsors.scala.html b/app/views/sponsors.scala.html
@@ -21,7 +21,7 @@ <h1>Why sponsor Play?</h1>
             <div class="donate-button">
                 <a href="//opencollective.com/playframework">Donate to our Collective</a>
             </div>
-            <p>Of course, we also encourage and highly appreciate <a href="@routes.Application.getInvolved()">other ways to contribute</a> to the project and its community as well.</p>
+            <p>Of course, we also encourage and highly appreciate <a href="@routes.Application.getInvolved">other ways to contribute</a> to the project and its community as well.</p>
             <section>
                 <h2>Becoming a backer</h2>
                 <p>
diff --git a/build.sbt b/build.sbt
@@ -3,7 +3,7 @@ version := "1.0-SNAPSHOT"
 
 enablePlugins(PlayScala, NewRelic)
 
-scalaVersion := "2.13.5"
+scalaVersion := "2.13.7"
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
 
 libraryDependencies ++= Seq(
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.dwijnand"      % "sbt-travisci" % "1.2.0")
-addSbtPlugin("com.typesafe.play" % "sbt-plugin"   % "2.8.7")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin"   % "2.8.11")
 addSbtPlugin("com.typesafe.sbt"  % "sbt-digest"   % "1.1.4")
 addSbtPlugin("com.typesafe.sbt"  % "sbt-gzip"     % "1.0.2")
 addSbtPlugin("com.typesafe.sbt"  % "sbt-stylus"   % "1.1.0")
diff --git a/test/utils/GitFileRepositoryPerformanceTest.scala b/test/utils/GitFileRepositoryPerformanceTest.scala
@@ -72,18 +72,18 @@ object GitFileRepositoryPerformanceTest extends App {
     println(s"Total time spent loading markdown files: ${(loadFileTiming.get() / 1000000)}ms")
   }
 
-  println
+  println()
   println("Test run 1:")
-  println
+  println()
   runTest(10, 10)
 
-  println
+  println()
   println("Test run 2:")
-  println
+  println()
   runTest(10, 10)
 
-  println
+  println()
   println("Test run 3:")
-  println
+  println()
   runTest(10, 10)
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ case class Sitemap(urls: Seq[SitemapUrl]) {`
`40`	`40`	`urls.map { url =>`
`41`	`41`	`<url>`
`42`	`42`	`<loc>{url.loc}</loc>`
`43`		`- <priority>{url.priority.value.formatted("%.2f")}</priority>`
	`43`	`+ <priority>{"%.2f".format(url.priority.value)}</priority>`
`44`	`44`	`{`
`45`	`45`	`url.alternates.map {`
`46`	`46`	`case (lang, href) =>`