Uncap Dagger version (#2721)

The latest version of Dagger (2.55) now supports jakarta.inject.
This commit is contained in:
Lai Jiang
2025-03-17 14:51:04 +00:00
committed by GitHub
parent 50260dca5f
commit 2d82646421
358 changed files with 510 additions and 506 deletions
@@ -21,7 +21,7 @@ import google.registry.dns.writer.VoidDnsWriterModule;
import google.registry.request.RequestModule;
import google.registry.testing.CloudTasksHelper.CloudTasksHelperModule;
import google.registry.util.UtilsModule;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
@Singleton
@Component(
@@ -37,7 +37,7 @@ import google.registry.tmch.TmchCertificateAuthority;
import google.registry.tmch.TmchXmlSignature;
import google.registry.util.Clock;
import google.registry.util.Sleeper;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
/** Dagger component for running EPP tests. */
@Singleton
@@ -23,11 +23,11 @@ import google.registry.config.RegistryConfig.ConfigModule;
import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
import google.registry.privileges.secretmanager.SecretManagerModule;
import google.registry.util.UtilsModule;
import jakarta.inject.Provider;
import jakarta.inject.Singleton;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import java.util.Optional;
import javax.inject.Provider;
import javax.inject.Singleton;
import org.hibernate.cfg.Environment;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -19,10 +19,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.google.cloud.secretmanager.v1.SecretVersion.State;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Optional;
import javax.inject.Inject;
/** Implements {@link SecretManagerClient} for tests. */
public class FakeSecretManagerClient implements SecretManagerClient {
@@ -42,8 +42,8 @@ import google.registry.request.auth.AuthSettings.AuthLevel;
import google.registry.request.auth.OidcTokenAuthenticationMechanism.IapOidcAuthenticationMechanism;
import google.registry.request.auth.OidcTokenAuthenticationMechanism.RegularOidcAuthenticationMechanism;
import google.registry.util.GoogleCredentialsBundle;
import jakarta.inject.Singleton;
import jakarta.servlet.http.HttpServletRequest;
import javax.inject.Singleton;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -48,6 +48,7 @@ import google.registry.batch.CloudTasksUtils;
import google.registry.model.ImmutableObject;
import google.registry.util.GoogleCredentialsBundle;
import google.registry.util.Retrier;
import jakarta.inject.Singleton;
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
@@ -68,7 +69,6 @@ import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import javax.inject.Singleton;
import org.joda.time.DateTime;
/**
@@ -20,8 +20,8 @@ import static com.google.common.collect.Lists.charactersOf;
import com.google.common.collect.Iterators;
import google.registry.util.RandomStringGenerator;
import google.registry.util.StringGenerator;
import jakarta.inject.Named;
import java.util.Iterator;
import javax.inject.Named;
/**
* A string generator that produces strings using sequential characters in its alphabet. This is
@@ -18,7 +18,7 @@ import dagger.Component;
import google.registry.config.RegistryConfig.ConfigModule;
import google.registry.request.RequestModule;
import google.registry.util.UtilsModule;
import javax.inject.Singleton;
import jakarta.inject.Singleton;
@Singleton
@Component(