Automatic merge of main into feature_branch/ump-sdk - Sep 04, 2023 (#1438)

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

* Try using CoreOnly instead of Analytics cocoapod for tests.

* Update readme.

* Add stub workflow for updating feature branches.

* Add script to merge main into all active feature branches on a regular 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.

* Increase retry. (#1402)

* Add Firestore test history report (#1403)

* 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.

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

This reverts commit 11332d4.

* Wrap the real-time RemoteConfig test in flaky-block to automatically retry. (#1406)

* Only use flaky_test on android

* Update the iOS version used by FTL (#1408)

* Kick off nightly packaging an hour earlier (#1409)

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

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

* build: pass along the CMake path (#1410)

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.

* Add log to gsutil fetch. (#1411)

* Update mobile dependencies - Thu Aug 03 2023 (#1413)

* 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 <[email protected]>
Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: [email protected] <[email protected]>

* feat(auth): Add emulator support (#1400)

* 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 <[email protected]>

* Update merge-to-main script (#1420)

* 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)

* feat(auth): enable emulator support on desktop (#1423)

* 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 <[email protected]>

* Internal Updates. (#1422)

* Add logic to trim webp parameter from native image urls

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

* Add Analytics function for phone number conversion

* Formatting

* Update analytics.h

* Update analytics_test.cc

* Update mobile dependencies - Tue Aug 29 2023 (#1436)

* 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 <[email protected]>
Co-authored-by: a-maurice <[email protected]>

* add UseEmulator api to auth (#1437)

* 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 <[email protected]>

---------

Co-authored-by: Jon Simantov <[email protected]>
Co-authored-by: Tom Andersen <[email protected]>
Co-authored-by: Matthew Hyndman <[email protected]>
Co-authored-by: a-maurice <[email protected]>
Co-authored-by: Saleem Abdulrasool <[email protected]>
Co-authored-by: firebase-workflow-trigger[bot] <80733318+firebase-workflow-trigger[bot]@users.noreply.github.com>
Co-authored-by: firebase-workflow-trigger-bot <[email protected]>
Co-authored-by: Cynthia J <[email protected]>
Co-authored-by: Cynthia Jiang <[email protected]>
Co-authored-by: nakirekommula <[email protected]>

Author: 10 people

Android/firebase_dependencies.gradle

@@ -27,7 +27,7 @@ def firebaseDependenciesMap = [
   'dynamic_links' : ['com.google.firebase:firebase-dynamic-links'],
   'firestore' : ['com.google.firebase:firebase-firestore'],
   'functions' : ['com.google.firebase:firebase-functions'],
-  'gma' : ['com.google.android.gms:play-services-ads:22.2.0'],
+  'gma' : ['com.google.android.gms:play-services-ads:22.3.0'],
   'installations' : ['com.google.firebase:firebase-installations'],
   'invites' : ['com.google.firebase:firebase-invites'],
   // Messaging has an additional local dependency to include.
@@ -158,7 +158,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.2.2')
+      implementation platform('com.google.firebase:firebase-bom:32.2.3')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

analytics/integration_test/Podfile

@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Analytics', '10.13.0'
+  pod 'Firebase/Analytics', '10.14.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '10.13.0'
+  pod 'Firebase/Analytics', '10.14.0'
 end
 
 post_install do |installer|

analytics/integration_test/src/integration_test.cc

@@ -190,6 +190,8 @@ TEST_F(FirebaseAnalyticsTest, TestSetProperties) {
   // Initiate on-device conversion measurement.
   firebase::analytics::InitiateOnDeviceConversionMeasurementWithEmailAddress(
       "[email protected]");
+  firebase::analytics::InitiateOnDeviceConversionMeasurementWithPhoneNumber(
+      "+15551234567");
 }
 
 TEST_F(FirebaseAnalyticsTest, TestLogEvents) {

analytics/ios_headers/FIREventNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.13.0.
+// Copied from Firebase Analytics iOS SDK 10.14.0.
 
 /// @file FIREventNames.h
 ///

analytics/ios_headers/FIRParameterNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.13.0.
+// Copied from Firebase Analytics iOS SDK 10.14.0.
 
 /// @file FIRParameterNames.h
 ///

analytics/ios_headers/FIRUserPropertyNames.h

@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.13.0.
+// Copied from Firebase Analytics iOS SDK 10.14.0.
 
 /// @file FIRUserPropertyNames.h
 ///

analytics/src/analytics_android.cc

@@ -411,6 +411,16 @@ void InitiateOnDeviceConversionMeasurementWithEmailAddress(
   // No-op on Android
 }
 
+/// Initiates on-device conversion measurement given a phone number on iOS
+/// (no-op on Android). On iOS, requires dependency
+/// GoogleAppMeasurementOnDeviceConversion to be linked in, otherwise it is a
+/// no-op.
+void InitiateOnDeviceConversionMeasurementWithPhoneNumber(
+    const char* phone_number) {
+  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
+  // No-op on Android
+}
+
 // Set a user property to the given value.
 void SetUserProperty(const char* name, const char* value) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/analytics_ios.mm

@@ -266,6 +266,14 @@ void InitiateOnDeviceConversionMeasurementWithEmailAddress(const char* email_add
   [FIRAnalytics initiateOnDeviceConversionMeasurementWithEmailAddress:@(email_address)];
 }
 
+/// Initiates on-device conversion measurement given a phone number on iOS (no-op on
+/// Android). On iOS, requires dependency GoogleAppMeasurementOnDeviceConversion to be linked
+/// in, otherwise it is a no-op.
+void InitiateOnDeviceConversionMeasurementWithPhoneNumber(const char* phone_number) {
+  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
+  [FIRAnalytics initiateOnDeviceConversionMeasurementWithPhoneNumber:@(phone_number)];
+}
+
 // Set a user property to the given value.
 void SetUserProperty(const char* name, const char* value) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/analytics_stub.cc

@@ -106,6 +106,15 @@ void InitiateOnDeviceConversionMeasurementWithEmailAddress(
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
 }
 
+/// Initiates on-device conversion measurement given a phone number on iOS
+/// (no-op on Android). On iOS, requires dependency
+/// GoogleAppMeasurementOnDeviceConversion to be linked in, otherwise it is a
+/// no-op.
+void InitiateOnDeviceConversionMeasurementWithPhoneNumber(
+    const char* phone_number) {
+  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
+}
+
 // Set a user property to the given value.
 void SetUserProperty(const char* /*name*/, const char* /*value*/) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());

analytics/src/include/firebase/analytics.h

@@ -487,6 +487,17 @@ void LogEvent(const char* name, const Parameter* parameters,
 void InitiateOnDeviceConversionMeasurementWithEmailAddress(
     const char* email_address);
 
+/// Initiates on-device conversion measurement given a phone number in E.164
+/// format on iOS (no-op on Android). On iOS, requires dependency
+/// GoogleAppMeasurementOnDeviceConversion to be linked in, otherwise it is a
+/// no-op.
+/// @param phone_number User phone number. Must be in E.164 format, which means
+/// it must be
+///   limited to a maximum of 15 digits and must include a plus sign (+) prefix
+///   and country code with no dashes, parentheses, or spaces.
+void InitiateOnDeviceConversionMeasurementWithPhoneNumber(
+    const char* phone_number);
+
 /// @brief Set a user property to the given value.
 ///
 /// Properties associated with a user allow a developer to segment users