Run tests against Scala 2.12.14 and 2.13.6 and sbt 1.5.3

.travis.yml

@@ -17,9 +17,9 @@ env:
     - secure: "NS2hMbBcmi6EF4QxtcNs4A2ZuNmIdLYQRJUWWejgnD4YtcsmoVjxrHRedqrnDdui4DyvaxWhg/3Uds23jEKTSbbh3ZphLO77BVgM2nUGUvVoa4i6qGF2eZFlIhq2G1gM700GPV7X4KmyjYi2HtH8CWBTkqP3g0An63mCZw/Gnlk="
     # These are the versions used for (scripted) tests. The versions Play is build with however are defined in interplay.
     - SCRIPTED_SBT_1_3: "1.3.13"
-    - SCRIPTED_SBT_1_5: "1.5.2"
-    - TEST_SCALA_2_12: "2.12.13"
-    - TEST_SCALA_2_13: "2.13.5"
+    - SCRIPTED_SBT_1_5: "1.5.3"
+    - TEST_SCALA_2_12: "2.12.14"
+    - TEST_SCALA_2_13: "2.13.6"
   jobs:
     - TRAVIS_JDK=11
 

dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala

@@ -29,9 +29,7 @@ object ScriptedTools extends AutoPlugin {
   override def trigger = allRequirements
 
   override def projectSettings: Seq[Def.Setting[_]] = Def.settings(
-    // using this variant due to sbt#5405
-    resolvers += "sonatype-service-local-releases"
-      .at("https://oss.sonatype.org/service/local/repositories/releases/content/"), // sync ScriptedTools.scala
+    resolvers += Resolver.sonatypeRepo("releases"), // sync BuildSettings.scala
     // This is copy/pasted from AkkaSnapshotRepositories since scripted tests also need
     // the snapshot resolvers in `cron` builds.
     // If this is a cron job in Travis:

documentation/build.sbt

@@ -77,8 +77,8 @@ lazy val main = Project("Play-Documentation", file("."))
     unmanagedResourceDirectories in Test ++= (baseDirectory.value / "manual" / "detailedTopics" ** "code").get,
     // Don't include sbt files in the resources
     excludeFilter in (Test, unmanagedResources) := (excludeFilter in (Test, unmanagedResources)).value || "*.sbt",
-    crossScalaVersions := Seq("2.13.5", "2.12.13"),
-    scalaVersion := "2.13.5",
+    crossScalaVersions := Seq("2.13.6", "2.12.14"),
+    scalaVersion := "2.13.6",
     fork in Test := true,
     javaOptions in Test ++= Seq("-Xmx512m", "-Xms128m"),
     headerLicense := Some(HeaderLicense.Custom("Copyright (C) Lightbend Inc. <https://www.lightbend.com>")),

documentation/manual/hacking/BuildingFromSource.md

@@ -38,7 +38,7 @@ This will build and publish Play for the default Scala version. If you want to p
 Or to publish for a specific Scala version:
 
 ```bash
-> ++ 2.13.5 publishLocal
+> ++ 2.13.6 publishLocal
 ```
 
 ## Build the documentation

documentation/manual/releases/release26/Highlights26.md

@@ -12,7 +12,7 @@ You can select which version of Scala you would like to use by setting the `scal
 For Scala 2.12:
 
 ```scala
-scalaVersion := "2.12.13"
+scalaVersion := "2.12.14"
 ```
 
 For Scala 2.11:
@@ -30,7 +30,7 @@ lazy val root = (project in file("."))
   .enablePlugins(PlayService)
   .enablePlugins(RoutesCompiler) // place routes in src/main/resources, or remove if using SIRD/RoutingDsl
   .settings(
-    scalaVersion := "2.12.13",
+    scalaVersion := "2.12.14",
     libraryDependencies ++= Seq(
       guice, // remove if not using Play's Guice loader
       akkaHttpServer, // or use nettyServer for Netty

documentation/manual/releases/release27/Highlights27.md

@@ -12,7 +12,7 @@ You can select which version of Scala you would like to use by setting the `scal
 For Scala 2.12:
 
 ```scala
-scalaVersion := "2.12.13"
+scalaVersion := "2.12.14"
 ```
 
 For Scala 2.11:
@@ -24,7 +24,7 @@ scalaVersion := "2.11.12"
 For Scala 2.13:
 
 ```scala
-scalaVersion := "2.13.5"
+scalaVersion := "2.13.6"
 ```
 
 ## Lifecycle managed by Akka's Coordinated Shutdown

documentation/manual/releases/release28/migration28/Migration28.md

@@ -47,14 +47,14 @@ Play 2.8 support Scala 2.12 and 2.13, but not 2.11, which has reached its end of
 To set the Scala version in sbt, simply set the `scalaVersion` key, for example:
 
 ```scala
-scalaVersion := "2.13.5"
+scalaVersion := "2.13.6"
 ```
 
 If you have a single project build, then this setting can just be placed on its own line in `build.sbt`.  However, if you have a multi-project build, then the scala version setting must be set on each project.  Typically, in a multi-project build, you will have some common settings shared by every project, this is the best place to put the setting, for example:
 
 ```scala
 def commonSettings = Seq(
-  scalaVersion := "2.13.5"
+  scalaVersion := "2.13.6"
 )
 
 val projectA = (project in file("projectA"))

documentation/manual/working/commonGuide/build/sbtDependencies.md

@@ -37,7 +37,7 @@ If you use `groupID %% artifactID % revision` rather than `groupID % artifactID
 
 @[explicit-scala-version-dep](code/dependencies.sbt)
 
-Assuming the `scalaVersion` for your build is `2.13.5`, the following is identical (note the double `%%` after `"org.scala-tools"`):
+Assuming the `scalaVersion` for your build is `2.13.6`, the following is identical (note the double `%%` after `"org.scala-tools"`):
 
 @[auto-scala-version-dep](code/dependencies.sbt)
 

documentation/project/build.properties

@@ -2,4 +2,4 @@
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
 # sync with project/build.properties
-sbt.version=1.5.2
+sbt.version=1.5.3

project/BuildSettings.scala

@@ -75,9 +75,7 @@ object BuildSettings {
     homepage := Some(url("https://playframework.com")),
     ivyLoggingLevel := UpdateLogging.DownloadOnly,
     resolvers ++= Seq(
-      // using this variant due to sbt#5405
-      "sonatype-service-local-releases"
-        .at("https://oss.sonatype.org/service/local/repositories/releases/content/"), // sync ScriptedTools.scala
+      Resolver.sonatypeRepo("releases"), // sync ScriptedTools.scala
       Resolver.typesafeRepo("releases"),
       Resolver.typesafeIvyRepo("releases"),
       Resolver.sbtPluginRepo("releases"), // weird sbt-pgp/play docs/vegemite issue

project/Dependencies.scala

@@ -292,8 +292,8 @@ object Dependencies {
  * How to use this:
  *    $ sbt -J-XX:+UnlockCommercialFeatures -J-XX:+FlightRecorder -Dakka-http.sources=$HOME/code/akka-http '; project Play-Akka-Http-Server; test:run'
  *
- * Make sure Akka-HTTP has 2.12 as the FIRST version (or that scalaVersion := "2.12.13", otherwise it won't find the artifact
- *    crossScalaVersions := Seq("2.12.13", "2.11.12"),
+ * Make sure Akka-HTTP has 2.12 as the FIRST version (or that scalaVersion := "2.12.14", otherwise it won't find the artifact
+ *    crossScalaVersions := Seq("2.12.14", "2.11.12"),
  */
 object AkkaDependency {
   // Needs to be a URI like git://github.com/akka/akka.git#master or file:///xyz/akka

project/build.properties

@@ -2,4 +2,4 @@
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
 # sync with documentation/project/build.properties
-sbt.version=1.5.2
+sbt.version=1.5.3