Merge branch 'refs/heads/main' into crashlytics-kts-customKey

# Conflicts:
#	firebase-crashlytics/CHANGELOG.md

Author: mrober

firebase-crashlytics/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 * [fixed] Fixed inefficiency in the Kotlin `FirebaseCrashlytics.setCustomKeys` extension.
+* [fixed] Execute failure listener outside the main thread  [#6535]
 
 # 19.2.1
 * [changed] Updated protobuf dependency to `3.25.5` to fix

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java

@@ -18,6 +18,7 @@
 import com.google.firebase.analytics.connector.AnalyticsConnector;
 import com.google.firebase.annotations.concurrent.Background;
 import com.google.firebase.annotations.concurrent.Blocking;
+import com.google.firebase.annotations.concurrent.Lightweight;
 import com.google.firebase.components.Component;
 import com.google.firebase.components.ComponentContainer;
 import com.google.firebase.components.ComponentRegistrar;
@@ -42,6 +43,8 @@ public class CrashlyticsRegistrar implements ComponentRegistrar {
       Qualified.qualified(Background.class, ExecutorService.class);
   private final Qualified<ExecutorService> blockingExecutorService =
       Qualified.qualified(Blocking.class, ExecutorService.class);
+  private final Qualified<ExecutorService> lightweightExecutorService =
+      Qualified.qualified(Lightweight.class, ExecutorService.class);
 
   static {
     // Add Crashlytics as a dependency of Sessions when this class is loaded into memory.
@@ -57,6 +60,7 @@ public List<Component<?>> getComponents() {
             .add(Dependency.required(FirebaseInstallationsApi.class))
             .add(Dependency.required(backgroundExecutorService))
             .add(Dependency.required(blockingExecutorService))
+            .add(Dependency.required(lightweightExecutorService))
             .add(Dependency.deferred(CrashlyticsNativeComponent.class))
             .add(Dependency.deferred(AnalyticsConnector.class))
             .add(Dependency.deferred(FirebaseRemoteConfigInterop.class))
@@ -79,7 +83,8 @@ private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
             container.getDeferred(AnalyticsConnector.class),
             container.getDeferred(FirebaseRemoteConfigInterop.class),
             container.get(backgroundExecutorService),
-            container.get(blockingExecutorService));
+            container.get(blockingExecutorService),
+            container.get(lightweightExecutorService));
 
     long duration = System.currentTimeMillis() - startTime;
     if (duration > 16) {

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java

@@ -67,7 +67,8 @@ public class FirebaseCrashlytics {
       @NonNull Deferred<AnalyticsConnector> analyticsConnector,
       @NonNull Deferred<FirebaseRemoteConfigInterop> remoteConfigInteropDeferred,
       ExecutorService backgroundExecutorService,
-      ExecutorService blockingExecutorService) {
+      ExecutorService blockingExecutorService,
+      ExecutorService lightExecutorService) {
 
     Context context = app.getApplicationContext();
     final String appIdentifier = context.getPackageName();
@@ -160,7 +161,8 @@ public class FirebaseCrashlytics {
     // Kick off actually fetching the settings.
     settingsController
         .loadSettingsData(crashlyticsWorkers)
-        .addOnFailureListener(ex -> Logger.getLogger().e("Error fetching settings.", ex));
+        .addOnFailureListener(
+            lightExecutorService, ex -> Logger.getLogger().e("Error fetching settings.", ex));
 
     final boolean finishCoreInBackground = core.onPreExecute(appData, settingsController);
 

firebase-functions/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+* [fixed] Fixed HttpsCallableResult.data resolution in Kotlin
+
+# 21.1.0
 * [changed] Migrated to Kotlin
 
 # 21.0.0

firebase-functions/api.txt

@@ -110,6 +110,7 @@ package com.google.firebase.functions {
 
   public final class HttpsCallableResult {
     method @Nullable public Object getData();
+    field @Nullable public final Object data;
   }
 
   public final class Serializer {

firebase-functions/src/androidTest/java/com/google/firebase/functions/ktx/CallTests.kt

@@ -64,7 +64,7 @@ class CallTests {
       )
 
     var function = functions.getHttpsCallable("dataTest")
-    val actual = Tasks.await(function.call(input)).getData()
+    val actual = Tasks.await(function.call(input)).data
 
     assertThat(actual).isInstanceOf(Map::class.java)
     @Suppress("UNCHECKED_CAST") val map = actual as Map<String, *>
@@ -77,7 +77,7 @@ class CallTests {
   fun testNullDataCall() {
     val functions = Firebase.functions(app)
     var function = functions.getHttpsCallable("nullTest")
-    val actual = Tasks.await(function.call(null)).getData()
+    val actual = Tasks.await(function.call(null)).data
 
     assertThat(actual).isNull()
   }
@@ -86,7 +86,7 @@ class CallTests {
   fun testEmptyDataCall() {
     val functions = Firebase.functions(app)
     var function = functions.getHttpsCallable("nullTest")
-    val actual = Tasks.await(function.call()).getData()
+    val actual = Tasks.await(function.call()).data
 
     assertThat(actual).isNull()
   }

firebase-functions/src/main/java/com/google/firebase/functions/HttpsCallableResult.kt

@@ -16,13 +16,21 @@ package com.google.firebase.functions
 /** The result of calling a HttpsCallableReference function. */
 public class HttpsCallableResult
 internal constructor( // The actual result data, as generic types decoded from JSON.
-private val data: Any?) {
+  /**
+   * The data that was returned from the Callable HTTPS trigger.
+   *
+   * The data is in the form of native Java objects. For example, if your trigger returned an array,
+   * this object would be a `List<Object>`. If your trigger returned a JavaScript object with keys
+   * and values, this object would be a `Map<String, Object>`.
+   */
+  @JvmField public val data: Any?
+) {
   /**
    * Returns the data that was returned from the Callable HTTPS trigger.
    *
    * The data is in the form of native Java objects. For example, if your trigger returned an array,
-   * this object would be a List<Object>. If your trigger returned a JavaScript object with keys and
-   * values, this object would be a Map<String, Object>.
+   * this object would be a `List<Object>`. If your trigger returned a JavaScript object with keys
+   * and values, this object would be a `Map<String, Object>`.
    */
   public fun getData(): Any? {
     return data