Merge branch 'master' into sessions-nine

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

@@ -1,4 +1,7 @@
 # Unreleased
+
+
+# 17.1.1
 * [unchanged] Updated to keep [app_check] SDK versions aligned.
 
 # 17.1.0

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

@@ -1,2 +1,2 @@
-version=17.1.1
-latestReleasedVersion=17.1.0
+version=17.1.2
+latestReleasedVersion=17.1.1

appcheck/firebase-appcheck-debug/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+
+
+# 17.1.1
 * [unchanged] Updated to keep [app_check] SDK versions aligned.
 
 # 17.1.0

appcheck/firebase-appcheck-debug/gradle.properties

@@ -1,2 +1,2 @@
-version=17.1.1
-latestReleasedVersion=17.1.0
+version=17.1.2
+latestReleasedVersion=17.1.1

appcheck/firebase-appcheck-playintegrity/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Unreleased
+
+
+# 17.1.1
 * [fixed] Fixed client-side throttling in Play Integrity flows.
 * [changed] Bumped Play Integrity API Library dependency version.
 

appcheck/firebase-appcheck-playintegrity/gradle.properties

@@ -1,2 +1,2 @@
-version=17.1.1
-latestReleasedVersion=17.1.0
+version=17.1.2
+latestReleasedVersion=17.1.1

appcheck/firebase-appcheck/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Unreleased
+
+
+# 17.1.1
 * [fixed] Fixed a bug causing internal tests to depend directly on `firebase-common`.
 * [fixed] Fixed client-side throttling in Play Integrity flows.
 
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-appcheck` library. The Kotlin extensions library has no additional
+updates.
+
 # 17.1.0
 * [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-appcheck-ktx`
   to `com.google.firebase:firebase-appcheck` under the `com.google.firebase.appcheck` package.
@@ -109,3 +118,4 @@ additional updates:
 # 16.0.0-beta01
 * [feature] Initial beta release of the [app_check] SDK with abuse reduction
   features.
+

appcheck/firebase-appcheck/gradle.properties

@@ -1,2 +1,2 @@
-version=17.1.1
-latestReleasedVersion=17.1.0
+version=17.1.2
+latestReleasedVersion=17.1.1

firebase-crashlytics-ndk/gradle.properties

@@ -1,2 +1,2 @@
-version=18.5.1
-latestReleasedVersion=18.5.0
+version=18.5.2
+latestReleasedVersion=18.5.1

firebase-crashlytics/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Unreleased
-
 * [changed] Include more details about app processes in reports.
 
+# 18.5.1
+* [fixed] Internal improvement to fix compatibility with Flutter and Unity SDKs. Github
+  [#10759](https://github.com/firebase/flutterfire/issues/10759)
+
+
+## Kotlin
+The Kotlin extensions library transitively includes the updated
+`firebase-crashlytics` library. The Kotlin extensions library has no additional
+updates.
+
 # 18.5.0
 * [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-crashlytics-ktx`
   to `com.google.firebase:firebase-crashlytics` under the `com.google.firebase.crashlytics` package.
@@ -13,8 +22,6 @@
   now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
   [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
 
-* [fixed] Fixed Flutter and Unity on-demand fatal `setUserIdentifier` behaviour. Github
-  [#10759](https://github.com/firebase/flutterfire/issues/10759)
 
 ## Kotlin
 The Kotlin extensions library transitively includes the updated
@@ -521,3 +528,4 @@ The following release notes describe changes in the new SDK.
  from your `AndroidManifest.xml` file.
  * [removed] The `fabric.properties` and `crashlytics.properties` files are no
  longer supported. Remove them from your app.
+

firebase-crashlytics/gradle.properties

@@ -1,2 +1,2 @@
-version=18.5.1
-latestReleasedVersion=18.5.0
+version=18.5.2
+latestReleasedVersion=18.5.1

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java

@@ -35,12 +35,10 @@
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.CustomAttribute;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import com.google.firebase.crashlytics.internal.persistence.CrashlyticsReportPersistence;
 import com.google.firebase.crashlytics.internal.send.DataTransportCrashlyticsReportSender;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -233,8 +231,9 @@ public void testNonFatalEvent_addsSortedKeysToEvent() {
     final CustomAttribute customAttribute2 =
         CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
 
-    final ImmutableList<CustomAttribute> expectedCustomAttributes =
-        ImmutableList.from(customAttribute1, customAttribute2);
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+    expectedCustomAttributes.add(customAttribute2);
 
     when(reportMetadata.getCustomKeys()).thenReturn(attributes);
     when(reportMetadata.getInternalKeys()).thenReturn(attributes);
@@ -294,8 +293,9 @@ public void testFatalEvent_addsSortedCustomKeysToEvent() {
     final CustomAttribute customAttribute2 =
         CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
 
-    final ImmutableList<CustomAttribute> expectedCustomAttributes =
-        ImmutableList.from(customAttribute1, customAttribute2);
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+    expectedCustomAttributes.add(customAttribute2);
 
     when(reportMetadata.getCustomKeys()).thenReturn(attributes);
 
@@ -331,8 +331,9 @@ public void testFatalEvent_addsSortedInternalKeysToEvent() {
     final CustomAttribute customAttribute2 =
         CustomAttribute.builder().setKey(testKey2).setValue(testValue2).build();
 
-    final ImmutableList<CustomAttribute> expectedCustomAttributes =
-        ImmutableList.from(customAttribute1, customAttribute2);
+    final List<CustomAttribute> expectedCustomAttributes = new ArrayList<>();
+    expectedCustomAttributes.add(customAttribute1);
+    expectedCustomAttributes.add(customAttribute2);
 
     when(reportMetadata.getInternalKeys()).thenReturn(attributes);
 
@@ -403,7 +404,8 @@ public void testFinalizeSessionWithNativeEvent_createsCrashlyticsReportWithNativ
     String byteBackedSessionName = "byte";
     BytesBackedNativeSessionFile byteSession =
         new BytesBackedNativeSessionFile(byteBackedSessionName, "not_applicable", testBytes);
-    reportingCoordinator.finalizeSessionWithNativeEvent("id", Arrays.asList(byteSession), null);
+    reportingCoordinator.finalizeSessionWithNativeEvent(
+        "id", Collections.singletonList(byteSession), null);
 
     ArgumentCaptor<CrashlyticsReport.FilesPayload> filesPayload =
         ArgumentCaptor.forClass(CrashlyticsReport.FilesPayload.class);

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransformTest.java

@@ -24,9 +24,9 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Signal;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Thread.Frame;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.User;
-import com.google.firebase.crashlytics.internal.model.ImmutableList;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -144,14 +144,6 @@ private static Application makeTestApplication(boolean useDevelopmentPlatform) {
     return builder.build();
   }
 
-  private static ImmutableList<Event> makeTestEvents(int numEvents) {
-    List<Event> events = new ArrayList<>();
-    for (int i = 0; i < numEvents; i++) {
-      events.add(makeTestEvent());
-    }
-    return ImmutableList.from(events);
-  }
-
   private static Event makeTestEvent() {
     return Event.builder()
         .setType("type")
@@ -162,7 +154,7 @@ private static Event makeTestEvent() {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -178,7 +170,7 @@ private static Event makeTestEvent() {
                                 .build())
                         .setSignal(Signal.builder().setCode("0").setName("0").setAddress(0).build())
                         .setThreads(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Session.Event.Application.Execution.Thread.builder()
                                     .setName("name")
                                     .setImportance(4)
@@ -209,7 +201,7 @@ private static Event makeAnrEvent(boolean withBuildIds) {
                 .setExecution(
                     Execution.builder()
                         .setBinaries(
-                            ImmutableList.from(
+                            Collections.singletonList(
                                 Execution.BinaryImage.builder()
                                     .setBaseAddress(0)
                                     .setName("name")
@@ -233,44 +225,49 @@ private static Event makeAnrEvent(boolean withBuildIds) {
         .build();
   }
 
-  private static ImmutableList<Frame> makeTestFrames() {
-    return ImmutableList.from(
+  private static List<Frame> makeTestFrames() {
+    ArrayList<Frame> frames = new ArrayList<>();
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func1")
             .setFile("Test.java")
             .setOffset(36)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func2")
             .setFile("Test.java")
             .setOffset(5637)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func3")
             .setFile("Test.java")
             .setOffset(22429)
             .setImportance(4)
-            .build(),
+            .build());
+    frames.add(
         Frame.builder()
             .setPc(0)
             .setSymbol("func4")
             .setFile("Test.java")
             .setOffset(751)
             .setImportance(4)
             .build());
+    return Collections.unmodifiableList(frames);
   }
 
   private static CrashlyticsReport.ApplicationExitInfo makeAppExitInfo(boolean withBuildIds) {
-    ImmutableList<CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch>
+    List<CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch>
         buildIdMappingForArchImmutableList = null;
     if (withBuildIds) {
       buildIdMappingForArchImmutableList =
-          ImmutableList.from(
+          Collections.singletonList(
               CrashlyticsReport.ApplicationExitInfo.BuildIdMappingForArch.builder()
                   .setLibraryName("lib.so")
                   .setArch("x86")