Merge branch 'master' into mila/BloomFilter

Author: milaGGL

appcheck/firebase-appcheck-debug-testing/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
 * [changed] Integrated the [app_check] Debug Testing SDK with Firebase Components. (#4436)
 
 # 16.1.0

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

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

appcheck/firebase-appcheck-debug/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
 * [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
 * [changed] Integrated the [app_check] Debug SDK with Firebase Components. (#4436)
 * [changed] Moved Task continuations off the main thread. (#4453)

appcheck/firebase-appcheck-debug/gradle.properties

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

appcheck/firebase-appcheck-interop/gradle.properties

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

appcheck/firebase-appcheck-playintegrity/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
 * [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
 * [changed] Integrated the [app_check] Play Integrity SDK with Firebase Components. (#4436)
 * [changed] Moved Task continuations off the main thread. (#4453)

appcheck/firebase-appcheck-playintegrity/gradle.properties

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

appcheck/firebase-appcheck-safetynet/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [deprecated] Added deprecation tagging to the `SafetyNetAppCheckProviderFactory` class. (#4686)
+
+# 16.1.1
 * [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
 * [changed] Integrated the [app_check] SafetyNet SDK with Firebase Components. (#4436)
 * [changed] Moved Task continuations off the main thread. (#4453)

appcheck/firebase-appcheck-safetynet/gradle.properties

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

appcheck/firebase-appcheck-safetynet/src/main/java/com/google/firebase/appcheck/safetynet/SafetyNetAppCheckProviderFactory.java

@@ -23,7 +23,10 @@
 /**
  * Implementation of an {@link AppCheckProviderFactory} that builds {@link
  * SafetyNetAppCheckProvider}s. This is the default implementation.
+ *
+ * @deprecated Use {@code PlayIntegrityAppCheckProviderFactory} instead.
  */
+@Deprecated
 public class SafetyNetAppCheckProviderFactory implements AppCheckProviderFactory {
 
   private static final SafetyNetAppCheckProviderFactory instance =
@@ -34,7 +37,10 @@ private SafetyNetAppCheckProviderFactory() {}
   /**
    * Gets an instance of this class for installation into a {@link
    * com.google.firebase.appcheck.FirebaseAppCheck} instance.
+   *
+   * @deprecated Use {@code PlayIntegrityAppCheckProviderFactory#getInstance} instead.
    */
+  @Deprecated
   @NonNull
   public static SafetyNetAppCheckProviderFactory getInstance() {
     return instance;

appcheck/firebase-appcheck/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [unchanged] Updated to keep [app_check] SDK versions aligned.
+
+# 16.1.1
 * [changed] Migrated [app_check] SDKs to use standard Firebase executors. (#4431, #4449)
 * [changed] Moved Task continuations off the main thread. (#4453)
 

appcheck/firebase-appcheck/gradle.properties

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

build.gradle

@@ -39,7 +39,7 @@ buildscript {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
         classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
-        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'com.google.gms:google-services:4.3.15'
         classpath "com.ncorti.ktfmt.gradle:plugin:0.11.0"
     }
 }
@@ -54,6 +54,7 @@ ext {
     robolectricVersion = libs.versions.robolectric.get()
     protocVersion = libs.versions.protoc.get()
     javaliteVersion = libs.versions.javalite.get()
+    protobufJavaUtilVersion = libs.versions.protobufjavautil.get()
 }
 
 apply plugin: com.google.firebase.gradle.plugins.publish.PublishingPlugin

ci/fireci/fireciplugins/coverage.py

@@ -60,8 +60,7 @@ def coverage(pull_request, log, metrics_service_url, access_token):
   uploader.post_report(test_report, metrics_service_url, access_token, 'coverage')
 
   if process.returncode != 0:
-    _logger.error(f'{process.args} failed with error code: {process.returncode}.')
-    raise click.ClickException('Coverage test failed with above errors.')
+    _logger.warning(f'{process.args} failed with error code: {process.returncode}.')
 
 
 def _parse_xml_reports():

encoders/firebase-encoders-proto/firebase-encoders-proto.gradle

@@ -44,7 +44,7 @@ dependencies {
 
     testImplementation 'com.google.guava:guava:31.0-jre'
     testImplementation 'junit:junit:4.13.1'
-    testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
+    testImplementation "com.google.protobuf:protobuf-java-util:$protobufJavaUtilVersion"
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
 

firebase-abt/gradle.properties

@@ -1,2 +1,2 @@
-version=21.1.1
-latestReleasedVersion=21.1.0
+version=21.1.2
+latestReleasedVersion=21.1.1

firebase-annotations/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=16.1.1
-latestReleasedVersion=16.1.0
+version=16.2.1
+latestReleasedVersion=16.2.0

firebase-common/gradle.properties

@@ -1,3 +1,3 @@
-version=20.2.1
-latestReleasedVersion=20.2.0
+version=20.3.1
+latestReleasedVersion=20.3.0
 android.enableUnitTestBinaryResources=true

firebase-components/gradle.properties

@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=17.0.2
-latestReleasedVersion=17.0.1
+version=17.1.1
+latestReleasedVersion=17.1.0

firebase-config/gradle.properties

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-version=21.2.1
-latestReleasedVersion=21.2.0
+version=21.2.2
+latestReleasedVersion=21.2.1
 android.enableUnitTestBinaryResources=true
 

firebase-crashlytics-ndk/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# 18.3.5
+* [fixed] Updated `firebase-common` to its latest version (v20.3.0) to fix an issue that was 
+  causing a nondeterministic crash on startup.
+
+# 18.3.4
 * [changed] Updated internal Crashpad version to commit `c902f6`.
 
 # 18.3.2

firebase-crashlytics-ndk/gradle.properties

@@ -1,2 +1,2 @@
-version=18.3.3
-latestReleasedVersion=18.3.2
+version=18.3.6
+latestReleasedVersion=18.3.5

firebase-crashlytics/CHANGELOG.md

@@ -4,6 +4,10 @@
 * [changed] Add improved support capturing build ids for Native ANRs on older
   Android versions.
 
+# 18.3.5
+* [fixed] Updated `firebase-common` to its latest version (v20.3.0) to fix an issue that was 
+  causing a nondeterministic crash on startup.
+
 # 18.3.2
 * [unchanged] Updated to accommodate the release of the updated
   `firebase-crashlytics-ndk` v18.3.2.

firebase-crashlytics/gradle.properties

@@ -1,2 +1,2 @@
-version=18.3.3
-latestReleasedVersion=18.3.2
+version=18.3.6
+latestReleasedVersion=18.3.5

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java

@@ -59,7 +59,7 @@ public class CrashlyticsCore {
   static final String CRASHLYTICS_REQUIRE_BUILD_ID = "com.crashlytics.RequireBuildId";
   static final boolean CRASHLYTICS_REQUIRE_BUILD_ID_DEFAULT = true;
 
-  static final int DEFAULT_MAIN_HANDLER_TIMEOUT_SEC = 4;
+  static final int DEFAULT_MAIN_HANDLER_TIMEOUT_SEC = 3;
 
   private static final String ON_DEMAND_RECORDED_KEY =
       "com.crashlytics.on-demand.recorded-exceptions";

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/Utils.java

@@ -14,10 +14,8 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
-import static java.util.Objects.requireNonNull;
-
 import android.annotation.SuppressLint;
-import androidx.annotation.NonNull;
+import android.os.Looper;
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -30,9 +28,9 @@
 import java.util.concurrent.TimeoutException;
 
 /** Utils */
+@SuppressWarnings({"ResultOfMethodCallIgnored", "UnusedReturnValue"})
 public final class Utils {
-
-  private Utils() {}
+  private static final int TIMEOUT_SEC = 4;
 
   /** @return A tasks that is resolved when either of the given tasks is resolved. */
   // TODO(b/261014167): Use an explicit executor in continuations.
@@ -43,8 +41,8 @@ public static <T> Task<T> race(Task<T> t1, Task<T> t2) {
         task -> {
           if (task.isSuccessful()) {
             result.trySetResult(task.getResult());
-          } else {
-            result.trySetException(requireNonNull(task.getException()));
+          } else if (task.getException() != null) {
+            result.trySetException(task.getException());
           }
           return null;
         };
@@ -60,8 +58,8 @@ public static <T> Task<T> race(Executor executor, Task<T> t1, Task<T> t2) {
         task -> {
           if (task.isSuccessful()) {
             result.trySetResult(task.getResult());
-          } else {
-            result.trySetException(requireNonNull(task.getException()));
+          } else if (task.getException() != null) {
+            result.trySetException(task.getException());
           }
           return null;
         };
@@ -72,34 +70,27 @@ public static <T> Task<T> race(Executor executor, Task<T> t1, Task<T> t2) {
 
   /** Similar to Tasks.call, but takes a Callable that returns a Task. */
   public static <T> Task<T> callTask(Executor executor, Callable<Task<T>> callable) {
-    final TaskCompletionSource<T> tcs = new TaskCompletionSource<T>();
+    final TaskCompletionSource<T> result = new TaskCompletionSource<>();
     executor.execute(
-        new Runnable() {
-          // TODO(b/261014167): Use an explicit executor in continuations.
-          @SuppressLint("TaskMainThread")
-          @Override
-          public void run() {
-            try {
-              callable
-                  .call()
-                  .continueWith(
-                      new Continuation<T, Void>() {
-                        @Override
-                        public Void then(@NonNull Task<T> task) throws Exception {
-                          if (task.isSuccessful()) {
-                            tcs.setResult(task.getResult());
-                          } else {
-                            tcs.setException(task.getException());
-                          }
-                          return null;
-                        }
-                      });
-            } catch (Exception e) {
-              tcs.setException(e);
-            }
+        () -> {
+          try {
+            callable
+                .call()
+                .continueWith(
+                    executor,
+                    task -> {
+                      if (task.isSuccessful()) {
+                        result.setResult(task.getResult());
+                      } else if (task.getException() != null) {
+                        result.setException(task.getException());
+                      }
+                      return null;
+                    });
+          } catch (Exception e) {
+            result.setException(e);
           }
         });
-    return tcs.getTask();
+    return result.getTask();
   }
 
   /**
@@ -126,7 +117,11 @@ public static <T> T awaitEvenIfOnMainThread(Task<T> task)
           return null;
         });
 
-    latch.await(CrashlyticsCore.DEFAULT_MAIN_HANDLER_TIMEOUT_SEC, TimeUnit.SECONDS);
+    if (Looper.getMainLooper() == Looper.myLooper()) {
+      latch.await(CrashlyticsCore.DEFAULT_MAIN_HANDLER_TIMEOUT_SEC, TimeUnit.SECONDS);
+    } else {
+      latch.await(TIMEOUT_SEC, TimeUnit.SECONDS);
+    }
 
     if (task.isSuccessful()) {
       return task.getResult();
@@ -170,4 +165,6 @@ public static boolean awaitUninterruptibly(CountDownLatch latch, long timeout, T
   private static final ExecutorService TASK_CONTINUATION_EXECUTOR_SERVICE =
       ExecutorUtils.buildSingleThreadExecutorService(
           "awaitEvenIfOnMainThread task continuation executor");
+
+  private Utils() {}
 }

firebase-firestore/gradle.properties

@@ -1,2 +1,2 @@
-version=24.4.2
-latestReleasedVersion=24.4.1
+version=24.4.4
+latestReleasedVersion=24.4.3