Upgrade guice 7.0 to migrate to jakarta

gradle/dependencies.gradle

@@ -23,7 +23,7 @@ ext {
     dropwizardMetrics: "4.2.21",
     groovy           : "3.0.9", // Gradle 7.4 uses Groovy 3.0.9
     guava            : "31.1-jre",
-    guice            : "6.0.0",
+    guice            : "7.0.0",
     jackson          : "2.13.3",
     javassist        : "3.29.0-GA",
     log4j            : "2.17.2",

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/DropwizardMetricsModule.java

@@ -25,7 +25,7 @@
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
 import com.google.inject.Injector;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import com.google.inject.matcher.Matchers;
 import com.google.inject.multibindings.Multibinder;
 import io.netty.buffer.ByteBufAllocator;

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/AbstractReporterProvider.java

@@ -18,7 +18,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Reporter;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 import ratpack.dropwizard.metrics.ReporterConfigSupport;
 

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/BlockingExecTimingInterceptorProvider.java

@@ -21,7 +21,7 @@
 import ratpack.dropwizard.metrics.DropwizardMetricsConfig;
 
 import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 /**
  * Provide a timer for blocking executions.

ratpack-dropwizard-metrics/src/main/java/ratpack/dropwizard/metrics/internal/RequestTimingHandlerProvider.java

@@ -22,7 +22,7 @@
 import ratpack.core.handling.Context;
 
 import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 /**
  * Provide an instance of a request timing handler.

ratpack-exec/src/main/java/ratpack/exec/registry/internal/CachingBackedRegistry.java

@@ -68,9 +68,7 @@ protected <O> Iterable<O> transformToInstances(Iterable<? extends Supplier<O>> s
   }
 
   protected <T> Iterable<? extends Supplier<T>> getSuppliers(TypeToken<T> type) {
-    Iterable<? extends Supplier<?>> suppliers = compute(supplierCache, type, t ->
-        registryBacking.provide(type)
-    );
+    Iterable<? extends Supplier<?>> suppliers = compute(supplierCache, type, t -> registryBacking.provide(type));
     return Types.cast(suppliers);
   }
 

ratpack-groovy/src/main/java/ratpack/groovy/sql/SqlProvider.java

@@ -19,7 +19,7 @@
 import groovy.sql.Sql;
 
 import jakarta.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import javax.sql.DataSource;
 
 public class SqlProvider implements Provider<Sql> {

ratpack-groovy/src/main/java/ratpack/groovy/template/MarkupTemplateModule.java

@@ -25,7 +25,7 @@
 import ratpack.core.render.Renderer;
 import ratpack.core.server.ServerConfig;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.nio.file.Path;
 
 /**

ratpack-guice/src/main/java/ratpack/guice/BindingsSpec.java

@@ -19,7 +19,7 @@
 import com.google.common.reflect.TypeToken;
 import com.google.inject.Binder;
 import com.google.inject.Module;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.multibindings.Multibinder;
 import ratpack.func.Action;

ratpack-guice/src/main/java/ratpack/guice/ConfigurableModule.java

@@ -22,14 +22,14 @@
 import com.google.common.reflect.TypeToken;
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
+import jakarta.inject.Singleton;
 import ratpack.config.ConfigObject;
-import ratpack.func.Action;
-import ratpack.func.Factory;
 import ratpack.core.server.ServerConfig;
+import ratpack.func.Action;
 import ratpack.func.Exceptions;
+import ratpack.func.Factory;
 import ratpack.func.Types;
 
-import javax.inject.Singleton;
 import java.lang.reflect.Constructor;
 
 /**

ratpack-guice/src/main/java/ratpack/guice/Guice.java

@@ -65,7 +65,7 @@
  * import ratpack.test.embed.EmbeddedApp;
  *
  * import jakarta.inject.Inject;
- * import javax.inject.Singleton;
+ * import jakarta.inject.Singleton;
  *
  * import static org.junit.jupiter.api.Assertions.*;
  *

ratpack-guice/src/main/java/ratpack/guice/internal/GuiceUtil.java

@@ -18,11 +18,15 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.TypeToken;
-import com.google.inject.*;
+import com.google.inject.Binding;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
+import jakarta.inject.Provider;
 import ratpack.func.Action;
 import ratpack.func.Function;
-import ratpack.func.internal.TypeCaching;
 import ratpack.func.Types;
+import ratpack.func.internal.TypeCaching;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;

ratpack-guice/src/main/java/ratpack/guice/internal/InjectorRegistryBacking.java

@@ -21,7 +21,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.TypeToken;
 import com.google.inject.Injector;
-import com.google.inject.Provider;
+import jakarta.inject.Provider;
 import ratpack.exec.registry.RegistryBacking;
 
 public class InjectorRegistryBacking implements RegistryBacking {

ratpack-guice/src/test/groovy/ratpack/guice/BindingsSpecSpec.groovy

@@ -19,7 +19,7 @@ package ratpack.guice
 import com.google.inject.AbstractModule
 import ratpack.test.internal.RatpackGroovyDslSpec
 
-import javax.inject.Provider
+import jakarta.inject.Provider
 
 class BindingsSpecSpec extends RatpackGroovyDslSpec {
 

ratpack-guice/src/test/groovy/ratpack/guice/GuiceRegistrySpec.groovy

@@ -19,15 +19,15 @@ package ratpack.guice
 import com.google.inject.Binder
 import com.google.inject.Injector
 import com.google.inject.Module
-import com.google.inject.Provider
 import com.google.inject.Provides
 import com.google.inject.multibindings.OptionalBinder
-import ratpack.func.Nullable
-import ratpack.func.Action
-import ratpack.groovy.internal.ClosureUtil
+import jakarta.inject.Provider
+import ratpack.core.server.ServerConfig
 import ratpack.exec.registry.Registry
 import ratpack.exec.registry.RegistrySpec
-import ratpack.core.server.ServerConfig
+import ratpack.func.Action
+import ratpack.func.Nullable
+import ratpack.groovy.internal.ClosureUtil
 import ratpack.test.internal.registry.RegistryContractSpec
 
 class GuiceRegistrySpec extends RegistryContractSpec {
@@ -107,7 +107,7 @@ class GuiceRegistrySpec extends RegistryContractSpec {
     given:
     Registry reg = Guice.registry(com.google.inject.Guice.createInjector(new Module() {
       @Override
-      void configure(Binder binder) { }
+      void configure(Binder binder) {}
 
       @Provides
       String stringProvider() {
@@ -141,7 +141,7 @@ class GuiceRegistrySpec extends RegistryContractSpec {
     given:
     Registry reg = Guice.registry(com.google.inject.Guice.createInjector(new Module() {
       @Override
-      void configure(Binder binder) { }
+      void configure(Binder binder) {}
 
       @Provides
       Optional<String> stringProvider() {

ratpack-session/src/main/java/ratpack/session/SessionModule.java

@@ -35,7 +35,7 @@
 import ratpack.session.internal.*;
 import ratpack.func.Types;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;

ratpack-session/src/main/java/ratpack/session/clientside/internal/ClientSideSessionStore.java

@@ -41,7 +41,7 @@
 import ratpack.session.clientside.Crypto;
 import ratpack.session.clientside.Signer;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 import java.nio.CharBuffer;
 import java.util.Optional;
 import java.util.regex.Pattern;

ratpack-site/src/main/groovy/ratpack/site/SiteModule.groovy

@@ -26,8 +26,8 @@ import ratpack.core.render.RenderableDecorator
 import ratpack.core.server.ServerConfig
 import ratpack.site.github.*
 
-import javax.inject.Provider
-import javax.inject.Singleton
+import jakarta.inject.Provider
+import jakarta.inject.Singleton
 import java.time.Duration
 
 @Slf4j

ratpack-site/src/main/groovy/ratpack/site/github/GitHubApi.groovy

@@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.ObjectReader
 import ratpack.exec.Promise
 import ratpack.core.http.client.HttpClient
 
-@javax.inject.Singleton
+@jakarta.inject.Singleton
 class GitHubApi {
 
   private final String api

ratpack-site/src/main/groovy/ratpack/site/github/RatpackVersions.java

@@ -22,7 +22,7 @@
 import ratpack.exec.util.ParallelBatch;
 
 import jakarta.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.List;
 import java.util.regex.Pattern;