Merge pull request #799 from mkurz/latest_play3_snapshot_guice

Bump to latest Play snapshot that upgrades to guice 7

java/chatroom/app/controllers/HomeController.java

@@ -24,7 +24,7 @@
 import java.net.URI;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A very simple chat client using websockets.

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.14", "3.3.3"),
+    crossScalaVersions := Seq("2.13.16", "3.3.4"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
-      "org.webjars" %% "webjars-play" % "3.0.1",
+      "org.webjars" %% "webjars-play" % "3.1.0-M1",
       "org.webjars" % "flot" % "0.8.3",
       "org.webjars" % "bootstrap" % "3.4.1",
       guice,

java/chatroom/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
+play = "3.1.0-2c77ebef-SNAPSHOT"
 junit = "4.13.2"
-webjars-play = "3.0.0"
+webjars-play = "3.1.0-M1"
 flot = "0.8.3-1"
 bootstrap = "3.4.1"
 assertj = "3.27.2"

java/chatroom/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/chatroom/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")

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.14", "3.3.3")
+crossScalaVersions := Seq("2.13.16", "3.3.4")
 
 scalaVersion := crossScalaVersions.value.head
 

java/compile-di/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
+play = "3.1.0-2c77ebef-SNAPSHOT"
 junit = "4.13.2"
 
 [libraries]

java/compile-di/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/compile-di/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")

java/dagger2/app/controllers/TimeController.java

@@ -12,7 +12,7 @@
 import play.mvc.Http;
 import play.mvc.Result;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;

java/dagger2/app/dagger/ApplicationComponent.java

@@ -1,6 +1,6 @@
 package dagger;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 /**
  * The application component that specifies all the modules backing

java/dagger2/app/dagger/MyComponentsFromContext.java

@@ -19,7 +19,7 @@
 import router.Routes;
 import scala.concurrent.ExecutionContext;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.time.Clock;
 import java.util.HashMap;
 import java.util.Map;

java/dagger2/app/filters/LoggingFilter.java

@@ -6,7 +6,7 @@
 import play.mvc.Http;
 import play.mvc.Result;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 

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.14", "3.3.3"),
+    crossScalaVersions := Seq("2.13.16", "3.3.4"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       ws,

java/dagger2/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
+play = "3.1.0-2c77ebef-SNAPSHOT"
 junit = "4.13.2"
 dagger = "2.51.1"
 

java/dagger2/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/dagger2/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")

java/ebean/app/controllers/HomeController.java

@@ -12,7 +12,7 @@
 import repository.CompanyRepository;
 import repository.ComputerRepository;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import jakarta.persistence.PersistenceException;
 import java.util.Map;
 import java.util.concurrent.CompletionStage;

java/ebean/app/repository/CompanyRepository.java

@@ -3,7 +3,7 @@
 import io.ebean.DB;
 import models.Company;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;

java/ebean/app/repository/ComputerRepository.java

@@ -6,7 +6,7 @@
 import io.ebean.Transaction;
 import models.Computer;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
 

java/ebean/app/repository/DatabaseExecutionContext.java

@@ -3,7 +3,7 @@
 import org.apache.pekko.actor.ActorSystem;
 import play.libs.concurrent.CustomExecutionContext;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Custom execution context, so that blocking database operations don't

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.14", "3.3.3"),
+    crossScalaVersions := Seq("2.13.16", "3.3.4"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,

java/ebean/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
-play-ebean = "8.3.0"
-ebean = "15.1.0" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19
+play = "3.1.0-2c77ebef-SNAPSHOT"
+play-ebean = "9.0.0-M1"
+ebean = "15.8.1" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19
 h2 = "2.3.232"
 junit = "4.13.2"
 assertj = "3.27.2"

java/ebean/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/ebean/project/plugins.sbt

@@ -1,5 +1,5 @@
 // The Play plugin
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")
 
-addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.3.0")
+addSbtPlugin("org.playframework" % "sbt-play-ebean" % "9.0.0-M1")

java/fileupload/app/controllers/HomeController.java

@@ -6,8 +6,8 @@
 import play.mvc.*;
 import views.html.index;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;

java/fileupload/app/controllers/MyMultipartFormDataBodyParser.java

@@ -11,7 +11,7 @@
 import play.mvc.BodyParser;
 import play.mvc.Http;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;

java/fileupload/build.sbt

@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-fileupload-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.14", "3.3.3"),
+    crossScalaVersions := Seq("2.13.16", "3.3.4"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies += guice,
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),

java/fileupload/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
+play = "3.1.0-2c77ebef-SNAPSHOT"
 junit = "4.13.2"
 
 [libraries]

java/fileupload/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/fileupload/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")

java/forms/app/controllers/WidgetController.java

@@ -8,8 +8,8 @@
 import play.i18n.MessagesApi;
 import play.mvc.*;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.List;
 
 import static play.libs.Scala.asScala;

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.14", "3.3.3")
+crossScalaVersions := Seq("2.13.16", "3.3.4")
 
 scalaVersion := crossScalaVersions.value.head
 

java/forms/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
+play = "3.1.0-2c77ebef-SNAPSHOT"
 junit = "4.13.2"
 
 [libraries]

java/forms/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/forms/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")

java/grpc/app/controllers/HomeController.java

@@ -6,7 +6,7 @@
 import play.mvc.Result;
 import play.mvc.Results;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.concurrent.CompletionStage;
 
 // #grpc_client_injection

java/grpc/app/routers/HelloWorldRouter.java

@@ -6,8 +6,8 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class HelloWorldRouter extends example.myapp.helloworld.grpc.AbstractGreeterServiceRouter {

java/grpc/build.sbt

@@ -52,8 +52,8 @@ lazy val `play-java-grpc-example` = (project in file("."))
     libraryDependencies ++= CompileDeps ++ TestDeps
   )
 
-scalaVersion := "2.13.14"
-crossScalaVersions := Seq("2.13.14", "3.3.3")
+scalaVersion := "2.13.16"
+crossScalaVersions := Seq("2.13.16", "3.3.4")
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
 javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation")
 // Needed for ssl-config to create self signed certificated under Java 17

java/grpc/docs/build.sbt

@@ -1,4 +1,4 @@
 paradoxTheme := Some(builtinParadoxTheme("generic"))
 
-scalaVersion := "2.13.14"
+scalaVersion := "2.13.16"
 

java/grpc/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/grpc/project/plugins.sbt

@@ -1,10 +1,10 @@
 enablePlugins(BuildInfoPlugin)
-val playGrpcV = "0.12.1"
+val playGrpcV = "0.13.0-M1"
 buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.java.grpc.sample"
 
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")
 
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 

java/hello-world/build.sbt

@@ -8,7 +8,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.14", "3.3.3")
+crossScalaVersions := Seq("2.13.16", "3.3.4")
 
 scalaVersion := crossScalaVersions.value.head
 

java/hello-world/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
+play = "3.1.0-2c77ebef-SNAPSHOT"
 junit = "4.13.2"
 
 [libraries]

java/hello-world/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.0
+sbt.version=1.10.7

java/hello-world/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers ++= Resolver.sonatypeOssRepos("snapshots")
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-d1f1b9f8-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-2c77ebef-SNAPSHOT")

java/jpa/app/controllers/PersonController.java

@@ -8,7 +8,7 @@
 import play.mvc.Http;
 import play.mvc.Result;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.concurrent.CompletionStage;
 import java.util.stream.Collectors;
 

java/jpa/app/models/DatabaseExecutionContext.java

@@ -3,7 +3,7 @@
 import org.apache.pekko.actor.ActorSystem;
 import play.libs.concurrent.CustomExecutionContext;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * Custom execution context wired to "database.dispatcher" thread pool

java/jpa/app/models/JPAPersonRepository.java

@@ -2,7 +2,7 @@
 
 import play.db.jpa.JPAApi;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
 import java.util.List;
 import java.util.concurrent.CompletionStage;

java/jpa/build.sbt

@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
   .settings(
     name := """play-java-jpa-example""",
     version := "1.0-SNAPSHOT",
-    crossScalaVersions := Seq("2.13.14", "3.3.3"),
+    crossScalaVersions := Seq("2.13.16", "3.3.4"),
     scalaVersion := crossScalaVersions.value.head,
     libraryDependencies ++= Seq(
       guice,

java/jpa/gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 twirl = "2.0.7"
-play = "3.1.0-d1f1b9f8-SNAPSHOT"
-play-ws = "3.0.0"
+play = "3.1.0-2c77ebef-SNAPSHOT"
+play-ws = "3.1.0-M4"
 node = "7.1.0"
 h2 = "2.3.232"
 hibernate = "6.6.4.Final"