guice 7.0.0 (was 6.0.0)

.scala-steward.conf → .github/scala-steward.conf

@@ -7,7 +7,7 @@ pullRequests.grouping = [
 ]
 
 buildRoots = [
-  "play-java-akka-cluster-example",
+  "play-java-pekko-cluster-example",
   "play-java-chatroom-example",
   "play-java-compile-di-example",
   "play-java-dagger2-example",
@@ -20,7 +20,6 @@ buildRoots = [
   "play-java-rest-api-example",
   "play-java-starter-example",
   "play-java-streaming-example",
-  "play-java-telemetry-example",
   "play-java-websocket-example",
   "play-scala-anorm-example",
   "play-scala-chatroom-example",
@@ -37,7 +36,6 @@ buildRoots = [
   "play-scala-slick-example",
   "play-scala-starter-example",
   "play-scala-streaming-example",
-  "play-scala-telemetry-example",
   "play-scala-tls-example",
   "play-scala-websocket-example"
 ]

.github/workflows/build-test.yml

@@ -5,7 +5,7 @@ on:
 
   push:
     branches:
-      - 2.9.x # Check branch after merge
+      - 3.0.x # Check branch after merge
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
@@ -20,7 +20,7 @@ jobs:
 #      cmd: sbt validateCode
 
   tests:
-    name: Tests
+    name: Sbt Tests
 #    needs:
 #      - "check-code-style"
     uses: playframework/.github/.github/workflows/cmd.yml@v3
@@ -31,9 +31,19 @@ jobs:
         # sudo add-apt-repository -y ppa:ondrej/php && sudo apt-get -qq update && sudo apt-get install -y libsodium-dev # for secure session examples
         ./test.sh
 
+  gradle-tests:
+    name: Gradle Tests
+    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    with:
+      java: 17, 11
+      scala: 2.13.x, 3.x
+      cmd: |
+        ./test-gradle.sh
+
   finish:
     name: Finish
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
+      - "gradle-tests"
     uses: playframework/.github/.github/workflows/rtm.yml@v3

.gitignore

@@ -50,3 +50,7 @@ bin/
 
 #general
 *.class
+
+# Gradle
+.gradle
+build

play-java-chatroom-example/README.md

@@ -2,7 +2,7 @@
 
 This is a simple chatroom using Play and Websockets with the Java API.
 
-This project makes use of [dynamic streams](http://doc.akka.io/docs/akka/2.6/java/stream/stream-dynamic.html) from Akka Streams, notably `BroadcastHub` and `MergeHub`.  By [combining MergeHub and BroadcastHub](https://doc.akka.io/docs/akka/2.6/stream/stream-dynamic.html?language=java#dynamic-fan-in-and-fan-out-with-mergehub-broadcasthub-and-partitionhub), you can get publish/subscribe functionality.
+This project makes use of [dynamic streams](https://pekko.apache.org/docs/pekko/current/java/stream/stream-dynamic.html) from Pekko Streams, notably `BroadcastHub` and `MergeHub`.  By [combining MergeHub and BroadcastHub](https://pekko.apache.org/docs/pekko/current/stream/stream-dynamic.html?language=java#dynamic-fan-in-and-fan-out-with-mergehub-broadcasthub-and-partitionhub), you can get publish/subscribe functionality.
 
 ## The good bit
 

play-java-chatroom-example/app/controllers/HomeController.java

@@ -1,13 +1,13 @@
 package controllers;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.japi.Pair;
-import akka.japi.pf.PFBuilder;
-import akka.stream.Materializer;
-import akka.stream.javadsl.*;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.*;
 import org.webjars.play.WebJarsUtil;
 import play.libs.F;
 import play.mvc.*;

play-java-chatroom-example/build.sbt

@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
     crossScalaVersions := Seq("2.13.12", "3.3.1"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
-      "org.webjars" %% "webjars-play" % "2.9.0-RC2",
+      "org.webjars" %% "webjars-play" % "3.0.1",
       "org.webjars" % "flot" % "0.8.3",
       "org.webjars" % "bootstrap" % "3.4.1",
       guice,

play-java-chatroom-example/conf/application.conf

@@ -1,8 +1,8 @@
-// Enable richer akka logging
-akka {
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
+// Enable richer pekko logging
+pekko {
+  loggers = ["org.apache.pekko.event.slf4j.Slf4jLogger"]
   loglevel = "DEBUG"
-  logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
+  logging-filter = "org.apache.pekko.event.slf4j.Slf4jLoggingFilter"
 }
 
 // https://www.playframework.com/documentation/latest/SecurityHeaders

play-java-chatroom-example/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.8

play-java-chatroom-example/project/plugins.sbt

@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC2")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")

play-java-compile-di-example/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.8

play-java-compile-di-example/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC2")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")

play-java-dagger2-example/app/dagger/MyComponentsFromContext.java

@@ -5,7 +5,7 @@
 import play.ApplicationLoader;
 import play.BuiltInComponentsFromContext;
 import play.api.routing.Router;
-import play.components.AkkaComponents;
+import play.components.PekkoComponents;
 import play.components.BodyParserComponents;
 import play.controllers.AssetsComponents;
 import play.core.j.DefaultJavaHandlerComponents;

play-java-dagger2-example/app/filters/LoggingFilter.java

@@ -1,6 +1,6 @@
 package filters;
 
-import akka.stream.Materializer;
+import org.apache.pekko.stream.Materializer;
 import org.slf4j.LoggerFactory;
 import play.mvc.Filter;
 import play.mvc.Http;

play-java-dagger2-example/build.sbt

@@ -7,8 +7,8 @@ lazy val root = (project in file("."))
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       ws,
-      "com.google.dagger" % "dagger" % "2.48",
-      "com.google.dagger" % "dagger-compiler" % "2.48"
+      "com.google.dagger" % "dagger" % "2.48.1",
+      "com.google.dagger" % "dagger-compiler" % "2.48.1"
     ),
     // move the java annotation code into generated directory
     (Compile / javacOptions) := { (Compile / managedSourceDirectories).value.head.mkdirs(); javacOptions.value },

play-java-dagger2-example/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.8

play-java-dagger2-example/project/plugins.sbt

@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC2")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")

play-java-ebean-example/app/repository/DatabaseExecutionContext.java

@@ -1,6 +1,6 @@
 package repository;
 
-import akka.actor.ActorSystem;
+import org.apache.pekko.actor.ActorSystem;
 import play.libs.concurrent.CustomExecutionContext;
 
 import javax.inject.Inject;

play-java-ebean-example/build.sbt

@@ -11,7 +11,7 @@ lazy val root = (project in file("."))
       "com.h2database" % "h2" % "2.2.224",
       "org.awaitility" % "awaitility" % "3.1.6" % Test,
       "org.assertj" % "assertj-core" % "3.12.2" % Test,
-      "org.mockito" % "mockito-core" % "5.5.0" % Test,
+      "org.mockito" % "mockito-core" % "5.6.0" % Test,
     ),
     (Test / testOptions) += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
     javacOptions ++= Seq("-Xlint:unchecked", "-Xlint:deprecation", "-Werror")

play-java-ebean-example/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.8

play-java-ebean-example/project/plugins.sbt

@@ -1,4 +1,4 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC2")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")
 
-addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % "7.0.0-RC2")
+addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.0.0-M1")

play-java-fileupload-example/README.md

@@ -1,6 +1,6 @@
 # Play File Upload using a custom BodyParser
 
-This is a sample project that shows how to upload a file through Akka Streams using a custom BodyParser using Akka Streams using the Java API.
+This is a sample project that shows how to upload a file through Pekko Streams using a custom BodyParser using Pekko Streams using the Java API.
 
 ## Default MultipartFormData Body Parser
 
@@ -83,7 +83,7 @@ class MyMultipartFormDataBodyParser extends DelegatingMultipartFormDataBodyParse
 }
 ```
 
-The core Accumulator is generated from an `akka.streams.FileIO` sink which writes out bytes to the filesystem, and exposes a CompletionStage when the write operation has been completed.
+The core Accumulator is generated from an `org.apache.pekko.streams.FileIO` sink which writes out bytes to the filesystem, and exposes a CompletionStage when the write operation has been completed.
 
 Because this code delegates to the Scala API implementation, the underlying `DelegatingMultipartFormDataBodyParser<A>` exposes an abstract method:
 

play-java-fileupload-example/app/controllers/MyMultipartFormDataBodyParser.java

@@ -1,10 +1,10 @@
 package controllers;
 
-import akka.stream.IOResult;
-import akka.stream.Materializer;
-import akka.stream.javadsl.FileIO;
-import akka.stream.javadsl.Sink;
-import akka.util.ByteString;
+import org.apache.pekko.stream.IOResult;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.FileIO;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.util.ByteString;
 import play.core.parsers.Multipart;
 import play.http.HttpErrorHandler;
 import play.libs.streams.Accumulator;

play-java-fileupload-example/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.8

play-java-fileupload-example/project/plugins.sbt

@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-RC2")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.1")