Remove common dependency in AppCheck Interop

appcheck/firebase-appcheck-debug-testing/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck-debug/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck-interop/api.txt

@@ -3,7 +3,7 @@ package com.google.firebase.appcheck {
 
   public abstract class AppCheckTokenResult {
     ctor public AppCheckTokenResult();
-    method @Nullable public abstract com.google.firebase.FirebaseException getError();
+    method @Nullable public abstract Exception getError();
     method @NonNull public abstract String getToken();
   }
 

appcheck/firebase-appcheck-interop/firebase-appcheck-interop.gradle

@@ -42,8 +42,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-common:20.3.1'
-    implementation 'com.google.firebase:firebase-components:17.1.0'
     implementation 'com.google.android.gms:play-services-base:18.0.1'
     implementation 'com.google.android.gms:play-services-tasks:18.0.1'
 

appcheck/firebase-appcheck-interop/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.2
+version=17.0.0
 latestReleasedVersion=16.1.1

appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/AppCheckTokenResult.java

@@ -16,13 +16,12 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.FirebaseException;
 
 /**
  * Class to hold the result emitted by a Firebase App Check service application verification
  * attempt. The result will always contain a token, which will either be a valid raw JWT attesting
- * application identity, or a dummy value. The result may optionally contain a {@link
- * FirebaseException} if application verification does not succeed.
+ * application identity, or a dummy value. The result may optionally contain an {@link Exception} if
+ * application verification does not succeed.
  */
 public abstract class AppCheckTokenResult {
 
@@ -34,9 +33,9 @@ public abstract class AppCheckTokenResult {
   public abstract String getToken();
 
   /**
-   * Returns the {@link FirebaseException} if the {@link
-   * com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider} failed to obtain a token.
+   * Returns the {@link Exception} if the {@link
+   * com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider} failed to obtain a token.
    */
   @Nullable
-  public abstract FirebaseException getError();
+  public abstract Exception getError();
 }

appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InternalAppCheckTokenProvider.java → appcheck/firebase-appcheck-interop/src/main/java/com/google/firebase/appcheck/interop/InteropAppCheckTokenProvider.java

@@ -19,7 +19,7 @@
 import com.google.firebase.appcheck.AppCheckTokenResult;
 
 /** @hide */
-public interface InternalAppCheckTokenProvider {
+public interface InteropAppCheckTokenProvider {
 
   /**
    * Requests an {@link AppCheckTokenResult} from the installed {@code AppCheckFactory}. This will

appcheck/firebase-appcheck-playintegrity/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck/api.txt

@@ -15,7 +15,7 @@ package com.google.firebase.appcheck {
     method @NonNull public abstract String getToken();
   }
 
-  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider {
+  public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider {
     ctor public FirebaseAppCheck();
     method public abstract void addAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
     method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);

appcheck/firebase-appcheck/gradle.properties

@@ -1,2 +1,2 @@
-version=16.1.3
+version=17.0.0
 latestReleasedVersion=16.1.2

appcheck/firebase-appcheck/src/androidTest/java/com/google/firebase/appcheck/StrictModeTest.java

@@ -18,7 +18,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.testing.integ.StrictModeRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -43,7 +43,7 @@ public void initializingFirebaseAppcheck_shouldNotViolateStrictMode() {
                       .build(),
                   "hello");
           app.get(FirebaseAppCheck.class);
-          app.get(InternalAppCheckTokenProvider.class);
+          app.get(InteropAppCheckTokenProvider.class);
         });
   }
 }

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheck.java

@@ -19,9 +19,9 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 
-public abstract class FirebaseAppCheck implements InternalAppCheckTokenProvider {
+public abstract class FirebaseAppCheck implements InteropAppCheckTokenProvider {
 
   /** Gets the default instance of {@code FirebaseAppCheck}. */
   @NonNull

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/FirebaseAppCheckRegistrar.java

@@ -21,7 +21,7 @@
 import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.annotations.concurrent.UiThread;
 import com.google.firebase.appcheck.internal.DefaultFirebaseAppCheck;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
 import com.google.firebase.components.Dependency;
@@ -53,7 +53,7 @@ public List<Component<?>> getComponents() {
         Qualified.qualified(Blocking.class, ScheduledExecutorService.class);
 
     return Arrays.asList(
-        Component.builder(FirebaseAppCheck.class, (InternalAppCheckTokenProvider.class))
+        Component.builder(FirebaseAppCheck.class, (InteropAppCheckTokenProvider.class))
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.required(uiExecutor))

appcheck/firebase-appcheck/src/main/java/com/google/firebase/appcheck/internal/DefaultAppCheckTokenResult.java

@@ -58,7 +58,7 @@ public String getToken() {
 
   @Nullable
   @Override
-  public FirebaseException getError() {
+  public Exception getError() {
     return error;
   }
 }

firebase-database/firebase-database.gradle.kts

@@ -54,7 +54,7 @@ dependencies {
   implementation("com.google.firebase:firebase-common:20.3.2")
   implementation("com.google.firebase:firebase-components:17.1.0")
   implementation("com.google.firebase:firebase-auth-interop:20.0.0")
-  implementation("com.google.firebase:firebase-appcheck-interop:16.1.1")
+  implementation(project(":appcheck:firebase-appcheck-interop"))
   implementation("com.google.firebase:firebase-database-collection:18.0.1")
 
   implementation(libs.androidx.annotation)

firebase-database/gradle.properties

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=20.1.1
+version=20.2.0
 latestReleasedVersion=20.1.0
 android.enableUnitTestBinaryResources=true

firebase-database/src/main/java/com/google/firebase/database/DatabaseRegistrar.java

@@ -17,7 +17,7 @@
 import androidx.annotation.Keep;
 import androidx.annotation.RestrictTo;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
@@ -39,13 +39,13 @@ public List<Component<?>> getComponents() {
             .name(LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
             .add(Dependency.deferred(InternalAuthProvider.class))
-            .add(Dependency.deferred(InternalAppCheckTokenProvider.class))
+            .add(Dependency.deferred(InteropAppCheckTokenProvider.class))
             .factory(
                 c ->
                     new FirebaseDatabaseComponent(
                         c.get(FirebaseApp.class),
                         c.getDeferred(InternalAuthProvider.class),
-                        c.getDeferred(InternalAppCheckTokenProvider.class)))
+                        c.getDeferred(InteropAppCheckTokenProvider.class)))
             .build(),
         LibraryVersionComponent.create(LIBRARY_NAME, BuildConfig.VERSION_NAME));
   }

firebase-database/src/main/java/com/google/firebase/database/FirebaseDatabaseComponent.java

@@ -16,7 +16,7 @@
 
 import androidx.annotation.NonNull;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.database.android.AndroidAppCheckTokenProvider;
 import com.google.firebase.database.android.AndroidAuthTokenProvider;
@@ -44,7 +44,7 @@ class FirebaseDatabaseComponent {
   FirebaseDatabaseComponent(
       @NonNull FirebaseApp app,
       Deferred<InternalAuthProvider> authProvider,
-      Deferred<InternalAppCheckTokenProvider> appCheckProvider) {
+      Deferred<InteropAppCheckTokenProvider> appCheckProvider) {
     this.app = app;
     this.authProvider = new AndroidAuthTokenProvider(authProvider);
     this.appCheckProvider = new AndroidAppCheckTokenProvider(appCheckProvider);

firebase-database/src/main/java/com/google/firebase/database/android/AndroidAppCheckTokenProvider.java

@@ -18,18 +18,18 @@
 import androidx.annotation.NonNull;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.appcheck.AppCheckTokenResult;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.database.core.TokenProvider;
 import com.google.firebase.inject.Deferred;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class AndroidAppCheckTokenProvider implements TokenProvider {
-  private final Deferred<InternalAppCheckTokenProvider> deferredAppCheckProvider;
-  private final AtomicReference<InternalAppCheckTokenProvider> internalAppCheck;
+  private final Deferred<InteropAppCheckTokenProvider> deferredAppCheckProvider;
+  private final AtomicReference<InteropAppCheckTokenProvider> internalAppCheck;
 
   public AndroidAppCheckTokenProvider(
-      Deferred<InternalAppCheckTokenProvider> deferredAppCheckProvider) {
+      Deferred<InteropAppCheckTokenProvider> deferredAppCheckProvider) {
     this.deferredAppCheckProvider = deferredAppCheckProvider;
     this.internalAppCheck = new AtomicReference<>();
 
@@ -41,7 +41,7 @@ public AndroidAppCheckTokenProvider(
   @SuppressLint("TaskMainThread")
   @Override
   public void getToken(boolean forceRefresh, @NonNull final GetTokenCompletionListener listener) {
-    InternalAppCheckTokenProvider appCheckProvider = internalAppCheck.get();
+    InteropAppCheckTokenProvider appCheckProvider = internalAppCheck.get();
 
     if (appCheckProvider != null) {
       Task<AppCheckTokenResult> getTokenResult = appCheckProvider.getToken(forceRefresh);

firebase-firestore/firebase-firestore.gradle

@@ -126,7 +126,7 @@ dependencies {
     implementation project(':protolite-well-known-types')
     implementation 'com.google.firebase:firebase-database-collection:18.0.1'
     implementation 'com.google.firebase:firebase-components:17.1.0'
-    implementation 'com.google.firebase:firebase-appcheck-interop:16.1.1'
+    implementation project(':appcheck:firebase-appcheck-interop')
 
     //To provide @Generated annotations
     compileOnly 'javax.annotation:jsr250-api:1.0'

firebase-firestore/gradle.properties

@@ -1,2 +1,2 @@
-version=24.4.6
+version=24.5.0
 latestReleasedVersion=24.4.5

firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java

@@ -29,7 +29,7 @@
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.annotations.PreviewApi;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.emulators.EmulatedServiceSettings;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
@@ -132,7 +132,7 @@ static FirebaseFirestore newInstance(
       @NonNull Context context,
       @NonNull FirebaseApp app,
       @NonNull Deferred<InternalAuthProvider> deferredAuthProvider,
-      @NonNull Deferred<InternalAppCheckTokenProvider> deferredAppCheckTokenProvider,
+      @NonNull Deferred<InteropAppCheckTokenProvider> deferredAppCheckTokenProvider,
       @NonNull String database,
       @NonNull InstanceRegistry instanceRegistry,
       @Nullable GrpcMetadataProvider metadataProvider) {

firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreMultiDbComponent.java

@@ -22,7 +22,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseAppLifecycleListener;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.firestore.remote.GrpcMetadataProvider;
 import com.google.firebase.inject.Deferred;
@@ -43,14 +43,14 @@ class FirestoreMultiDbComponent
   private final FirebaseApp app;
   private final Context context;
   private final Deferred<InternalAuthProvider> authProvider;
-  private final Deferred<InternalAppCheckTokenProvider> appCheckProvider;
+  private final Deferred<InteropAppCheckTokenProvider> appCheckProvider;
   private final GrpcMetadataProvider metadataProvider;
 
   FirestoreMultiDbComponent(
       @NonNull Context context,
       @NonNull FirebaseApp app,
       @NonNull Deferred<InternalAuthProvider> authProvider,
-      @NonNull Deferred<InternalAppCheckTokenProvider> appCheckProvider,
+      @NonNull Deferred<InteropAppCheckTokenProvider> appCheckProvider,
       @Nullable GrpcMetadataProvider metadataProvider) {
     this.context = context;
     this.app = app;

firebase-firestore/src/main/java/com/google/firebase/firestore/FirestoreRegistrar.java

@@ -19,7 +19,7 @@
 import androidx.annotation.RestrictTo;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.auth.internal.InternalAuthProvider;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentRegistrar;
@@ -52,15 +52,15 @@ public List<Component<?>> getComponents() {
             .add(Dependency.optionalProvider(HeartBeatInfo.class))
             .add(Dependency.optionalProvider(UserAgentPublisher.class))
             .add(Dependency.deferred(InternalAuthProvider.class))
-            .add(Dependency.deferred(InternalAppCheckTokenProvider.class))
+            .add(Dependency.deferred(InteropAppCheckTokenProvider.class))
             .add(Dependency.optional(FirebaseOptions.class))
             .factory(
                 c ->
                     new FirestoreMultiDbComponent(
                         c.get(Context.class),
                         c.get(FirebaseApp.class),
                         c.getDeferred(InternalAuthProvider.class),
-                        c.getDeferred(InternalAppCheckTokenProvider.class),
+                        c.getDeferred(InteropAppCheckTokenProvider.class),
                         new FirebaseClientGrpcMetadataProvider(
                             c.getProvider(UserAgentPublisher.class),
                             c.getProvider(HeartBeatInfo.class),

firebase-firestore/src/main/java/com/google/firebase/firestore/auth/FirebaseAppCheckTokenProvider.java

@@ -23,7 +23,7 @@
 import com.google.firebase.FirebaseApiNotAvailableException;
 import com.google.firebase.appcheck.AppCheckTokenResult;
 import com.google.firebase.appcheck.interop.AppCheckTokenListener;
-import com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider;
+import com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider;
 import com.google.firebase.firestore.util.Executors;
 import com.google.firebase.firestore.util.Listener;
 import com.google.firebase.firestore.util.Logger;
@@ -41,11 +41,11 @@ public final class FirebaseAppCheckTokenProvider extends CredentialsProvider<Str
   private Listener<String> changeListener;
 
   /**
-   * The {@link Provider} that gives access to the {@link InternalAppCheckTokenProvider} instance.
+   * The {@link Provider} that gives access to the {@link InteropAppCheckTokenProvider} instance.
    */
   @Nullable
   @GuardedBy("this")
-  private InternalAppCheckTokenProvider internalAppCheckTokenProvider;
+  private InteropAppCheckTokenProvider interopAppCheckTokenProvider;
 
   @GuardedBy("this")
   private boolean forceRefresh;
@@ -58,14 +58,14 @@ public final class FirebaseAppCheckTokenProvider extends CredentialsProvider<Str
   /** Creates a new FirebaseAppCheckTokenProvider. */
   @SuppressLint("ProviderAssignment") // TODO: Remove this @SuppressLint once b/181014061 is fixed.
   public FirebaseAppCheckTokenProvider(
-      Deferred<InternalAppCheckTokenProvider> deferredAppCheckTokenProvider) {
+      Deferred<InteropAppCheckTokenProvider> deferredAppCheckTokenProvider) {
     deferredAppCheckTokenProvider.whenAvailable(
         provider -> {
           synchronized (this) {
-            internalAppCheckTokenProvider = provider.get();
+            interopAppCheckTokenProvider = provider.get();
             // Get notified when AppCheck token changes to a new value in the future.
-            if (internalAppCheckTokenProvider != null) {
-              internalAppCheckTokenProvider.addAppCheckTokenListener(tokenListener);
+            if (interopAppCheckTokenProvider != null) {
+              interopAppCheckTokenProvider.addAppCheckTokenListener(tokenListener);
             }
           }
         });
@@ -89,11 +89,11 @@ private synchronized void onTokenChanged(@NonNull AppCheckTokenResult result) {
    */
   @Override
   public synchronized Task<String> getToken() {
-    if (internalAppCheckTokenProvider == null) {
+    if (interopAppCheckTokenProvider == null) {
       return Tasks.forException(new FirebaseApiNotAvailableException("AppCheck is not available"));
     }
 
-    Task<AppCheckTokenResult> res = internalAppCheckTokenProvider.getToken(forceRefresh);
+    Task<AppCheckTokenResult> res = interopAppCheckTokenProvider.getToken(forceRefresh);
     forceRefresh = false;
 
     return res.continueWithTask(
@@ -121,8 +121,8 @@ public synchronized void invalidateToken() {
   public synchronized void removeChangeListener() {
     changeListener = null;
 
-    if (internalAppCheckTokenProvider != null) {
-      internalAppCheckTokenProvider.removeAppCheckTokenListener(tokenListener);
+    if (interopAppCheckTokenProvider != null) {
+      interopAppCheckTokenProvider.removeAppCheckTokenListener(tokenListener);
     }
   }