From 5886c2854722e5ddf1e2e9b6147d82f20a88ebb8 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 28 May 2021 18:28:15 +0200 Subject: [PATCH 1/3] Run tests against Scala 2.12.14 and 2.13.6 (cherry picked from commit e27385fff43d7cc2b9f2f03ca8ee6ac01879b243) --- .travis.yml | 4 ++-- documentation/build.sbt | 4 ++-- documentation/manual/hacking/BuildingFromSource.md | 2 +- documentation/manual/releases/release26/Highlights26.md | 4 ++-- documentation/manual/releases/release27/Highlights27.md | 4 ++-- .../manual/releases/release28/migration28/Migration28.md | 4 ++-- .../manual/working/commonGuide/build/sbtDependencies.md | 2 +- project/Dependencies.scala | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff22b6e0fac..29f14dd81e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ env: - SCRIPTED_SBT_0_13: "0.13.18" - 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" + - TEST_SCALA_2_12: "2.12.14" + - TEST_SCALA_2_13: "2.13.6" jobs: - TRAVIS_JDK=8 diff --git a/documentation/build.sbt b/documentation/build.sbt index 43d02fe4f47..ed5c82bd14c 100644 --- a/documentation/build.sbt +++ b/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. ")), diff --git a/documentation/manual/hacking/BuildingFromSource.md b/documentation/manual/hacking/BuildingFromSource.md index c05ed019b55..451dfc30400 100644 --- a/documentation/manual/hacking/BuildingFromSource.md +++ b/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 diff --git a/documentation/manual/releases/release26/Highlights26.md b/documentation/manual/releases/release26/Highlights26.md index 7ddfc0bbf42..79665ee36f4 100644 --- a/documentation/manual/releases/release26/Highlights26.md +++ b/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 diff --git a/documentation/manual/releases/release27/Highlights27.md b/documentation/manual/releases/release27/Highlights27.md index 15fd37ea319..65c41c676da 100644 --- a/documentation/manual/releases/release27/Highlights27.md +++ b/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 diff --git a/documentation/manual/releases/release28/migration28/Migration28.md b/documentation/manual/releases/release28/migration28/Migration28.md index 28ee3213acf..561318fe670 100644 --- a/documentation/manual/releases/release28/migration28/Migration28.md +++ b/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")) diff --git a/documentation/manual/working/commonGuide/build/sbtDependencies.md b/documentation/manual/working/commonGuide/build/sbtDependencies.md index 410c425543a..95328241775 100644 --- a/documentation/manual/working/commonGuide/build/sbtDependencies.md +++ b/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) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d41cd388048..4b61aeb9a7c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -313,8 +313,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 From b30d6b33629a5d9294dbfdc3339aa60dd26a680d Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 1 Jun 2021 11:00:41 +0200 Subject: [PATCH 2/3] sbt 1.5.3 (cherry picked from commit 8bae9cad7ca7798972a4e659aeaad3198eae527f) # Conflicts: # documentation/project/build.properties # project/build.properties --- .travis.yml | 2 +- .../src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala | 4 +--- documentation/project/build.properties | 4 ++++ project/BuildSettings.scala | 4 +--- project/build.properties | 4 ++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 29f14dd81e6..697c095c872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: # These are the versions used for (scripted) tests. The versions Play is build with however are defined in interplay. - SCRIPTED_SBT_0_13: "0.13.18" - SCRIPTED_SBT_1_3: "1.3.13" - - SCRIPTED_SBT_1_5: "1.5.2" + - SCRIPTED_SBT_1_5: "1.5.3" - TEST_SCALA_2_12: "2.12.14" - TEST_SCALA_2_13: "2.13.6" jobs: diff --git a/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala b/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala index d1bdfbe04e9..21db663e926 100644 --- a/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala +++ b/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala @@ -35,9 +35,7 @@ object ScriptedTools extends AutoPlugin with ScriptedTools0 { lazy val initialFileWatchService = play.dev.filewatch.FileWatchService.polling(500) 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: diff --git a/documentation/project/build.properties b/documentation/project/build.properties index 7fe6ad4cfa8..319f62315a1 100644 --- a/documentation/project/build.properties +++ b/documentation/project/build.properties @@ -2,4 +2,8 @@ # Copyright (C) Lightbend Inc. # # sync with project/build.properties +<<<<<<< HEAD sbt.version=1.3.13 +======= +sbt.version=1.5.3 +>>>>>>> 8bae9cad7c (sbt 1.5.3) diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index fce5437b322..e65a2a5cd72 100644 --- a/project/BuildSettings.scala +++ b/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 diff --git a/project/build.properties b/project/build.properties index 885be919393..ed2724e7b8d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,4 +2,8 @@ # Copyright (C) Lightbend Inc. # # sync with documentation/project/build.properties +<<<<<<< HEAD sbt.version=1.3.13 +======= +sbt.version=1.5.3 +>>>>>>> 8bae9cad7c (sbt 1.5.3) From 550caad95d9b3013d9e98f5684ea66b92a1309b2 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 8 Jun 2021 11:08:18 +0200 Subject: [PATCH 3/3] Fix merge conflicts --- .../src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala | 4 +++- documentation/project/build.properties | 4 ---- project/BuildSettings.scala | 4 +++- project/build.properties | 4 ---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala b/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala index 21db663e926..d1bdfbe04e9 100644 --- a/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala +++ b/dev-mode/sbt-scripted-tools/src/main/scala/play/sbt/scriptedtools/ScriptedTools.scala @@ -35,7 +35,9 @@ object ScriptedTools extends AutoPlugin with ScriptedTools0 { lazy val initialFileWatchService = play.dev.filewatch.FileWatchService.polling(500) override def projectSettings: Seq[Def.Setting[_]] = Def.settings( - resolvers += Resolver.sonatypeRepo("releases"), // sync BuildSettings.scala + // 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 // 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: diff --git a/documentation/project/build.properties b/documentation/project/build.properties index 319f62315a1..7fe6ad4cfa8 100644 --- a/documentation/project/build.properties +++ b/documentation/project/build.properties @@ -2,8 +2,4 @@ # Copyright (C) Lightbend Inc. # # sync with project/build.properties -<<<<<<< HEAD sbt.version=1.3.13 -======= -sbt.version=1.5.3 ->>>>>>> 8bae9cad7c (sbt 1.5.3) diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index e65a2a5cd72..fce5437b322 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -75,7 +75,9 @@ object BuildSettings { homepage := Some(url("https://playframework.com")), ivyLoggingLevel := UpdateLogging.DownloadOnly, resolvers ++= Seq( - Resolver.sonatypeRepo("releases"), // sync ScriptedTools.scala + // 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.typesafeRepo("releases"), Resolver.typesafeIvyRepo("releases"), Resolver.sbtPluginRepo("releases"), // weird sbt-pgp/play docs/vegemite issue diff --git a/project/build.properties b/project/build.properties index ed2724e7b8d..885be919393 100644 --- a/project/build.properties +++ b/project/build.properties @@ -2,8 +2,4 @@ # Copyright (C) Lightbend Inc. # # sync with documentation/project/build.properties -<<<<<<< HEAD sbt.version=1.3.13 -======= -sbt.version=1.5.3 ->>>>>>> 8bae9cad7c (sbt 1.5.3)