diff --git a/java/chatroom/build.gradle.kts b/java/chatroom/build.gradle.kts index 8e205d5bd..f38cec514 100644 --- a/java/chatroom/build.gradle.kts +++ b/java/chatroom/build.gradle.kts @@ -18,6 +18,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-java-forms_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/chatroom/build.sbt b/java/chatroom/build.sbt index 67b037aa2..45dff6a9f 100644 --- a/java/chatroom/build.sbt +++ b/java/chatroom/build.sbt @@ -6,10 +6,10 @@ lazy val root = (project in file(".")) .settings( name := """play-java-chatroom-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( - "org.webjars" %% "webjars-play" % "3.1.0-M5+4-18ad4fde-SNAPSHOT", + "org.webjars" %% "webjars-play" % "3.1.0-M5+7-9491b067-SNAPSHOT", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "5.3.8", guice, @@ -25,3 +25,14 @@ lazy val root = (project in file(".")) "-Xlint:deprecation" ) ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/chatroom/gradle/libs.versions.toml b/java/chatroom/gradle/libs.versions.toml index 0007dbdc5..6ad3e6ff7 100644 --- a/java/chatroom/gradle/libs.versions.toml +++ b/java/chatroom/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" -webjars-play = "3.1.0-M5+4-18ad4fde-SNAPSHOT" +webjars-play = "3.1.0-M5+7-9491b067-SNAPSHOT" flot = "0.8.3-1" bootstrap = "5.3.8" assertj = "3.27.7" diff --git a/java/chatroom/project/build.properties b/java/chatroom/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/chatroom/project/build.properties +++ b/java/chatroom/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/chatroom/project/plugins.sbt b/java/chatroom/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/java/chatroom/project/plugins.sbt +++ b/java/chatroom/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/compile-di/build.gradle.kts b/java/compile-di/build.gradle.kts index b01f0c7fb..c4fe0fe4c 100644 --- a/java/compile-di/build.gradle.kts +++ b/java/compile-di/build.gradle.kts @@ -13,6 +13,16 @@ scala { scalaVersion = providers.systemProperty("scala.version") } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-java_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/compile-di/build.sbt b/java/compile-di/build.sbt index 099991ab0..d122ecfee 100644 --- a/java/compile-di/build.sbt +++ b/java/compile-di/build.sbt @@ -7,7 +7,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalaVersion := crossScalaVersions.value.head @@ -15,3 +15,14 @@ ThisBuild / scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-featur ThisBuild / javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror") Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/compile-di/gradle/libs.versions.toml b/java/compile-di/gradle/libs.versions.toml index 4dc65d5d4..468be9301 100644 --- a/java/compile-di/gradle/libs.versions.toml +++ b/java/compile-di/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -play = "3.1.0-M10-3968a052-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/compile-di/gradle/wrapper/gradle-wrapper.jar b/java/compile-di/gradle/wrapper/gradle-wrapper.jar index 9fa7f2882..51cbd2a6f 100644 Binary files a/java/compile-di/gradle/wrapper/gradle-wrapper.jar and b/java/compile-di/gradle/wrapper/gradle-wrapper.jar differ diff --git a/java/compile-di/gradle/wrapper/gradle-wrapper.properties b/java/compile-di/gradle/wrapper/gradle-wrapper.properties index 5907d39c3..0bb71f346 100644 --- a/java/compile-di/gradle/wrapper/gradle-wrapper.properties +++ b/java/compile-di/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=21bd5da2de49b642904077f38c0efdc7778e92b3ed0889392dca61b97e389607 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip +distributionSha256Sum=0b00b0ffe07c4d4789c12d4935a44a7057d55774b7540bd4a3f76f336deb177a +distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/java/compile-di/project/build.properties b/java/compile-di/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/compile-di/project/build.properties +++ b/java/compile-di/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/compile-di/project/plugins.sbt b/java/compile-di/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/java/compile-di/project/plugins.sbt +++ b/java/compile-di/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/dagger2/build.gradle.kts b/java/dagger2/build.gradle.kts index 52554b88b..43268d4f8 100644 --- a/java/dagger2/build.gradle.kts +++ b/java/dagger2/build.gradle.kts @@ -19,6 +19,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-java-forms_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/dagger2/build.sbt b/java/dagger2/build.sbt index 5b42a8a1f..fdd7c0534 100644 --- a/java/dagger2/build.sbt +++ b/java/dagger2/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-dagger2-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, @@ -25,3 +25,14 @@ lazy val root = (project in file(".")) // Verbose tests (Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/dagger2/gradle/libs.versions.toml b/java/dagger2/gradle/libs.versions.toml index 7b5f8dba2..bf8c5dcd8 100644 --- a/java/dagger2/gradle/libs.versions.toml +++ b/java/dagger2/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" dagger = "2.60.1" diff --git a/java/dagger2/project/build.properties b/java/dagger2/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/dagger2/project/build.properties +++ b/java/dagger2/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/dagger2/project/plugins.sbt b/java/dagger2/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/java/dagger2/project/plugins.sbt +++ b/java/dagger2/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/ebean/build.gradle.kts b/java/ebean/build.gradle.kts index 65c3b34f5..2ceb4ed44 100644 --- a/java/ebean/build.gradle.kts +++ b/java/ebean/build.gradle.kts @@ -20,6 +20,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.asProvider().get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.asProvider().get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.asProvider().get()}") diff --git a/java/ebean/build.sbt b/java/ebean/build.sbt index 6d58280e0..47a0dd5e6 100644 --- a/java/ebean/build.sbt +++ b/java/ebean/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := "play-java-ebean-example", version := "1.0.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, @@ -19,3 +19,14 @@ lazy val root = (project in file(".")) (Test / testOptions) += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation", "-Werror") ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/ebean/gradle/libs.versions.toml b/java/ebean/gradle/libs.versions.toml index 52bc05c07..55f5fd4be 100644 --- a/java/ebean/gradle/libs.versions.toml +++ b/java/ebean/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" -play-ebean = "9.0.0-M2+127-9383f3c1-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" +play-ebean = "9.0.0-M2+172-a45d3bf5-SNAPSHOT" ebean = "19.6.0" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19 h2 = "2.5.252" junit = "4.13.2" diff --git a/java/ebean/project/build.properties b/java/ebean/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/ebean/project/build.properties +++ b/java/ebean/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/ebean/project/plugins.sbt b/java/ebean/project/plugins.sbt index e427e42d3..676cf0cd0 100644 --- a/java/ebean/project/plugins.sbt +++ b/java/ebean/project/plugins.sbt @@ -1,5 +1,10 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") -addSbtPlugin("org.playframework" % "sbt-play-ebean" % "9.0.0-M2+127-9383f3c1-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-play-ebean" % "9.0.0-M2+172-a45d3bf5-SNAPSHOT") + +// Keep Ebean's transitive Play plugin on the version declared above. +dependencyOverrides ++= libraryDependencies.value.filter { dependency => + dependency.organization == "org.playframework" && dependency.name == "sbt-plugin" +} diff --git a/java/fileupload/build.gradle.kts b/java/fileupload/build.gradle.kts index b28201d1e..9a6fa3e52 100644 --- a/java/fileupload/build.gradle.kts +++ b/java/fileupload/build.gradle.kts @@ -19,6 +19,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/fileupload/build.sbt b/java/fileupload/build.sbt index 5334c7de3..2f25d9f90 100644 --- a/java/fileupload/build.sbt +++ b/java/fileupload/build.sbt @@ -6,9 +6,20 @@ lazy val root = (project in file(".")) .settings( name := """play-java-fileupload-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies += guice, testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"), javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation", "-Werror") ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/fileupload/gradle/libs.versions.toml b/java/fileupload/gradle/libs.versions.toml index 634ceb0ec..2a8e18eea 100644 --- a/java/fileupload/gradle/libs.versions.toml +++ b/java/fileupload/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/fileupload/project/build.properties b/java/fileupload/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/fileupload/project/build.properties +++ b/java/fileupload/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/fileupload/project/plugins.sbt b/java/fileupload/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/java/fileupload/project/plugins.sbt +++ b/java/fileupload/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/forms/build.gradle.kts b/java/forms/build.gradle.kts index b28201d1e..9a6fa3e52 100644 --- a/java/forms/build.gradle.kts +++ b/java/forms/build.gradle.kts @@ -19,6 +19,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/forms/build.sbt b/java/forms/build.sbt index db93dc3ce..3fde0b81b 100644 --- a/java/forms/build.sbt +++ b/java/forms/build.sbt @@ -7,7 +7,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalaVersion := crossScalaVersions.value.head @@ -21,3 +21,14 @@ javacOptions ++= Seq( "-Xlint:deprecation", "-Werror" ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/forms/gradle/libs.versions.toml b/java/forms/gradle/libs.versions.toml index 634ceb0ec..2a8e18eea 100644 --- a/java/forms/gradle/libs.versions.toml +++ b/java/forms/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/forms/project/build.properties b/java/forms/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/forms/project/build.properties +++ b/java/forms/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/forms/project/plugins.sbt b/java/forms/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/java/forms/project/plugins.sbt +++ b/java/forms/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/grpc/build.sbt b/java/grpc/build.sbt index bf1083f0a..6aeeba3c8 100644 --- a/java/grpc/build.sbt +++ b/java/grpc/build.sbt @@ -17,11 +17,18 @@ lazy val `play-java-grpc-example` = (project in file(".")) .enablePlugins(PlayPekkoHttp2Support) // enables serving HTTP/2 and gRPC // #grpc_play_plugins .settings( + // Let javac handle the protected BuilderParent types in generated Protobuf Java sources. + Compile / compileOrder := CompileOrder.JavaThenScala, + // Reverse routes are unused here; omitting them avoids a Java/Scala compilation cycle. + Compile / generateReverseRouter := false, + Compile / generateJsReverseRouter := false, + // TODO: Remove once Pekko gRPC and Play gRPC are released against Pekko and Pekko HTTP 2.0.0. dependencyOverrides ++= Seq( - // TODO: Remove once Pekko gRPC 2.0.0-M3+ is released and Play gRPC pulls in these Pekko versions. - "org.apache.pekko" %% "pekko-stream" % pekkoVersion, - "org.apache.pekko" %% "pekko-discovery" % pekkoVersion, - ), + "pekko-actor", "pekko-actor-typed", "pekko-stream", "pekko-discovery", + "pekko-slf4j", "pekko-serialization-jackson" + ).map("org.apache.pekko" %% _ % pekkoVersion) ++ Seq( + "pekko-http", "pekko-http-core", "pekko-http-spray-json", "pekko-parsing" + ).map("org.apache.pekko" %% _ % pekkoHttpVersion), // TODO: Remove once https://github.com/apache/pekko-grpc/pull/895 is included in a release. Compile / unmanagedResourceDirectories ~= (_.distinct), pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java), @@ -60,7 +67,7 @@ lazy val `play-java-grpc-example` = (project in file(".")) ) scalaVersion := "2.13.18" -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked") javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation") @@ -89,3 +96,14 @@ val TestDeps = Seq( lazy val docs = (project in file("docs")) .enablePlugins(ParadoxPlugin) .settings(name := "play-java-grpc-example-docs") + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/grpc/project/build.properties b/java/grpc/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/grpc/project/build.properties +++ b/java/grpc/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/grpc/project/plugins.sbt b/java/grpc/project/plugins.sbt index 978a0cc5c..7a2e2e067 100644 --- a/java/grpc/project/plugins.sbt +++ b/java/grpc/project/plugins.sbt @@ -1,10 +1,10 @@ enablePlugins(BuildInfoPlugin) -val playGrpcV = "0.13.0-M5+86-69b1467c-SNAPSHOT" +val playGrpcV = "0.13.0-M5+100-db929b07-SNAPSHOT" buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV) buildInfoPackage := "play.java.grpc.sample" resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.11.1") diff --git a/java/hello-world/build.gradle.kts b/java/hello-world/build.gradle.kts index 0be868428..5eeed6546 100644 --- a/java/hello-world/build.gradle.kts +++ b/java/hello-world/build.gradle.kts @@ -18,6 +18,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/hello-world/build.sbt b/java/hello-world/build.sbt index 5670ccaca..1ba07d715 100644 --- a/java/hello-world/build.sbt +++ b/java/hello-world/build.sbt @@ -8,8 +8,19 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalaVersion := crossScalaVersions.value.head libraryDependencies += guice + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/hello-world/gradle/libs.versions.toml b/java/hello-world/gradle/libs.versions.toml index 634ceb0ec..2a8e18eea 100644 --- a/java/hello-world/gradle/libs.versions.toml +++ b/java/hello-world/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/hello-world/project/build.properties b/java/hello-world/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/hello-world/project/build.properties +++ b/java/hello-world/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/hello-world/project/plugins.sbt b/java/hello-world/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/java/hello-world/project/plugins.sbt +++ b/java/hello-world/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/jpa/build.gradle.kts b/java/jpa/build.gradle.kts index d4a60cbb0..4c53ffe09 100644 --- a/java/jpa/build.gradle.kts +++ b/java/jpa/build.gradle.kts @@ -20,6 +20,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/jpa/build.sbt b/java/jpa/build.sbt index e0390edb4..1ab661e60 100644 --- a/java/jpa/build.sbt +++ b/java/jpa/build.sbt @@ -6,13 +6,13 @@ lazy val root = (project in file(".")) .settings( name := """play-java-jpa-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, javaJpa, "com.h2database" % "h2" % "2.5.252", - "org.hibernate.orm" % "hibernate-core" % "7.4.14.Final", + "org.hibernate.orm" % "hibernate-core" % "7.4.16.Final", javaWs % "test", "org.awaitility" % "awaitility" % "4.3.0" % "test", "org.assertj" % "assertj-core" % "3.27.7" % "test", @@ -23,3 +23,14 @@ lazy val root = (project in file(".")) javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"), PlayKeys.externalizeResourcesExcludes += baseDirectory.value / "conf" / "META-INF" / "persistence.xml" ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/jpa/gradle/libs.versions.toml b/java/jpa/gradle/libs.versions.toml index aa5e27e54..16404a8f6 100644 --- a/java/jpa/gradle/libs.versions.toml +++ b/java/jpa/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" node = "7.1.0" h2 = "2.5.252" -hibernate = "7.4.14.Final" +hibernate = "7.4.16.Final" junit = "4.13.2" assertj = "3.27.7" awaitility = "4.3.0" diff --git a/java/jpa/package-lock.json b/java/jpa/package-lock.json index 5d880c468..785c4608f 100644 --- a/java/jpa/package-lock.json +++ b/java/jpa/package-lock.json @@ -10,9 +10,9 @@ } }, "node_modules/coffeescript": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz", - "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.1.tgz", + "integrity": "sha512-zDQ0M/Ad05+5eudURWh31RIQc8i1TxIWuUgidoRx7gtrcQnDwSwSckVaJLg3AGKE+z0PuKnIOZ1DZnYvebuvIg==", "dev": true, "license": "MIT", "bin": { diff --git a/java/jpa/project/build.properties b/java/jpa/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/jpa/project/build.properties +++ b/java/jpa/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/jpa/project/plugins.sbt b/java/jpa/project/plugins.sbt index 9cf15eeed..4967dca69 100644 --- a/java/jpa/project/plugins.sbt +++ b/java/jpa/project/plugins.sbt @@ -1,11 +1,11 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") // Web plugins -addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.1.0-M3+29-99381aea-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-less" % "2.1.0-M2+39-32daabb4-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-jshint" % "2.1.0-M1+33-22eb7a8a-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-rjs" % "2.1.0-M1+33-d0d08f2d-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.2.0-M1+35-897604da-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-mocha" % "2.2.0-M3+18-843576a8-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.1.0-M3+31-12f03c14-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-less" % "2.1.0-M2+41-00c929d9-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-jshint" % "2.1.0-M1+35-9f5a637e-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-rjs" % "2.1.0-M1+35-37576a42-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-digest" % "2.2.0-M1+37-182f1b3b-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-mocha" % "2.2.0-M3+20-50ffccc9-SNAPSHOT") diff --git a/java/pekko-cluster/build.gradle.kts b/java/pekko-cluster/build.gradle.kts index c536202e5..102824c4a 100644 --- a/java/pekko-cluster/build.gradle.kts +++ b/java/pekko-cluster/build.gradle.kts @@ -18,6 +18,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/pekko-cluster/build.sbt b/java/pekko-cluster/build.sbt index 69d7aa524..7553979fa 100644 --- a/java/pekko-cluster/build.sbt +++ b/java/pekko-cluster/build.sbt @@ -10,7 +10,7 @@ version := "1.0-SNAPSHOT" lazy val root = (project in file(".")).enablePlugins(PlayJava) //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalaVersion := crossScalaVersions.value.head @@ -26,3 +26,14 @@ Test / javaOptions ++= Seq("--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED" // Sending messages from a node to another in the Pekko Cluster requires serializing. This // example application uses the default Pekko Jackson serializer with the CBOR format. // See also `conf/serialization.conf` and `services.CborSerializable` for more info. + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/pekko-cluster/gradle/libs.versions.toml b/java/pekko-cluster/gradle/libs.versions.toml index f6b313b1c..da8dcfa10 100644 --- a/java/pekko-cluster/gradle/libs.versions.toml +++ b/java/pekko-cluster/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" -pekko = "2.0.0-M4" +pekko = "2.0.0" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/java/pekko-cluster/project/build.properties b/java/pekko-cluster/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/pekko-cluster/project/build.properties +++ b/java/pekko-cluster/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/pekko-cluster/project/plugins.sbt b/java/pekko-cluster/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/java/pekko-cluster/project/plugins.sbt +++ b/java/pekko-cluster/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/rest-api/build.gradle.kts b/java/rest-api/build.gradle.kts index e3668cd10..ee969cf9d 100644 --- a/java/rest-api/build.gradle.kts +++ b/java/rest-api/build.gradle.kts @@ -18,6 +18,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/rest-api/build.sbt b/java/rest-api/build.sbt index 30b4804f5..70bd7ba34 100644 --- a/java/rest-api/build.sbt +++ b/java/rest-api/build.sbt @@ -1,7 +1,7 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) lazy val scala213 = "2.13.18" -lazy val scala3 = "3.3.8" +lazy val scala3 = "3.3.9" lazy val root = (project in file(".")) .enablePlugins(PlayJava) @@ -15,7 +15,7 @@ lazy val root = (project in file(".")) guice, javaJpa, "com.h2database" % "h2" % "2.5.252", - "org.hibernate.orm" % "hibernate-core" % "7.4.14.Final", + "org.hibernate.orm" % "hibernate-core" % "7.4.16.Final", "io.dropwizard.metrics" % "metrics-core" % "4.2.40", "com.palominolabs.http" % "url-builder" % "1.1.5", "dev.failsafe" % "failsafe" % "3.3.2", @@ -40,3 +40,14 @@ lazy val gatling = (project in file("gatling")) "io.gatling" % "gatling-test-framework" % gatlingVersion % Test ) ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/rest-api/gradle/libs.versions.toml b/java/rest-api/gradle/libs.versions.toml index 86eeb59c5..b0ac0e827 100644 --- a/java/rest-api/gradle/libs.versions.toml +++ b/java/rest-api/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" failsafe = "3.3.2" url-builder = "1.1.5" h2 = "2.5.252" -hibernate = "7.4.14.Final" +hibernate = "7.4.16.Final" metrics = "4.2.40" junit = "4.13.2" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] failsafe = { group = "dev.failsafe", name = "failsafe", version.ref = "failsafe" } diff --git a/java/rest-api/project/build.properties b/java/rest-api/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/rest-api/project/build.properties +++ b/java/rest-api/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/rest-api/project/plugins.sbt b/java/rest-api/project/plugins.sbt index 394266c7f..47cf525ae 100644 --- a/java/rest-api/project/plugins.sbt +++ b/java/rest-api/project/plugins.sbt @@ -1,6 +1,6 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") // Load testing tool: // https://gatling.io/docs/gatling/reference/current/extensions/sbt_plugin/ diff --git a/java/starter/build.gradle.kts b/java/starter/build.gradle.kts index 4008be50d..ec3ea06c5 100644 --- a/java/starter/build.gradle.kts +++ b/java/starter/build.gradle.kts @@ -18,6 +18,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/starter/build.sbt b/java/starter/build.sbt index 1404bc9cc..be35d9e73 100644 --- a/java/starter/build.sbt +++ b/java/starter/build.sbt @@ -6,7 +6,7 @@ lazy val root = (project in file(".")) .settings( name := """play-java-starter-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, @@ -27,3 +27,14 @@ lazy val root = (project in file(".")) // Make verbose tests (Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")) ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/starter/gradle/libs.versions.toml b/java/starter/gradle/libs.versions.toml index aa234fbe9..751f7fb29 100644 --- a/java/starter/gradle/libs.versions.toml +++ b/java/starter/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" h2 = "2.5.252" assertj = "3.27.7" diff --git a/java/starter/gradle/wrapper/gradle-wrapper.jar b/java/starter/gradle/wrapper/gradle-wrapper.jar index 9fa7f2882..51cbd2a6f 100644 Binary files a/java/starter/gradle/wrapper/gradle-wrapper.jar and b/java/starter/gradle/wrapper/gradle-wrapper.jar differ diff --git a/java/starter/gradle/wrapper/gradle-wrapper.properties b/java/starter/gradle/wrapper/gradle-wrapper.properties index 5907d39c3..0bb71f346 100644 --- a/java/starter/gradle/wrapper/gradle-wrapper.properties +++ b/java/starter/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=21bd5da2de49b642904077f38c0efdc7778e92b3ed0889392dca61b97e389607 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip +distributionSha256Sum=0b00b0ffe07c4d4789c12d4935a44a7057d55774b7540bd4a3f76f336deb177a +distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/java/starter/project/build.properties b/java/starter/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/starter/project/build.properties +++ b/java/starter/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/starter/project/plugins.sbt b/java/starter/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/java/starter/project/plugins.sbt +++ b/java/starter/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/streaming/build.gradle.kts b/java/streaming/build.gradle.kts index f0511698d..2362a419c 100644 --- a/java/streaming/build.gradle.kts +++ b/java/streaming/build.gradle.kts @@ -18,6 +18,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/streaming/build.sbt b/java/streaming/build.sbt index 9b7457fee..6e5d097c0 100644 --- a/java/streaming/build.sbt +++ b/java/streaming/build.sbt @@ -4,7 +4,7 @@ name := "play-java-streaming-example" version := "1.0-SNAPSHOT" -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalaVersion := crossScalaVersions.value.head lazy val root = (project in file(".")).enablePlugins(PlayJava) @@ -24,3 +24,14 @@ TwirlKeys.templateImports ++= Seq( "play.mvc.Http.{ RequestHeader => JRequestHeader }", "views.html.helper.CSPNonce" ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/streaming/gradle/libs.versions.toml b/java/streaming/gradle/libs.versions.toml index 634ceb0ec..2a8e18eea 100644 --- a/java/streaming/gradle/libs.versions.toml +++ b/java/streaming/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" junit = "4.13.2" [libraries] diff --git a/java/streaming/project/build.properties b/java/streaming/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/streaming/project/build.properties +++ b/java/streaming/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/streaming/project/plugins.sbt b/java/streaming/project/plugins.sbt index 2af4c379a..14f1f823f 100644 --- a/java/streaming/project/plugins.sbt +++ b/java/streaming/project/plugins.sbt @@ -1,3 +1,3 @@ // Use the Play sbt plugin for Play projects resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/java/websocket/build.gradle.kts b/java/websocket/build.gradle.kts index fe8f457af..d688c0888 100644 --- a/java/websocket/build.gradle.kts +++ b/java/websocket/build.gradle.kts @@ -20,6 +20,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == "org.playframework" && requested.version?.startsWith("3.1.0-M10-") == true) { + useVersion(libs.versions.play.get()) + because("Keep core Play modules and their Pekko dependencies on the configured snapshot") + } + } +} + dependencies { implementation("org.playframework:play-$server-server_$scalaBinaryVersion:${libs.versions.play.get()}") implementation("org.playframework:play-guice_$scalaBinaryVersion:${libs.versions.play.get()}") diff --git a/java/websocket/build.sbt b/java/websocket/build.sbt index 306c4307d..dbc9d9ed0 100644 --- a/java/websocket/build.sbt +++ b/java/websocket/build.sbt @@ -6,12 +6,12 @@ lazy val root = (project in file(".")) .settings( name := "play-java-websocket-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, ws, - "org.webjars" %% "webjars-play" % "3.1.0-M5+4-18ad4fde-SNAPSHOT", + "org.webjars" %% "webjars-play" % "3.1.0-M5+7-9491b067-SNAPSHOT", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "5.3.8", "org.assertj" % "assertj-core" % "3.27.7" % Test, @@ -29,3 +29,14 @@ lazy val root = (project in file(".")) "-Werror" ) ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/java/websocket/gradle/libs.versions.toml b/java/websocket/gradle/libs.versions.toml index 4fdb0abe9..3c0772751 100644 --- a/java/websocket/gradle/libs.versions.toml +++ b/java/websocket/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" node = "7.1.0" -webjars-play = "3.1.0-M5+4-18ad4fde-SNAPSHOT" +webjars-play = "3.1.0-M5+7-9491b067-SNAPSHOT" flot = "0.8.3-1" bootstrap = "5.3.8" junit = "4.13.2" diff --git a/java/websocket/package-lock.json b/java/websocket/package-lock.json index 667d8cbb2..55e2ad710 100644 --- a/java/websocket/package-lock.json +++ b/java/websocket/package-lock.json @@ -11,9 +11,9 @@ } }, "node_modules/coffeescript": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz", - "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.1.tgz", + "integrity": "sha512-zDQ0M/Ad05+5eudURWh31RIQc8i1TxIWuUgidoRx7gtrcQnDwSwSckVaJLg3AGKE+z0PuKnIOZ1DZnYvebuvIg==", "dev": true, "license": "MIT", "bin": { @@ -41,14 +41,14 @@ } }, "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "node_modules/errno": { @@ -66,11 +66,11 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.12.tgz", + "integrity": "sha512-iuyGF2E4oafQfPsRrG2wtY2ILupMhvtdrhzrxB+0VcjsPpSPttpfYdjnGFGsTi5MaJFjI1jOKHPQ6UTbTj9TAw==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "optional": true }, "node_modules/iconv-lite": { @@ -163,17 +163,17 @@ } }, "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT", "optional": true }, "node_modules/needle": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz", - "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-3.5.0.tgz", + "integrity": "sha512-jaQyPKKk2YokHrEg+vFDYxXIHTCBgiZwSHOoVx/8V3GIBS8/VN6NdVRmg8q1ERtPkMvmOvebsgga4sAj5hls/w==", "dev": true, "license": "MIT", "optional": true, @@ -199,9 +199,9 @@ } }, "node_modules/probe-image-size": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.4.0.tgz", - "integrity": "sha512-cdEprVtZxV+awMde9X+4jILBFYh4CARxVrQaMl4wY4YcPWbul9jntXrIW95NInBDyJwcVUP3U0T6yukN8rMBaQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.5.0.tgz", + "integrity": "sha512-ietdx4XPgmnzHRZOq1/KtcnsBkL4bRsBe+Szj5Tuq1/KPqDG42OspG1IhJb7vz6Z9pSzhp0J6UPnw6hujJTWoQ==", "dev": true, "funding": [ { @@ -217,19 +217,7 @@ "optional": true, "dependencies": { "lodash.merge": "^4.6.2", - "needle": "^2.5.2", - "stream-parser": "~0.3.1" - } - }, - "node_modules/probe-image-size/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "ms": "^2.1.1" + "needle": "^2.5.2" } }, "node_modules/probe-image-size/node_modules/iconv-lite": { @@ -246,14 +234,6 @@ "node": ">=0.10.0" } }, - "node_modules/probe-image-size/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/probe-image-size/node_modules/needle": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz", @@ -290,12 +270,15 @@ "optional": true }, "node_modules/sax": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", - "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz", + "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==", "dev": true, - "license": "ISC", - "optional": true + "license": "BlueOak-1.0.0", + "optional": true, + "engines": { + "node": ">=11.0.0" + } }, "node_modules/source-map": { "version": "0.6.1", @@ -307,17 +290,6 @@ "engines": { "node": ">=0.10.0" } - }, - "node_modules/stream-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz", - "integrity": "sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "debug": "2" - } } } } diff --git a/java/websocket/project/build.properties b/java/websocket/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/java/websocket/project/build.properties +++ b/java/websocket/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/java/websocket/project/plugins.sbt b/java/websocket/project/plugins.sbt index a3e8b1712..dbd2efaf9 100644 --- a/java/websocket/project/plugins.sbt +++ b/java/websocket/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-less" % "2.1.0-M2+39-32daabb4-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-less" % "2.1.0-M2+41-00c929d9-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.1.0-M3+29-99381aea-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.1.0-M3+31-12f03c14-SNAPSHOT") diff --git a/run-sbt-command b/run-sbt-command index d4fd419f7..fe872499f 100755 --- a/run-sbt-command +++ b/run-sbt-command @@ -11,7 +11,7 @@ sbt_bin="${SBT_BIN:-sbt}" sbt_process_args=(--server --no-server --batch) run_sbt1="${RUN_SBT1_TESTS:-true}" sbt1_version="${MATRIX_SBT1:-1.13.0}" -sbt2_version="${MATRIX_SBT2:-2.1.0-RC1}" +sbt2_version="${MATRIX_SBT2:-2.1.0}" run_sbt2="${RUN_SBT2_TESTS:-true}" sbt2_blacklist=( diff --git a/scala-versions.sh b/scala-versions.sh index 0b8bd252d..50600350c 100644 --- a/scala-versions.sh +++ b/scala-versions.sh @@ -3,9 +3,9 @@ # Copyright (C) from 2022 The Play Framework Contributors , 2011-2021 Lightbend Inc. readonly scala213Version="2.13.18" -readonly scala3Version="3.3.8" +readonly scala3Version="3.3.9" readonly scala39LTSVersion="3.9.0" -readonly scala3NextVersion="3.10.0" +readonly scala3NextVersion="3.10.1" readonly -a publishedScalaVersions=("$scala213Version" "$scala3Version") readonly -a testedScalaVersions=( diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt index 3ab45248f..86f233db7 100644 --- a/scala/anorm/build.sbt +++ b/scala/anorm/build.sbt @@ -13,16 +13,27 @@ lazy val root = (project in file(".")) .settings( name := "play-scala-anorm-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, jdbc, evolutions, "com.h2database" % "h2" % "2.5.252", - "org.playframework.anorm" %% "anorm" % "3.1.1-9e52b78b-SNAPSHOT", - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test, + "org.playframework.anorm" %% "anorm" % "3.1.1-94a03feb-SNAPSHOT", + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test, ), scalacOptions ++= List("-feature", "-Werror") ++ scala2OnlyScalacOptions("-Xsource:3").value, javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"), ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/anorm/project/build.properties b/scala/anorm/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/anorm/project/build.properties +++ b/scala/anorm/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/anorm/project/plugins.sbt b/scala/anorm/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/anorm/project/plugins.sbt +++ b/scala/anorm/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/chatroom/build.gradle b/scala/chatroom/build.gradle index a605cee2d..1fcd271ad 100644 --- a/scala/chatroom/build.gradle +++ b/scala/chatroom/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/chatroom/build.sbt b/scala/chatroom/build.sbt index 3a5ba8f1b..c5908a010 100644 --- a/scala/chatroom/build.sbt +++ b/scala/chatroom/build.sbt @@ -15,21 +15,21 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-chatroom-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, - "org.webjars" %% "webjars-play" % "3.1.0-M5+4-18ad4fde-SNAPSHOT", + "org.webjars" %% "webjars-play" % "3.1.0-M5+7-9491b067-SNAPSHOT", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "5.3.8", ("net.logstash.logback" % "logstash-logback-encoder" % "9.0") .excludeAll(ExclusionRule("com.fasterxml.jackson.core")), // Avoid conflicts with Play's Jackson dependency - "org.jsoup" % "jsoup" % "1.23.2", + "org.jsoup" % "jsoup" % "1.24.1", "ch.qos.logback" % "logback-classic" % "1.6.6", "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion, "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test, "org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), (Test / javaOptions) += "-Dtestserver.port=19001", scalacOptions ++= Seq( @@ -38,3 +38,14 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/chatroom/gradle/libs.versions.toml b/scala/chatroom/gradle/libs.versions.toml index cdb52f2ce..21209695b 100644 --- a/scala/chatroom/gradle/libs.versions.toml +++ b/scala/chatroom/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" -webjars-play = "3.1.0-M5+4-18ad4fde-SNAPSHOT" -jsoup = "1.23.2" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" +webjars-play = "3.1.0-M5+7-9491b067-SNAPSHOT" +jsoup = "1.24.1" flot = "0.8.3-1" bootstrap = "5.3.8" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] jsoup = { group = "org.jsoup", name = "jsoup", version.ref = "jsoup" } diff --git a/scala/chatroom/project/build.properties b/scala/chatroom/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/chatroom/project/build.properties +++ b/scala/chatroom/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/chatroom/project/plugins.sbt b/scala/chatroom/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/scala/chatroom/project/plugins.sbt +++ b/scala/chatroom/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/compile-di/build.gradle b/scala/compile-di/build.gradle index 0c02b28f0..ef3302290 100644 --- a/scala/compile-di/build.gradle +++ b/scala/compile-di/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/compile-di/build.sbt b/scala/compile-di/build.sbt index 4de6fc2ff..c56f4f74e 100644 --- a/scala/compile-di/build.sbt +++ b/scala/compile-di/build.sbt @@ -13,9 +13,9 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-compile-di-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, - libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT", + libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT", scalacOptions ++= List( //"-encoding", "utf8", // These three get set by Play automatically //"-deprecation", @@ -24,3 +24,14 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/compile-di/gradle/libs.versions.toml b/scala/compile-di/gradle/libs.versions.toml index 6c296c81b..e47cf9a41 100644 --- a/scala/compile-di/gradle/libs.versions.toml +++ b/scala/compile-di/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } diff --git a/scala/compile-di/project/build.properties b/scala/compile-di/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/compile-di/project/build.properties +++ b/scala/compile-di/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/compile-di/project/plugins.sbt b/scala/compile-di/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/scala/compile-di/project/plugins.sbt +++ b/scala/compile-di/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/fileupload/build.gradle b/scala/fileupload/build.gradle index 0c02b28f0..ef3302290 100644 --- a/scala/fileupload/build.gradle +++ b/scala/fileupload/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/fileupload/build.sbt b/scala/fileupload/build.sbt index 506f31809..f91109ef8 100644 --- a/scala/fileupload/build.sbt +++ b/scala/fileupload/build.sbt @@ -13,15 +13,26 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-fileupload-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/fileupload/gradle/libs.versions.toml b/scala/fileupload/gradle/libs.versions.toml index 6c296c81b..e47cf9a41 100644 --- a/scala/fileupload/gradle/libs.versions.toml +++ b/scala/fileupload/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } diff --git a/scala/fileupload/project/build.properties b/scala/fileupload/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/fileupload/project/build.properties +++ b/scala/fileupload/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/fileupload/project/plugins.sbt b/scala/fileupload/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/fileupload/project/plugins.sbt +++ b/scala/fileupload/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/forms/build.gradle b/scala/forms/build.gradle index de714267a..d5808ca2b 100644 --- a/scala/forms/build.gradle +++ b/scala/forms/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/forms/build.sbt b/scala/forms/build.sbt index 27c4842a7..91a7fcf84 100644 --- a/scala/forms/build.sbt +++ b/scala/forms/build.sbt @@ -13,14 +13,25 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-forms-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/forms/gradle/libs.versions.toml b/scala/forms/gradle/libs.versions.toml index 6c296c81b..e47cf9a41 100644 --- a/scala/forms/gradle/libs.versions.toml +++ b/scala/forms/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } diff --git a/scala/forms/project/build.properties b/scala/forms/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/forms/project/build.properties +++ b/scala/forms/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/forms/project/plugins.sbt b/scala/forms/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/scala/forms/project/plugins.sbt +++ b/scala/forms/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/grpc/build.sbt b/scala/grpc/build.sbt index 1fc14d8b1..6a4fb5b69 100644 --- a/scala/grpc/build.sbt +++ b/scala/grpc/build.sbt @@ -25,11 +25,13 @@ lazy val `play-scala-grpc-example` = (project in file(".")) .enablePlugins(PlayPekkoHttp2Support) // enables serving HTTP/2 and gRPC // #grpc_play_plugins .settings( + // TODO: Remove once Pekko gRPC and Play gRPC are released against Pekko and Pekko HTTP 2.0.0. dependencyOverrides ++= Seq( - // TODO: Remove once Pekko gRPC 2.0.0-M3+ is released and Play gRPC pulls in these Pekko versions. - "org.apache.pekko" %% "pekko-stream" % pekkoVersion, - "org.apache.pekko" %% "pekko-discovery" % pekkoVersion, - ), + "pekko-actor", "pekko-actor-typed", "pekko-stream", "pekko-discovery", + "pekko-slf4j", "pekko-serialization-jackson" + ).map("org.apache.pekko" %% _ % pekkoVersion) ++ Seq( + "pekko-http", "pekko-http-core", "pekko-http-spray-json", "pekko-parsing" + ).map("org.apache.pekko" %% _ % pekkoHttpVersion), // TODO: Remove once https://github.com/apache/pekko-grpc/pull/895 is included in a release. Compile / unmanagedResourceDirectories ~= (_.distinct), pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Scala), @@ -83,11 +85,11 @@ val TestDeps = Seq( "org.playframework" %% "play-grpc-specs2" % BuildInfo.playGrpcVersion % Test, "org.playframework" %% "play-test" % playVersion % Test, "org.playframework" %% "play-specs2" % playVersion % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test, ) scalaVersion := "2.13.18" -crossScalaVersions := Seq("2.13.18", "3.3.8") +crossScalaVersions := Seq("2.13.18", "3.3.9") scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked") ++ scala2OnlyScalacOptions("-Xsource:3").value // Make verbose tests @@ -99,3 +101,14 @@ scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchec lazy val docs = (project in file("docs")) .enablePlugins(ParadoxPlugin) .settings(name := "play-scala-grpc-example-docs") + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/grpc/project/build.properties b/scala/grpc/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/grpc/project/build.properties +++ b/scala/grpc/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/grpc/project/plugins.sbt b/scala/grpc/project/plugins.sbt index 39136b133..3c377a676 100644 --- a/scala/grpc/project/plugins.sbt +++ b/scala/grpc/project/plugins.sbt @@ -1,10 +1,10 @@ enablePlugins(BuildInfoPlugin) -val playGrpcV = "0.13.0-M5+86-69b1467c-SNAPSHOT" +val playGrpcV = "0.13.0-M5+100-db929b07-SNAPSHOT" buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV) buildInfoPackage := "play.scala.grpc.sample" resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.11.1") diff --git a/scala/hello-world/build.gradle b/scala/hello-world/build.gradle index 9e823629f..95340d4dd 100644 --- a/scala/hello-world/build.gradle +++ b/scala/hello-world/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/hello-world/build.sbt b/scala/hello-world/build.sbt index 5539a8fdc..1887abd3b 100644 --- a/scala/hello-world/build.sbt +++ b/scala/hello-world/build.sbt @@ -14,14 +14,25 @@ lazy val root = (project in file(".")) name := """play-scala-hello-world-tutorial""", organization := "com.example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/hello-world/gradle/libs.versions.toml b/scala/hello-world/gradle/libs.versions.toml index 6c296c81b..e47cf9a41 100644 --- a/scala/hello-world/gradle/libs.versions.toml +++ b/scala/hello-world/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } diff --git a/scala/hello-world/project/build.properties b/scala/hello-world/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/hello-world/project/build.properties +++ b/scala/hello-world/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/hello-world/project/plugins.sbt b/scala/hello-world/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/scala/hello-world/project/plugins.sbt +++ b/scala/hello-world/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/isolated-slick/build.sbt b/scala/isolated-slick/build.sbt index 6ebb9285b..049cbdfe2 100644 --- a/scala/isolated-slick/build.sbt +++ b/scala/isolated-slick/build.sbt @@ -24,7 +24,7 @@ val FlywayVersion = "13.12.2" "com.google.inject" % "guice" % "7.0.0" ) -(ThisBuild / crossScalaVersions) := Seq("2.13.18", "3.3.8") +(ThisBuild / crossScalaVersions) := Seq("2.13.18", "3.3.9") (ThisBuild / scalaVersion) := crossScalaVersions.value.head (ThisBuild / scalacOptions) ++= Seq( "-encoding", "UTF-8", // yes, this is 2 args @@ -112,9 +112,20 @@ lazy val root = (project in file(".")) // -- //ExclusionRule("tools.jackson.core"), // Once Play switches to Jackson 3 and we want to avoid version clashes ), - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), (Test / fork) := true ) .aggregate(slick) .dependsOn(slick) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/isolated-slick/project/build.properties b/scala/isolated-slick/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/isolated-slick/project/build.properties +++ b/scala/isolated-slick/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/isolated-slick/project/plugins.sbt b/scala/isolated-slick/project/plugins.sbt index 476b7b938..03ea61532 100644 --- a/scala/isolated-slick/project/plugins.sbt +++ b/scala/isolated-slick/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("com.github.sbt" % "sbt-slick-codegen" % "2.2.0+30-eea7f36f-SNAPSHO // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/log4j2/build.gradle b/scala/log4j2/build.gradle index 4252b23da..08ea6f1f3 100644 --- a/scala/log4j2/build.gradle +++ b/scala/log4j2/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/log4j2/build.sbt b/scala/log4j2/build.sbt index d0e2f6f7f..5897e8008 100644 --- a/scala/log4j2/build.sbt +++ b/scala/log4j2/build.sbt @@ -16,17 +16,28 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-log4j2-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4jVersion, "org.apache.logging.log4j" % "log4j-api" % log4jVersion, "org.apache.logging.log4j" % "log4j-core" % log4jVersion, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/log4j2/gradle/libs.versions.toml b/scala/log4j2/gradle/libs.versions.toml index 7a504ce8c..441da9036 100644 --- a/scala/log4j2/gradle/libs.versions.toml +++ b/scala/log4j2/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" log4j = "2.26.1" [libraries] diff --git a/scala/log4j2/project/build.properties b/scala/log4j2/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/log4j2/project/build.properties +++ b/scala/log4j2/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/log4j2/project/plugins.sbt b/scala/log4j2/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/log4j2/project/plugins.sbt +++ b/scala/log4j2/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/macwire-di/build.gradle b/scala/macwire-di/build.gradle index 917eab097..0d6f90fb4 100644 --- a/scala/macwire-di/build.gradle +++ b/scala/macwire-di/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/macwire-di/build.sbt b/scala/macwire-di/build.sbt index 103d5e226..e55f22847 100644 --- a/scala/macwire-di/build.sbt +++ b/scala/macwire-di/build.sbt @@ -13,14 +13,25 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-macwire-di-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( "com.softwaremill.macwire" %% "macros" % "2.6.7" % "provided", - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/macwire-di/gradle/libs.versions.toml b/scala/macwire-di/gradle/libs.versions.toml index 8a3c02a63..0cb7d85b3 100644 --- a/scala/macwire-di/gradle/libs.versions.toml +++ b/scala/macwire-di/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" macwire = "2.6.7" [libraries] diff --git a/scala/macwire-di/project/build.properties b/scala/macwire-di/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/macwire-di/project/build.properties +++ b/scala/macwire-di/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/macwire-di/project/plugins.sbt b/scala/macwire-di/project/plugins.sbt index a1da3ec90..4bc62b871 100644 --- a/scala/macwire-di/project/plugins.sbt +++ b/scala/macwire-di/project/plugins.sbt @@ -1,2 +1,2 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/rest-api/build.gradle b/scala/rest-api/build.gradle index 8abb1d86e..ef9fa8439 100644 --- a/scala/rest-api/build.gradle +++ b/scala/rest-api/build.gradle @@ -23,12 +23,22 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-logback_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "net.codingwell:scala-guice_${scalaBinaryVersion}:${libs.versions.scala.guice.get()}" - implementation "io.lemonlabs:scala-uri_${scalaBinaryVersion}:${libs.versions.scala.uri.get()}" + implementation "com.indoorvivants:scala-uri_${scalaBinaryVersion}:${libs.versions.scala.uri.get()}" implementation libs.logstash.logback.encoder testImplementation "org.playframework:play-test_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/rest-api/build.sbt b/scala/rest-api/build.sbt index b358d3057..0c5705cac 100644 --- a/scala/rest-api/build.sbt +++ b/scala/rest-api/build.sbt @@ -4,7 +4,7 @@ import play.sbt.PlaySettings resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) lazy val scala213 = "2.13.18" -lazy val scala3 = "3.3.8" +lazy val scala3 = "3.3.9" def scala2OnlyScalacOptions(options: String*) = Def.setting { CrossVersion.partialVersion(scalaVersion.value) match { @@ -26,7 +26,7 @@ lazy val root = (project in file(".")) .excludeAll(ExclusionRule("com.fasterxml.jackson.core")), // Avoid conflicts with Play's Jackson dependency "com.indoorvivants" %% "scala-uri" % "4.2.0", "net.codingwell" %% "scala-guice" % "7.0.0", - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", @@ -54,3 +54,14 @@ lazy val docs = (project in file("docs")).enablePlugins(ParadoxPlugin). scalaVersion := scala213, crossScalaVersions := Seq(scala213, scala3) ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/rest-api/gradle/libs.versions.toml b/scala/rest-api/gradle/libs.versions.toml index 9c4705bda..cc933af8e 100644 --- a/scala/rest-api/gradle/libs.versions.toml +++ b/scala/rest-api/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scala-guice = "7.0.0" scala-uri = "4.2.0" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] logstash-logback-encoder = { group = "net.logstash.logback", name = "logstash-logback-encoder", version = "9.0" } diff --git a/scala/rest-api/gradle/wrapper/gradle-wrapper.jar b/scala/rest-api/gradle/wrapper/gradle-wrapper.jar index eddabd2ee..51cbd2a6f 100644 Binary files a/scala/rest-api/gradle/wrapper/gradle-wrapper.jar and b/scala/rest-api/gradle/wrapper/gradle-wrapper.jar differ diff --git a/scala/rest-api/gradle/wrapper/gradle-wrapper.properties b/scala/rest-api/gradle/wrapper/gradle-wrapper.properties index a78c88e53..0bb71f346 100644 --- a/scala/rest-api/gradle/wrapper/gradle-wrapper.properties +++ b/scala/rest-api/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=dce76f55f8e251a3a1f130eb120f30b3d271de2b76c9b0729d316b5a1b6dc01f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip +distributionSha256Sum=0b00b0ffe07c4d4789c12d4935a44a7057d55774b7540bd4a3f76f336deb177a +distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/scala/rest-api/gradlew.bat b/scala/rest-api/gradlew.bat index a51ec4f58..3185a43f7 100644 --- a/scala/rest-api/gradlew.bat +++ b/scala/rest-api/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command -endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/scala/rest-api/project/build.properties b/scala/rest-api/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/rest-api/project/build.properties +++ b/scala/rest-api/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/rest-api/project/plugins.sbt b/scala/rest-api/project/plugins.sbt index 65b69eb91..f8491a3fa 100644 --- a/scala/rest-api/project/plugins.sbt +++ b/scala/rest-api/project/plugins.sbt @@ -1,6 +1,6 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") // sbt-paradox, used for documentation addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.11.1") diff --git a/scala/secure-session/build.gradle b/scala/secure-session/build.gradle index e5fa46f33..50d23d77f 100644 --- a/scala/secure-session/build.gradle +++ b/scala/secure-session/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can depend on older Play snapshots whose hashes sort after this build's version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/secure-session/build.sbt b/scala/secure-session/build.sbt index e248fcec5..b427c9caf 100644 --- a/scala/secure-session/build.sbt +++ b/scala/secure-session/build.sbt @@ -15,16 +15,16 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-secure-session-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( ws, guice, "org.abstractj.kalium" % "kalium" % "0.8.0", - "com.github.jnr" % "jnr-ffi" % "2.3.4", + "com.github.jnr" % "jnr-ffi" % "2.3.7", "org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion, "org.apache.pekko" %% "pekko-cluster-typed" % pekkoVersion, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", @@ -32,3 +32,14 @@ lazy val root = (project in file(".")) ) ++ scala2OnlyScalacOptions("-Xsource:3").value, Test / javaOptions ++= Seq("--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"), ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/secure-session/gradle/libs.versions.toml b/scala/secure-session/gradle/libs.versions.toml index 59fe94c7a..29f73b774 100644 --- a/scala/secure-session/gradle/libs.versions.toml +++ b/scala/secure-session/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" -pekko = "2.0.0-M4" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" +pekko = "2.0.0" [libraries] kalium = { group = "org.abstractj.kalium", name = "kalium", version = "0.8.0" } -jnr-ffi = { group = "com.github.jnr", name = "jnr-ffi", version = "2.3.6" } +jnr-ffi = { group = "com.github.jnr", name = "jnr-ffi", version = "2.3.7" } pekko-distributed-data = { group = "org.apache.pekko", name = "pekko-distributed-data_2.13", version.ref = "pekko" } scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } scalatestplus-play = { group = "org.scalatestplus.play", name = "scalatestplus-play_2.13", version.ref = "scalatestplus-play" } diff --git a/scala/secure-session/project/build.properties b/scala/secure-session/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/secure-session/project/build.properties +++ b/scala/secure-session/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/secure-session/project/plugins.sbt b/scala/secure-session/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/secure-session/project/plugins.sbt +++ b/scala/secure-session/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/slick/build.sbt b/scala/slick/build.sbt index c85dab836..6a89d04f0 100644 --- a/scala/slick/build.sbt +++ b/scala/slick/build.sbt @@ -1,5 +1,5 @@ lazy val scala213 = "2.13.18" -lazy val scala3 = "3.3.8" +lazy val scala3 = "3.3.9" def scala2OnlyScalacOptions(options: String*) = Def.setting { CrossVersion.partialVersion(scalaVersion.value) match { @@ -21,6 +21,9 @@ lazy val root = (project in file(".")) personSample ) +// Serialize compilation to avoid intermittent Scala 3 compiler errors across the samples. +Global / concurrentRestrictions += Tags.limit(Tags.Compile, 1) + def sampleProject(name: String) = Project(s"$name-sample", file("samples") / name) .enablePlugins(PlayScala) @@ -35,8 +38,8 @@ def sampleProject(name: String) = ) ++ scala2OnlyScalacOptions("-Xsource:3").value, libraryDependencies ++= Seq( guice, - "org.playframework" %% "play-slick" % "7.0.0-M1+159-f032ece7-SNAPSHOT", - "org.playframework" %% "play-slick-evolutions" % "7.0.0-M1+159-f032ece7-SNAPSHOT", + "org.playframework" %% "play-slick" % "7.0.0-M1+171-3f54fa75-SNAPSHOT", + "org.playframework" %% "play-slick-evolutions" % "7.0.0-M1+171-3f54fa75-SNAPSHOT", "com.h2database" % "h2" % "2.5.252", specs2 % Test, ), @@ -51,3 +54,14 @@ lazy val computerDatabaseSample = sampleProject("computer-database") lazy val basicSample = sampleProject("basic") lazy val personSample = sampleProject("person") + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/slick/project/build.properties b/scala/slick/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/slick/project/build.properties +++ b/scala/slick/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/slick/project/plugins.sbt b/scala/slick/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/slick/project/plugins.sbt +++ b/scala/slick/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/starter/build.gradle b/scala/starter/build.gradle index 9e823629f..95340d4dd 100644 --- a/scala/starter/build.gradle +++ b/scala/starter/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/starter/build.sbt b/scala/starter/build.sbt index 31750c3aa..0d6bd3d51 100644 --- a/scala/starter/build.sbt +++ b/scala/starter/build.sbt @@ -13,15 +13,26 @@ lazy val root = (project in file(".")) .settings( name := """play-scala-starter-example""", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, "com.h2database" % "h2" % "2.5.252", - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test, ), scalacOptions ++= Seq( "-feature", "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value, ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/starter/gradle/libs.versions.toml b/scala/starter/gradle/libs.versions.toml index 6c296c81b..e47cf9a41 100644 --- a/scala/starter/gradle/libs.versions.toml +++ b/scala/starter/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } diff --git a/scala/starter/project/build.properties b/scala/starter/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/starter/project/build.properties +++ b/scala/starter/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/starter/project/plugins.sbt b/scala/starter/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/starter/project/plugins.sbt +++ b/scala/starter/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/streaming/build.gradle b/scala/streaming/build.gradle index 394c6751e..7d29e619f 100644 --- a/scala/streaming/build.gradle +++ b/scala/streaming/build.gradle @@ -23,6 +23,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/streaming/build.sbt b/scala/streaming/build.sbt index 9426ccc86..84ce67566 100644 --- a/scala/streaming/build.sbt +++ b/scala/streaming/build.sbt @@ -13,12 +13,12 @@ lazy val root = (project in file(".")) .settings( name := "play-scala-streaming-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, ws % Test, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test ), scalacOptions ++= Seq( "-feature", @@ -29,3 +29,14 @@ lazy val root = (project in file(".")) TwirlKeys.templateImports ++= Seq( "views.html.helper.CSPNonce" ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/streaming/gradle/libs.versions.toml b/scala/streaming/gradle/libs.versions.toml index 6c296c81b..e47cf9a41 100644 --- a/scala/streaming/gradle/libs.versions.toml +++ b/scala/streaming/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" [libraries] scalatest-junit5 = { group = "org.scalatestplus", name = "junit-5-14_2.13", version.ref = "scalatestplus" } diff --git a/scala/streaming/project/build.properties b/scala/streaming/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/streaming/project/build.properties +++ b/scala/streaming/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/streaming/project/plugins.sbt b/scala/streaming/project/plugins.sbt index 2af4c379a..14f1f823f 100644 --- a/scala/streaming/project/plugins.sbt +++ b/scala/streaming/project/plugins.sbt @@ -1,3 +1,3 @@ // Use the Play sbt plugin for Play projects resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/tls/build.sbt b/scala/tls/build.sbt index 4ab183a48..ee285e2f7 100644 --- a/scala/tls/build.sbt +++ b/scala/tls/build.sbt @@ -7,7 +7,7 @@ def scala2OnlyScalacOptions(options: String*) = Def.setting { val commonSettings = Seq( resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo), - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq( "-feature", @@ -42,10 +42,21 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( ws, guice, - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test, ) ) .aggregate(one, two) .dependsOn(one, two) addCommandAlias("client", "runMain Main") + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/tls/modules/one/project/build.properties b/scala/tls/modules/one/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/tls/modules/one/project/build.properties +++ b/scala/tls/modules/one/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/tls/modules/two/project/build.properties b/scala/tls/modules/two/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/tls/modules/two/project/build.properties +++ b/scala/tls/modules/two/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/tls/project/build.properties b/scala/tls/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/tls/project/build.properties +++ b/scala/tls/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/tls/project/plugins.sbt b/scala/tls/project/plugins.sbt index 433090bf5..87b8f1d70 100644 --- a/scala/tls/project/plugins.sbt +++ b/scala/tls/project/plugins.sbt @@ -1,3 +1,3 @@ // The Play plugin resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") diff --git a/scala/websocket/build.gradle b/scala/websocket/build.gradle index 6c350d694..560e6a801 100644 --- a/scala/websocket/build.gradle +++ b/scala/websocket/build.gradle @@ -24,6 +24,16 @@ twirl { scalaVersion = scalaBinaryVersion } +// Integrations can reference older core Play snapshots; align them with the configured version. +configurations.configureEach { + resolutionStrategy.eachDependency { + if (requested.group == 'org.playframework' && requested.version?.startsWith('3.1.0-M10-')) { + useVersion(libs.versions.play.get()) + because('Keep core Play modules and their Pekko dependencies on the configured snapshot') + } + } +} + dependencies { implementation "org.playframework:play-${server}-server_${scalaBinaryVersion}:${libs.versions.play.get()}" implementation "org.playframework:play-guice_${scalaBinaryVersion}:${libs.versions.play.get()}" diff --git a/scala/websocket/build.sbt b/scala/websocket/build.sbt index 792e263c8..41053b83b 100644 --- a/scala/websocket/build.sbt +++ b/scala/websocket/build.sbt @@ -13,15 +13,15 @@ lazy val root = (project in file(".")) .settings( name := "play-scala-websocket-example", version := "1.0-SNAPSHOT", - crossScalaVersions := Seq("2.13.18", "3.3.8"), + crossScalaVersions := Seq("2.13.18", "3.3.9"), scalaVersion := crossScalaVersions.value.head, libraryDependencies ++= Seq( guice, ws, - "org.webjars" %% "webjars-play" % "3.1.0-M5+4-18ad4fde-SNAPSHOT", + "org.webjars" %% "webjars-play" % "3.1.0-M5+7-9491b067-SNAPSHOT", "org.webjars" % "flot" % "0.8.3-1", "org.webjars" % "bootstrap" % "5.3.8", - "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+74-9a0b55de-SNAPSHOT" % Test, + "org.scalatestplus.play" %% "scalatestplus-play" % "8.0.0-M2+89-57ccb602-SNAPSHOT" % Test, "org.awaitility" % "awaitility" % "4.3.0" % Test, ), TwirlKeys.templateImports ++= Seq( @@ -34,3 +34,14 @@ lazy val root = (project in file(".")) "-Werror" ) ++ scala2OnlyScalacOptions("-Xsource:3").value ) + +// Keep core Play snapshots aligned when integrations reference an older Play build. +ThisBuild / dependencyOverrides ++= Seq( + play.sbt.PlayImport.playCore, + play.sbt.PlayImport.playTest, + play.sbt.PlayImport.guice, + play.sbt.PlayImport.ws, + play.sbt.PlayImport.specs2, + play.sbt.PlayImport.pekkoHttpServer, + play.sbt.PlayImport.nettyServer, +) diff --git a/scala/websocket/gradle/libs.versions.toml b/scala/websocket/gradle/libs.versions.toml index 9a6a45cba..7989d9652 100644 --- a/scala/websocket/gradle/libs.versions.toml +++ b/scala/websocket/gradle/libs.versions.toml @@ -1,11 +1,11 @@ [versions] -twirl = "2.1.0-M9+155-1fa74ed8-SNAPSHOT" -play = "3.1.0-M10-3968a052-SNAPSHOT" +twirl = "2.1.0-M9+179-f54ceedd-SNAPSHOT" +play = "3.1.0-M10-de32fcb4-SNAPSHOT" scalatestplus = "3.2.20.0" -scalatestplus-play = "8.0.0-M2+74-9a0b55de-SNAPSHOT" +scalatestplus-play = "8.0.0-M2+89-57ccb602-SNAPSHOT" flot = "0.8.3-1" bootstrap = "5.3.8" -webjars-play = "3.1.0-M5+4-18ad4fde-SNAPSHOT" +webjars-play = "3.1.0-M5+7-9491b067-SNAPSHOT" awaitility = "4.3.0" node = "7.1.0" diff --git a/scala/websocket/package-lock.json b/scala/websocket/package-lock.json index 01e4cb5a0..b2ecd5ba7 100644 --- a/scala/websocket/package-lock.json +++ b/scala/websocket/package-lock.json @@ -11,9 +11,9 @@ } }, "node_modules/coffeescript": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.0.tgz", - "integrity": "sha512-hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-2.7.1.tgz", + "integrity": "sha512-zDQ0M/Ad05+5eudURWh31RIQc8i1TxIWuUgidoRx7gtrcQnDwSwSckVaJLg3AGKE+z0PuKnIOZ1DZnYvebuvIg==", "dev": true, "license": "MIT", "bin": { @@ -41,14 +41,14 @@ } }, "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, "node_modules/errno": { @@ -66,11 +66,11 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.12.tgz", + "integrity": "sha512-iuyGF2E4oafQfPsRrG2wtY2ILupMhvtdrhzrxB+0VcjsPpSPttpfYdjnGFGsTi5MaJFjI1jOKHPQ6UTbTj9TAw==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "optional": true }, "node_modules/iconv-lite": { @@ -163,17 +163,17 @@ } }, "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT", "optional": true }, "node_modules/needle": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz", - "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-3.5.0.tgz", + "integrity": "sha512-jaQyPKKk2YokHrEg+vFDYxXIHTCBgiZwSHOoVx/8V3GIBS8/VN6NdVRmg8q1ERtPkMvmOvebsgga4sAj5hls/w==", "dev": true, "license": "MIT", "optional": true, @@ -199,9 +199,9 @@ } }, "node_modules/probe-image-size": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.4.0.tgz", - "integrity": "sha512-cdEprVtZxV+awMde9X+4jILBFYh4CARxVrQaMl4wY4YcPWbul9jntXrIW95NInBDyJwcVUP3U0T6yukN8rMBaQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/probe-image-size/-/probe-image-size-7.5.0.tgz", + "integrity": "sha512-ietdx4XPgmnzHRZOq1/KtcnsBkL4bRsBe+Szj5Tuq1/KPqDG42OspG1IhJb7vz6Z9pSzhp0J6UPnw6hujJTWoQ==", "dev": true, "funding": [ { @@ -217,19 +217,7 @@ "optional": true, "dependencies": { "lodash.merge": "^4.6.2", - "needle": "^2.5.2", - "stream-parser": "~0.3.1" - } - }, - "node_modules/probe-image-size/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "ms": "^2.1.1" + "needle": "^2.5.2" } }, "node_modules/probe-image-size/node_modules/iconv-lite": { @@ -246,14 +234,6 @@ "node": ">=0.10.0" } }, - "node_modules/probe-image-size/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/probe-image-size/node_modules/needle": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz", @@ -290,12 +270,15 @@ "optional": true }, "node_modules/sax": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", - "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.6.1.tgz", + "integrity": "sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==", "dev": true, - "license": "ISC", - "optional": true + "license": "BlueOak-1.0.0", + "optional": true, + "engines": { + "node": ">=11.0.0" + } }, "node_modules/source-map": { "version": "0.6.1", @@ -307,17 +290,6 @@ "engines": { "node": ">=0.10.0" } - }, - "node_modules/stream-parser": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz", - "integrity": "sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "debug": "2" - } } } } diff --git a/scala/websocket/project/build.properties b/scala/websocket/project/build.properties index 898a65556..f1fd7cdf3 100644 --- a/scala/websocket/project/build.properties +++ b/scala/websocket/project/build.properties @@ -1 +1 @@ -sbt.version=2.1.0-RC1 +sbt.version=2.1.0 diff --git a/scala/websocket/project/plugins.sbt b/scala/websocket/project/plugins.sbt index a3e8b1712..dbd2efaf9 100644 --- a/scala/websocket/project/plugins.sbt +++ b/scala/websocket/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers ++= Seq(Resolver.sonatypeCentralSnapshots, Resolver.ApacheMavenSnapshotsRepo) -addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-3968a052-SNAPSHOT") +addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M10-de32fcb4-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-less" % "2.1.0-M2+39-32daabb4-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-less" % "2.1.0-M2+41-00c929d9-SNAPSHOT") -addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.1.0-M3+29-99381aea-SNAPSHOT") +addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.1.0-M3+31-12f03c14-SNAPSHOT")