firebase · jonsimantov · Sep 8, 2023 · Jul 19, 2023 · Jul 20, 2023 · Jul 23, 2023
diff --git a/Android/firebase_dependencies.gradle b/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

diff --git a/analytics/integration_test/Podfile b/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|

diff --git a/analytics/integration_test/src/integration_test.cc b/analytics/integration_test/src/integration_test.cc
@@ -190,6 +190,8 @@ TEST_F(FirebaseAnalyticsTest, TestSetProperties) {
   // Initiate on-device conversion measurement.
   firebase::analytics::InitiateOnDeviceConversionMeasurementWithEmailAddress(
       "my_email@site.com");
+  firebase::analytics::InitiateOnDeviceConversionMeasurementWithPhoneNumber(
+      "+15551234567");
 }
 
 TEST_F(FirebaseAnalyticsTest, TestLogEvents) {

diff --git a/analytics/ios_headers/FIREventNames.h b/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
 ///

diff --git a/analytics/ios_headers/FIRParameterNames.h b/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
 ///

diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/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
 ///

diff --git a/analytics/src/analytics_android.cc b/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());

diff --git a/analytics/src/analytics_ios.mm b/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());

diff --git a/analytics/src/analytics_stub.cc b/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());

diff --git a/analytics/src/include/firebase/analytics.h b/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

diff --git a/analytics/src_ios/fake/FIRAnalytics.h b/analytics/src_ios/fake/FIRAnalytics.h
@@ -23,6 +23,8 @@
 
 + (void)initiateOnDeviceConversionMeasurementWithEmailAddress:(nonnull NSString *)emailAddress;
 
++ (void)InitiateOnDeviceConversionMeasurementWithPhoneNumber:(nonnull NSString *)phoneNumber;
+
 + (void)setUserPropertyString:(nullable NSString *)value forName:(nonnull NSString *)name;
 
 + (void)setUserID:(nullable NSString *)userID;

diff --git a/analytics/src_ios/fake/FIRAnalytics.mm b/analytics/src_ios/fake/FIRAnalytics.mm
@@ -60,6 +60,11 @@ + (void)initiateOnDeviceConversionMeasurementWithEmailAddress:(nonnull NSString
                           { [emailAddress UTF8String] });
 }
 
++ (void)initiateOnDeviceConversionMeasurementWithPhoneNumber:(nonnull NSString *)phoneNumber {
+  FakeReporter->AddReport("+[FIRAnalytics initiateOnDeviceConversionMeasurementWithPhoneNumber:]",
+                          { [phoneNumber UTF8String] });
+}
+
 + (void)setUserPropertyString:(nullable NSString *)value forName:(nonnull NSString *)name {
   FakeReporter->AddReport("+[FIRAnalytics setUserPropertyString:forName:]",
                           { [name UTF8String], value ? [value UTF8String] : "nil" });

diff --git a/analytics/tests/analytics_test.cc b/analytics/tests/analytics_test.cc
@@ -232,6 +232,16 @@ TEST_F(AnalyticsTest,
   InitiateOnDeviceConversionMeasurementWithEmailAddress("my_email");
 }
 
+TEST_F(AnalyticsTest,
+       TestInitiateOnDeviceConversionMeasurementWithPhoneNumber) {
+  // InitiateOnDeviceConversionMeasurementWithPhoneNumber is no-op on Android
+  AddExpectationApple(
+      "+[FIRAnalytics initiateOnDeviceConversionMeasurementWithPhoneNumber:]",
+      {"+15551234567"});
+
+  InitiateOnDeviceConversionMeasurementWithPhoneNumber("+15551234567");
+}
+
 TEST_F(AnalyticsTest, TestSetUserProperty) {
   AddExpectationAndroid("FirebaseAnalytics.setUserProperty",
                         {"my_property", "my_value"});

diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.2')
+  implementation platform('com.google.firebase:firebase-bom:32.2.3')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.2')
+  implementation platform('com.google.firebase:firebase-bom:32.2.3')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')

diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '10.13.0'
+  pod 'Firebase/Analytics', '10.14.0'
 end
 
 post_install do |installer|

diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.2')
+  implementation platform('com.google.firebase:firebase-bom:32.2.3')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')

diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.2')
+  implementation platform('com.google.firebase:firebase-bom:32.2.3')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 

diff --git a/app_check/integration_test/Podfile b/app_check/integration_test/Podfile
@@ -4,20 +4,20 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/AppCheck', '10.13.0'
-  pod 'Firebase/Database', '10.13.0'
-  pod 'Firebase/Auth', '10.13.0'
-  pod 'Firebase/Storage', '10.13.0'
-  pod 'Firebase/Functions', '10.13.0'
+  pod 'Firebase/AppCheck', '10.14.0'
+  pod 'Firebase/Database', '10.14.0'
+  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Storage', '10.14.0'
+  pod 'Firebase/Functions', '10.14.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/AppCheck', '10.13.0'
-  pod 'Firebase/Database', '10.13.0'
-  pod 'Firebase/Auth', '10.13.0'
-  pod 'Firebase/Storage', '10.13.0'
-  pod 'Firebase/Functions', '10.13.0'
+  pod 'Firebase/AppCheck', '10.14.0'
+  pod 'Firebase/Database', '10.14.0'
+  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Storage', '10.14.0'
+  pod 'Firebase/Functions', '10.14.0'
 end
 
 post_install do |installer|

diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.2')
+  implementation platform('com.google.firebase:firebase-bom:32.2.3')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')

diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Auth', '10.13.0'
+  pod 'Firebase/Auth', '10.14.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Auth', '10.13.0'
+  pod 'Firebase/Auth', '10.14.0'
 end
 
 post_install do |installer|

diff --git a/auth/src/android/auth_android.cc b/auth/src/android/auth_android.cc
@@ -188,11 +188,19 @@ void UpdateCurrentUser(AuthData* auth_data) {
   }
 }
 
+void SetEmulatorJni(AuthData* auth_data, const char* host, uint32_t port) {
+  JNIEnv* env = Env(auth_data);
+
+  jstring j_host = env->NewStringUTF(host);
+  env->CallVoidMethod(AuthImpl(auth_data),
+                      auth::GetMethodId(auth::kUseEmulator), j_host, port);
+  env->DeleteLocalRef(j_host);
+  firebase::util::CheckAndClearJniExceptions(env);
+}
+
 const char* const kEmulatorLocalHost = "10.0.2.2";
 const char* const kEmulatorPort = "9099";
 void CheckEmulator(AuthData* auth_data) {
-  JNIEnv* env = Env(auth_data);
-
   // Use emulator as long as this env variable is set, regardless its value.
   if (std::getenv("USE_AUTH_EMULATOR") == nullptr) {
     LogInfo("Using Auth Prod for testing.");
@@ -207,12 +215,7 @@ void CheckEmulator(AuthData* auth_data) {
   if (std::getenv("AUTH_EMULATOR_PORT") != nullptr) {
     port = std::stoi(std::getenv("AUTH_EMULATOR_PORT"));
   }
-
-  jstring j_host = env->NewStringUTF(kEmulatorLocalHost);
-  env->CallVoidMethod(AuthImpl(auth_data),
-                      auth::GetMethodId(auth::kUseEmulator), j_host, port);
-  env->DeleteLocalRef(j_host);
-  firebase::util::CheckAndClearJniExceptions(env);
+  SetEmulatorJni(auth_data, kEmulatorLocalHost, port);
 }
 
 // Release cached Java classes.
@@ -828,6 +831,10 @@ Future<void> Auth::SendPasswordResetEmail(const char* email) {
   return MakeFuture(&futures, handle);
 }
 
+void Auth::UseEmulator(std::string host, uint32_t port) {
+  SetEmulatorJni(auth_data_, host.c_str(), port);
+}
+
 // Not implemented for Android.
 void EnableTokenAutoRefresh(AuthData* auth_data) {}
 void DisableTokenAutoRefresh(AuthData* auth_data) {}

diff --git a/auth/src/desktop/auth_desktop.cc b/auth/src/desktop/auth_desktop.cc
@@ -715,6 +715,14 @@ void Auth::UseAppLanguage() {
   auth_impl->language_code.assign(empty_string);
 }
 
+void Auth::UseEmulator(std::string host, uint32_t port) {
+  auto auth_impl = static_cast<AuthImpl*>(auth_data_->auth_impl);
+  auth_impl->assigned_emulator_url = "";
+  auth_impl->assigned_emulator_url.append(host);
+  auth_impl->assigned_emulator_url.append(":");
+  auth_impl->assigned_emulator_url.append(std::to_string(port));
+}
+
 void InitializeTokenRefresher(AuthData* auth_data) {
   auto auth_impl = static_cast<AuthImpl*>(auth_data->auth_impl);
   auth_impl->token_refresh_thread.Initialize(auth_data);

diff --git a/auth/src/desktop/auth_desktop.h b/auth/src/desktop/auth_desktop.h
@@ -188,6 +188,8 @@ struct AuthImpl {
   // The current user language code. This can be set to the app’s current
   // language by calling SetLanguageCode.
   std::string language_code;
+
+  std::string assigned_emulator_url;
 };
 
 // Constant, describing how often we automatically fetch a new auth token.