Merge main into UMP feature branch and update readme #1458

jonsimantov · 2023-09-27T22:47:14Z

Description

Provide details of the change, and generalize the change in the PR title above.

Testing

Describe how you've tested these changes. Link any manually triggered Integration tests or CPP binary SDK Packaging Github Action workflows, if applicable.

Type of Change

Place an x the applicable box:

Bug fix. Add the issue # below if applicable.
New feature. A non-breaking change which adds functionality.
Other, such as a build process or documentation change.

Notes

Bug fixes and feature changes require an update to the Release Notes section of release_build_files/readme.md.
Read the contribution guidelines CONTRIBUTING.md.
Changes to the public API require an internal API review. If you'd like to help us make Firebase APIs better, please propose your change in a feature request so that we can discuss it together.

* Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme.

…r schedule. (#1394) * Add workflow for automatically updating feature branches weekly. * Corrected filename, and added inputs. * Remove trailing spaces. * Fix workflow. * Fix workflow name. * Fix syntax. * Fix syntax. * List remote branches instead. * Clean up script. * Untab. * Add branch list for debugging. * Untab. * Specify remote branches. * Skip second stage if no first. * Typo * Error. * List all branches. * Fix logic. * Fix spacing. * Fix output * Fix parameters. * Fix merge to use origin. * Remove debug echos. * Add git config. * Fix PR creation. * Fix PR creation. * Fix automatic push.

* Add --firestore flag to report Firestore history. * Add Firestore report to nightly cron job. * Remove multiline commands. * Revert "Remove multiline commands." This reverts commit 6393ae9. * Fix tabbing. * Fix packaging test detection for Firestore.

This reverts commit 11332d4.

…retry. (#1406) * Only use flaky_test on android

Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app.

When building the subproject, we would invoke `cmake` directly, relying on the path lookup of the tool, which may or may not match the currently executing CMake. Use `CMAKE_COMMAND` which gives us the path to the current CMake executable ensuring that we use the same CMake for building the dependencies.

* Update mobile dependencies - Thu Aug 03 2023 ### Android - com.google.firebase.firebase_bom → 32.2.2 ### iOS - Firebase/Analytics → 10.13.0 - Firebase/AppCheck → 10.13.0 - Firebase/Auth → 10.13.0 - Firebase/Core → 10.13.0 - Firebase/CoreOnly → 10.13.0 - Firebase/Crashlytics → 10.13.0 - Firebase/Database → 10.13.0 - Firebase/DynamicLinks → 10.13.0 - Firebase/Firestore → 10.13.0 - Firebase/Functions → 10.13.0 - Firebase/Installations → 10.13.0 - Firebase/Messaging → 10.13.0 - Firebase/RemoteConfig → 10.13.0 - Firebase/Storage → 10.13.0 - Google-Mobile-Ads-SDK → 10.9.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/5755777170). * Ensure using a Swift bridging header that supports both arm64 and x86_64. * Add release note about i386 no longer being supported. * Remove armv7 as well. --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: almostmatt@google.com <almostmatt@google.com>

* add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` --------- Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

* Before creating the merge-main PR, branch it off main, so merge conflicts can be addressed in the branch rather than by committing to main. * Format.

* add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` * make json request always do restrict json * add readme info * prepare for review * some minor tweak * code format * update review comments * update the unit test after request json change --------- Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

* Add logic to trim webp parameter from native image urls

* Add Analytics function for phone number conversion * Formatting * Update analytics.h * Update analytics_test.cc

* Update mobile dependencies - Tue Aug 29 2023 ### Android - com.google.android.gms.play_services_ads → 22.3.0 - com.google.firebase.firebase_bom → 32.2.3 ### iOS - Firebase/Analytics → 10.14.0 - Firebase/AppCheck → 10.14.0 - Firebase/Auth → 10.14.0 - Firebase/Core → 10.14.0 - Firebase/CoreOnly → 10.14.0 - Firebase/Crashlytics → 10.14.0 - Firebase/Database → 10.14.0 - Firebase/DynamicLinks → 10.14.0 - Firebase/Firestore → 10.14.0 - Firebase/Functions → 10.14.0 - Firebase/Installations → 10.14.0 - Firebase/Messaging → 10.14.0 - Firebase/RemoteConfig → 10.14.0 - Firebase/Storage → 10.14.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6016988287). * Update query_main to use normalized_order_bys * Update query_main.cc --------- Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com> Co-authored-by: a-maurice <amaurice@google.com>

* add auth emulator support * fix ios number parse * update the documentation part * reduce lint warning * more lint warnings * code format * use environment to decide using emulator or not * fix a typo * add readme entry for FirebaseApp.GetApps() * update for review comment * add missing ` * make json request always do restrict json * add readme info * prepare for review * some minor tweak * code format * update review comments * update the unit test after request json change * remove platform logging v1 code * add useEmulator api * test with emulator * clean up for review * tweak for review * update with comments * put back necessary heartbeat blocks --------- Co-authored-by: Cynthia Jiang <cynthiajiang@google.com>

* To address an Android 14 security issue, set dex files to readonly. This follows the advice on dynamic code loading here: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading * Format code. * Reorder exception check so that we cover all the spots. * Add release note.

### iOS - Firebase/Analytics → 10.15.0 - Firebase/AppCheck → 10.15.0 - Firebase/Auth → 10.15.0 - Firebase/Core → 10.15.0 - Firebase/CoreOnly → 10.15.0 - Firebase/Crashlytics → 10.15.0 - Firebase/Database → 10.15.0 - Firebase/DynamicLinks → 10.15.0 - Firebase/Firestore → 10.15.0 - Firebase/Functions → 10.15.0 - Firebase/Installations → 10.15.0 - Firebase/Messaging → 10.15.0 - Firebase/RemoteConfig → 10.15.0 - Firebase/Storage → 10.15.0 - Google-Mobile-Ads-SDK → 10.10.0 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6164028143). Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>

Already applied on desktop elsewhere.

* Update release version to 11.5.0. * Update readme. * Update Android dependencies - Mon Sep 18 2023 ### Android - com.google.android.gms.play_services_ads → 22.4.0 - com.google.firebase.firebase_bom → 32.3.1 > Created by [Update Android and iOS dependencies workflow](https://github.com/firebase/firebase-cpp-sdk/actions/runs/6226059256). * Add note about GMA Android. * Revert play-services-ads to 22.3.0. --------- Co-authored-by: Jon Simantov <jsimantov@google.com> Co-authored-by: firebase-workflow-trigger-bot <firebase-workflow-trigger-bot@google.com>

) * Add a matrix label to FTL test runs, to make sorting them easier. * Fix label for iOS

* OR Query Implementation * Pretty * Add includes * Fix from PR feedback * Fix variadic parameters * Add and fix tests * Add/fix method descriptions. * Add/fix constructor and class descriptions. * Add method description to disjunction/conjunction. * Add tests. Revealed bugs to be fixed. * Fix type * Add test * Android implementation * Pretty * Pretty * Pretty * Remove const * Pretty * Fixes from code review * Release notes * Release notes * Fix Android OR Query * Release notes. * Fix release notes. * Format

* Internal Updates

jonsimantov and others added 30 commits July 19, 2023 23:43

iOS: Remove Analytics dependency from GMA integration test (#1386)

e0c330d

* Try using CoreOnly instead of Analytics cocoapod for tests. * Update readme.

Add stub workflow for updating feature branches.

3cd0dca

Increase retry. (#1402)

b5e5477

Revert "OR Query Implementation (#1335)" (#1399)

daf92c8

This reverts commit 11332d4.

Wrap the real-time RemoteConfig test in flaky-block to automatically …

27a10bc

…retry. (#1406) * Only use flaky_test on android

Merge branch 'feature_branch/ump-sdk' into main

ed42949

Update the iOS version used by FTL (#1408)

9ac8881

Kick off nightly packaging an hour earlier (#1409)

f8b6a36

Fix crash on gma::Initialize without a Firebase App (#1320)

18367c0

Initialize Util before using Util::FIndClass. Also add an integration test for initializing gma without a firebase app.

Add log to gsutil fetch. (#1411)

5df80a2

Update merge-to-main script (#1420)

f84253e

* Before creating the merge-main PR, branch it off main, so merge conflicts can be addressed in the branch rather than by committing to main. * Format.

Update release version number for M135, 11.4.0 (#1421)

64d5d42

Internal Updates. (#1422)

86198bb

* Add logic to trim webp parameter from native image urls

Add Analytics function for on-device conversion (#1429)

7a19a44

* Add Analytics function for phone number conversion * Formatting * Update analytics.h * Update analytics_test.cc

Apply unused variables patch to Flatbuffers on Android as well. (#1444)

697385d

Already applied on desktop elsewhere.

Fix iOS test version from deprecate 16.5 to 16.6. (#1449)

fd9a6ce

Add a matrix label to FTL test runs, to make sorting them easier. (#1452

4790c90

) * Add a matrix label to FTL test runs, to make sorting them easier. * Fix label for iOS

Internal Updates (#1439)

55416d7

* Internal Updates

jonsimantov changed the base branch from main to feature_branch/ump-sdk September 27, 2023 22:48

jonsimantov added the tests-requested: quick Trigger a quick set of integration tests. label Sep 27, 2023

github-actions bot added tests: failed This PR's integration tests failed. and removed tests-requested: quick Trigger a quick set of integration tests. labels Sep 27, 2023

Revert firestore to main.

7d27c9f

jonsimantov added the tests-requested: quick Trigger a quick set of integration tests. label Sep 27, 2023

github-actions bot removed tests-requested: quick Trigger a quick set of integration tests. tests: failed This PR's integration tests failed. labels Sep 27, 2023

Add additional release note.

ffa8ba5

jonsimantov changed the title ~~Merge main into UMP feature branch~~ Merge main into UMP feature branch and update readme Sep 27, 2023

github-actions bot added the tests: failed This PR's integration tests failed. label Sep 28, 2023

firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Sep 28, 2023

Fix bad merge output.

14b9ed2

jonsimantov added the tests-requested: quick Trigger a quick set of integration tests. label Sep 28, 2023

github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests-requested: quick Trigger a quick set of integration tests. tests: failed This PR's integration tests failed. labels Sep 28, 2023

firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Sep 28, 2023

jonsimantov removed the tests: failed This PR's integration tests failed. label Sep 29, 2023

github-actions bot added the tests: succeeded This PR's integration tests succeeded. label Sep 29, 2023

jonsimantov requested a review from a-maurice October 1, 2023 06:12

jonsimantov enabled auto-merge (squash) October 1, 2023 06:12

a-maurice approved these changes Oct 2, 2023

View reviewed changes

jonsimantov merged commit 7a68b0d into feature_branch/ump-sdk Oct 2, 2023
119 of 126 checks passed

github-actions bot added tests: in-progress This PR's integration tests are in progress. tests: failed This PR's integration tests failed. and removed tests: succeeded This PR's integration tests succeeded. labels Oct 2, 2023

firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Oct 2, 2023

firebase locked and limited conversation to collaborators Nov 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into UMP feature branch and update readme #1458

Merge main into UMP feature branch and update readme #1458

jonsimantov commented Sep 27, 2023

Merge main into UMP feature branch and update readme #1458

Merge main into UMP feature branch and update readme #1458

Conversation

jonsimantov commented Sep 27, 2023

Description

Testing

Type of Change

Notes