Guice 7 + switch to Jakarta Dependency Injection

build.sbt

@@ -161,7 +161,7 @@ lazy val PlayJavaClusterSharding =
 
 lazy val PlayJdbcApiProject = PlayCrossBuiltProject("Play-JDBC-Api", "persistence/play-jdbc-api")
   .settings(
-    libraryDependencies += javaxInject,
+    libraryDependencies += jakartaInject,
   )
 
 lazy val PlayJdbcProject: Project = PlayCrossBuiltProject("Play-JDBC", "persistence/play-jdbc")

cache/play-cache/src/main/java/play/cache/CachedAction.java

@@ -4,8 +4,8 @@
 
 package play.cache;
 
+import jakarta.inject.Inject;
 import java.util.concurrent.CompletionStage;
-import javax.inject.Inject;
 import play.mvc.Action;
 import play.mvc.Http.Request;
 import play.mvc.Result;

cache/play-cache/src/main/java/play/cache/DefaultAsyncCacheApi.java

@@ -7,12 +7,12 @@
 import static scala.jdk.javaapi.FutureConverters.asJava;
 
 import akka.Done;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import play.libs.Scala;
 import scala.concurrent.duration.Duration;
 import scala.jdk.javaapi.OptionConverters;

cache/play-cache/src/main/java/play/cache/DefaultSyncCacheApi.java

@@ -4,14 +4,14 @@
 
 package play.cache;
 
+import jakarta.inject.Inject;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
 
 /**
  * An implementation of SyncCacheApi that wraps AsyncCacheApi

cache/play-cache/src/main/java/play/cache/NamedCache.java

@@ -4,9 +4,9 @@
 
 package play.cache;
 
+import jakarta.inject.Qualifier;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import javax.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)

cache/play-cache/src/main/scala/play/api/cache/Cached.scala

@@ -5,12 +5,12 @@
 package play.api.cache
 
 import java.time.Instant
-import javax.inject.Inject
 
 import scala.concurrent.duration._
 import scala.concurrent.Future
 
 import akka.stream.Materializer
+import jakarta.inject.Inject
 import play.api._
 import play.api.http.HeaderNames.ETAG
 import play.api.http.HeaderNames.EXPIRES

cache/play-cache/src/main/scala/play/api/cache/SyncCacheApi.scala

@@ -4,14 +4,14 @@
 
 package play.api.cache
 
-import javax.inject.Inject
-
 import scala.concurrent.duration._
 import scala.concurrent.duration.Duration
 import scala.concurrent.Await
 import scala.concurrent.Future
 import scala.reflect.ClassTag
 
+import jakarta.inject.Inject
+
 /**
  * A cache API that uses synchronous calls rather than async calls. Useful when you know you have a fast in-memory cache.
  */

cache/play-caffeine-cache/src/main/scala/play/api/cache/caffeine/CaffeineCacheApi.scala

@@ -6,9 +6,6 @@ package play.api.cache.caffeine
 
 import java.util.concurrent.Executor
 import javax.cache.CacheException
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
 
 import scala.concurrent.duration.Duration
 import scala.concurrent.ExecutionContext
@@ -21,6 +18,9 @@ import akka.stream.Materializer
 import akka.Done
 import com.github.benmanes.caffeine.cache.Cache
 import com.google.common.primitives.Primitives
+import jakarta.inject.Inject
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import play.api.cache._
 import play.api.inject._
 import play.api.libs.streams.Execution.trampoline

cache/play-caffeine-cache/src/test/scala/play/api/cache/caffeine/CaffeineCacheApiSpec.scala

@@ -5,14 +5,14 @@
 package play.api.cache.caffeine
 
 import java.util.concurrent.Executors
-import javax.inject.Inject
-import javax.inject.Provider
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.mockito.Mockito
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify

cache/play-ehcache/src/main/scala/play/api/cache/ehcache/EhCacheApi.scala

@@ -4,10 +4,6 @@
 
 package play.api.cache.ehcache
 
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
-
 import scala.concurrent.duration.Duration
 import scala.concurrent.duration.FiniteDuration
 import scala.concurrent.ExecutionContext
@@ -18,6 +14,9 @@ import akka.actor.ActorSystem
 import akka.stream.Materializer
 import akka.Done
 import com.google.common.primitives.Primitives
+import jakarta.inject.Inject
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import net.sf.ehcache.CacheManager
 import net.sf.ehcache.Ehcache
 import net.sf.ehcache.Element

cache/play-ehcache/src/test/scala/play/api/cache/CachedSpec.scala

@@ -6,11 +6,11 @@ package play.api.cache
 
 import java.time.Instant
 import java.util.concurrent.atomic.AtomicInteger
-import javax.inject._
 
 import scala.concurrent.duration._
 import scala.util.Random
 
+import jakarta.inject._
 import play.api.cache.ehcache.EhCacheApi
 import play.api.http
 import play.api.mvc._

cache/play-ehcache/src/test/scala/play/api/cache/ehcache/EhCacheApiSpec.scala

@@ -5,14 +5,14 @@
 package play.api.cache.ehcache
 
 import java.util.concurrent.Executors
-import javax.inject.Inject
-import javax.inject.Provider
 
 import scala.concurrent.duration._
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import net.sf.ehcache.CacheManager
 import play.api.cache.AsyncCacheApi
 import play.api.cache.SyncCacheApi

cache/play-jcache/src/main/scala/play/api/libs/jcache/JCacheModule.scala

@@ -6,8 +6,8 @@ package play.api.libs.jcache
 
 import javax.cache.CacheManager
 import javax.cache.Caching
-import javax.inject._
 
+import jakarta.inject._
 import play.api.inject._
 import play.api.Environment
 

cluster/play-cluster-sharding/src/main/scala/play/api/cluster/sharding/typed/ClusterShardingModule.scala

@@ -4,14 +4,13 @@
 
 package play.api.cluster.sharding.typed
 
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
-
 import akka.actor.typed.scaladsl.adapter._
 import akka.actor.ActorSystem
 import akka.annotation.InternalApi
 import akka.cluster.sharding.typed.scaladsl.ClusterSharding
+import jakarta.inject.Inject
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import play.api.inject._
 
 @InternalApi

cluster/play-java-cluster-sharding/src/main/scala/play/cluster/sharding/typed/ClusterShardingModule.scala

@@ -4,14 +4,13 @@
 
 package play.cluster.sharding.typed
 
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
-
 import akka.actor.typed.javadsl.Adapter
 import akka.actor.ActorSystem
 import akka.annotation.InternalApi
 import akka.cluster.sharding.typed.javadsl.ClusterSharding
+import jakarta.inject.Inject
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import play.api.inject._
 
 @InternalApi

core/play-configuration/src/main/java/play/Environment.java

@@ -16,7 +16,7 @@
  *
  * <p>Captures concerns relating to the classloader and the filesystem for the application.
  */
-// @Singleton, see BuiltInModule (We don't want javax.inject inside play-configuration project)
+// @Singleton, see BuiltInModule (We don't want jakarta.inject inside play-configuration project)
 public class Environment {
   private final play.api.Environment env;
 

core/play-guice/src/main/scala/play/api/inject/guice/GuiceApplicationBuilder.scala

@@ -4,14 +4,13 @@
 
 package play.api.inject.guice
 
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
-
 import scala.runtime.AbstractPartialFunction
 
 import com.google.inject.{ Module => GuiceModule }
 import com.google.inject.ProvisionException
+import jakarta.inject.Inject
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import org.slf4j.ILoggerFactory
 import play.api._
 import play.api.http.HttpErrorHandlerExceptions

core/play-guice/src/main/scala/play/api/inject/guice/GuiceInjectorBuilder.scala

@@ -6,8 +6,6 @@ package play.api.inject
 package guice
 
 import java.io.File
-import javax.inject.Inject
-import javax.inject.Provider
 
 import scala.jdk.CollectionConverters._
 import scala.reflect.ClassTag
@@ -19,6 +17,8 @@ import com.google.inject.Binder
 import com.google.inject.CreationException
 import com.google.inject.Guice
 import com.google.inject.Stage
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import play.api.inject.{ Binding => PlayBinding }
 import play.api.inject.{ Injector => PlayInjector }
 import play.api.inject.{ Module => PlayModule }

core/play-guice/src/main/scala/play/api/libs/concurrent/AkkaGuiceSupport.scala

@@ -41,7 +41,7 @@ import play.api.libs.concurrent.TypedAkka._
  *
  * @define unnamed Note that, while the name is used when spawning the actor in the `ActorSystem`,
  *   it is <em>NOT</em> used as a name qualifier for the binding.  This is so that you don't need to
- *   use [[javax.inject.Named Named]] to qualify all injections of typed actors. Use the underlying
+ *   use [[jakarta.inject.Named Named]] to qualify all injections of typed actors. Use the underlying
  *   API to create multiple, name-annotated bindings.
  */
 trait AkkaGuiceSupport {

core/play-guice/src/main/scala/play/api/libs/concurrent/TypedActorRefProvider.scala

@@ -4,8 +4,6 @@
 
 package play.api.libs.concurrent
 
-import javax.inject.Singleton
-
 import scala.reflect.ClassTag
 
 import akka.actor.typed.scaladsl.adapter._
@@ -16,6 +14,7 @@ import com.google.inject.Inject
 import com.google.inject.Injector
 import com.google.inject.Key
 import com.google.inject.Provider
+import jakarta.inject.Singleton
 import play.api.libs.concurrent.TypedAkka._
 
 /**

core/play-guice/src/test/java/play/inject/guice/GuiceApplicationBuilderTest.java

@@ -15,8 +15,8 @@
 import com.google.inject.ConfigurationException;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 import org.junit.Test;
 import play.Application;
 import play.api.inject.guice.GuiceApplicationBuilderSpec;

core/play-guice/src/test/scala/play/api/inject/guice/GuiceApplicationBuilderSpec.scala

@@ -6,14 +6,14 @@ package play.api.inject
 package guice
 
 import java.util.Collections
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
 
 import com.google.inject.CreationException
 import com.google.inject.Guice
 import com.google.inject.ProvisionException
 import com.typesafe.config.Config
+import jakarta.inject.Inject
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import org.specs2.mutable.Specification
 import play.{ Environment => JavaEnvironment }
 import play.api.i18n.I18nModule

core/play-guice/src/test/scala/play/utils/ReflectSpec.scala

@@ -4,10 +4,9 @@
 
 package play.utils
 
-import javax.inject.Inject
-
 import scala.reflect.ClassTag
 
+import jakarta.inject.Inject
 import org.specs2.mutable.Specification
 import play.api.inject.guice.GuiceInjectorBuilder
 import play.api.inject.Binding

core/play-integration-test/src/it/java/play/it/http/ActionCompositionOrderTest.java

@@ -146,7 +146,7 @@ public CompletionStage<Result> call(Http.Request req) {
   @Retention(RetentionPolicy.RUNTIME)
   @interface SingletonActionAnnotation {}
 
-  @javax.inject.Singleton
+  @jakarta.inject.Singleton
   static class SingletonActionAnnotationAction extends Action<SingletonActionAnnotation> {
     @Override
     public CompletionStage<Result> call(Http.Request req) {

core/play-integration-test/src/it/scala/play/it/auth/SecuritySpec.scala

@@ -4,11 +4,10 @@
 
 package play.it.auth
 
-import javax.inject.Inject
-
 import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 
+import jakarta.inject.Inject
 import play.api.i18n.MessagesApi
 import play.api.mvc._
 import play.api.mvc.Security.AuthenticatedBuilder

core/play-integration-test/src/it/scala/play/it/http/JavaActionCompositionSpec.scala

@@ -293,13 +293,15 @@ trait JavaActionCompositionSpec extends PlaySpecification with WsTestClient {
       )
     }
 
-    "abort the request when action class is annotated with @javax.inject.Singleton" in makeRequest(new MockController {
-      @SingletonActionAnnotation
-      override def action(request: Request): Result = Results.ok()
-    }) { response =>
+    "abort the request when action class is annotated with @jakarta.inject.Singleton" in makeRequest(
+      new MockController {
+        @SingletonActionAnnotation
+        override def action(request: Request): Result = Results.ok()
+      }
+    ) { response =>
       response.status must_== 500
       response.body[String] must contain(
-        "RuntimeException: Singleton action instances are not allowed! Remove the @javax.inject.Singleton annotation from the action class play.it.http.ActionCompositionOrderTest$SingletonActionAnnotationAction"
+        "RuntimeException: Singleton action instances are not allowed! Remove the @jakarta.inject.Singleton annotation from the action class play.it.http.ActionCompositionOrderTest$SingletonActionAnnotationAction"
       )
     }
   }

core/play-integration-test/src/it/scala/play/it/http/JavaCachedActionSpec.scala

@@ -6,8 +6,6 @@ package play.it.http
 
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-import javax.inject.Provider
 
 import scala.concurrent.duration._
 import scala.concurrent.ExecutionContext
@@ -18,6 +16,8 @@ import akka.Done
 import com.github.benmanes.caffeine.cache.Cache
 import com.github.benmanes.caffeine.cache.Caffeine
 import com.google.common.primitives.Primitives
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import play.api.cache.caffeine.CaffeineCacheModule
 import play.api.cache.AsyncCacheApi
 import play.api.inject.guice.GuiceApplicationBuilder