Merge branch 'main' into analytics-windows-dll-update

Author: AustinBenoit

Android/firebase_dependencies.gradle

@@ -36,7 +36,7 @@ def firebaseDependenciesMap = [
   'remote_config' : ['com.google.firebase:firebase-config'],
   'storage' : ['com.google.firebase:firebase-storage'],
   'testlab' : [],
-  'ump' : ['com.google.android.ump:user-messaging-platform:3.2.0']
+  'ump' : ['com.google.android.ump:user-messaging-platform:4.0.0']
 ]
 
 // A map of library to the gradle resources that they depend upon.
@@ -149,7 +149,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:34.4.0')
+      implementation platform('com.google.firebase:firebase-bom:34.6.0')
     }
     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, '15.0'
-  pod 'Firebase/Analytics', '12.4.0'
+  pod 'Firebase/Analytics', '12.6.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '15.0'
-  pod 'Firebase/Analytics', '12.4.0'
+  pod 'Firebase/Analytics', '12.6.0'
 end
 
 post_install do |installer|

analytics/integration_test/src/integration_test.cc

@@ -324,6 +324,18 @@ TEST_F(FirebaseAnalyticsTest, TestLogEventWithComplexParameters) {
       sizeof(kViewCartParameters) / sizeof(kViewCartParameters[0]));
 }
 
+TEST_F(FirebaseAnalyticsTest, TestSetDefaultEventParameters) {
+  const std::vector<firebase::analytics::Parameter> kDefaultParameters = {
+      firebase::analytics::Parameter("default_parameter_double", 123.456),
+      firebase::analytics::Parameter("default_parameter_int", 4),
+      firebase::analytics::Parameter("default_parameter_str", "Hello World"),
+  };
+
+  firebase::analytics::SetDefaultEventParameters(kDefaultParameters);
+  firebase::analytics::LogEvent("default_parameter_event");
+  firebase::analytics::SetDefaultEventParameters(nullptr, 0);
+}
+
 TEST_F(FirebaseAnalyticsTest, TestSetConsent) {
   // On Android, this test must be performed at the end, after all the tests for
   // session ID and instance ID. This is because once you call SetConsent to

analytics/ios_headers/FIREventNames.h

@@ -1,6 +1,6 @@
 // Copyright 2025 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 12.4.0.
+// Copied from Firebase Analytics iOS SDK 12.6.0.
 
 /// @file FIREventNames.h
 ///
@@ -151,6 +151,26 @@ static NSString *const kFIREventEarnVirtualCurrency
 static NSString *const kFIREventGenerateLead NS_SWIFT_NAME(AnalyticsEventGenerateLead) =
     @"generate_lead";
 
+/// In-App Purchase event. This event signifies that extra content or a subscription was purchased
+/// by a user inside an app. Note: This is different from the ecommerce purchase event. Note: If you
+/// supply the @c AnalyticsParameterValue parameter, you must also supply the
+/// @c AnalyticsParameterCurrency parameter so that revenue metrics can be computed accurately.
+/// Params:
+///
+/// <ul>
+///     <li>@c AnalyticsParameterCurrency (String)</li>
+///     <li>@c AnalyticsParameterFreeTrial (Int) (optional)</li>
+///     <li>@c AnalyticsParameterPrice (Double) (optional)</li>
+///     <li>@c AnalyticsParameterPriceIsDiscounted (Int) (optional)</li>
+///     <li>@c AnalyticsParameterProductID (String) (optional)</li>
+///     <li>@c AnalyticsParameterProductName (String) (optional)</li>
+///     <li>@c AnalyticsParameterQuantity (Int) (optional)</li>
+///     <li>@c AnalyticsParameterSubscription (Int) (optional)</li>
+///     <li>@c AnalyticsParameterValue (Double)</li>
+/// </ul>
+static NSString *const kFIREventInAppPurchase NS_SWIFT_NAME(AnalyticsEventInAppPurchase) =
+     @"in_app_purchase";
+
 /// Join Group event. Log this event when a user joins a group such as a guild, team or family. Use
 /// this event to analyze how popular certain groups or social features are in your app. Params:
 ///

analytics/ios_headers/FIRParameterNames.h

@@ -1,6 +1,6 @@
 // Copyright 2025 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 12.4.0.
+// Copied from Firebase Analytics iOS SDK 12.6.0.
 
 /// @file FIRParameterNames.h
 ///
@@ -248,6 +248,17 @@ static NSString *const kFIRParameterExtendSession NS_SWIFT_NAME(AnalyticsParamet
 static NSString *const kFIRParameterFlightNumber NS_SWIFT_NAME(AnalyticsParameterFlightNumber) =
     @"flight_number";
 
+/// Indicates if the user is on a free trial of a subscription. Specify 1 to indicate true and 0 to
+/// indicate false (Int).
+/// <pre>
+///     let params = [
+///       AnalyticsParameterFreeTrial : 1,
+///       // ...
+///     ]
+/// </pre>
+static NSString *const kFIRParameterFreeTrial NS_SWIFT_NAME(AnalyticsParameterFreeTrial) =
+    @"free_trial";
+
 /// Group/clan/guild ID (String).
 /// <pre>
 ///     let params = [
@@ -519,6 +530,37 @@ static NSString *const kFIRParameterPaymentType NS_SWIFT_NAME(AnalyticsParameter
 /// </pre>
 static NSString *const kFIRParameterPrice NS_SWIFT_NAME(AnalyticsParameterPrice) = @"price";
 
+/// Indicates if an item's price is discounted. Specify 1 to indicate true and 0 to indicate false
+/// (Int).
+/// <pre>
+///     let params = [
+///       AnalyticsParameterPriceIsDiscounted : 1,
+///       // ...
+///     ]
+/// </pre>
+static NSString *const kFIRParameterPriceIsDiscounted
+    NS_SWIFT_NAME(AnalyticsParameterPriceIsDiscounted) = @"price_is_discounted";
+
+/// The ID of a product (String).
+/// <pre>
+///     let params = [
+///       AnalyticsParameterProductID : "PROD_12345",
+///       // ...
+///     ]
+/// </pre>
+static NSString *const kFIRParameterProductID NS_SWIFT_NAME(AnalyticsParameterProductID) =
+    @"product_id";
+
+/// The name of a product (String).
+/// <pre>
+///     let params = [
+///       AnalyticsParameterProductName : "My Awesome Product",
+///       // ...
+///     ]
+/// </pre>
+static NSString *const kFIRParameterProductName NS_SWIFT_NAME(AnalyticsParameterProductName) =
+    @"product_name";
+
 /// The ID of a product promotion (String).
 /// <pre>
 ///     let params = [
@@ -646,6 +688,17 @@ static NSString *const kFIRParameterSourcePlatform NS_SWIFT_NAME(AnalyticsParame
 static NSString *const kFIRParameterStartDate NS_SWIFT_NAME(AnalyticsParameterStartDate) =
     @"start_date";
 
+/// Indicates if the purchase is a subscription. Specify 1 to indicate true and 0 to indicate false
+/// (Int).
+/// <pre>
+///     let params = [
+///       AnalyticsParameterSubscription : 1,
+///       // ...
+///     ]
+/// </pre>
+static NSString *const kFIRParameterSubscription NS_SWIFT_NAME(AnalyticsParameterSubscription) =
+    @"subscription";
+
 /// The result of an operation. Specify 1 to indicate success and 0 to indicate failure (Int).
 /// <pre>
 ///     let params = [

analytics/ios_headers/FIRUserPropertyNames.h

@@ -1,6 +1,6 @@
 // Copyright 2025 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 12.4.0.
+// Copied from Firebase Analytics iOS SDK 12.6.0.
 
 /// @file FIRUserPropertyNames.h
 ///

analytics/src/analytics_android.cc

@@ -19,6 +19,7 @@
 
 #include <cstdint>
 #include <cstring>
+#include <vector>
 
 #include "analytics/src/analytics_common.h"
 #include "analytics/src/include/firebase/analytics.h"
@@ -60,7 +61,9 @@ static const ::firebase::App* g_app = nullptr;
     "()Lcom/google/android/gms/tasks/Task;"),                                 \
   X(GetInstance, "getInstance", "(Landroid/content/Context;)"                 \
     "Lcom/google/firebase/analytics/FirebaseAnalytics;",                      \
-    firebase::util::kMethodTypeStatic)
+    firebase::util::kMethodTypeStatic),                                       \
+  X(SetDefaultEventParameters, "setDefaultEventParameters",                   \
+    "(Landroid/os/Bundle;)V")
 // clang-format on
 
 // clang-format off
@@ -340,8 +343,8 @@ void AddToBundle(JNIEnv* env, jobject bundle, const char* key,
 void AddToBundle(JNIEnv* env, jobject bundle, const char* key, double value) {
   jstring key_string = env->NewStringUTF(key);
   env->CallVoidMethod(bundle,
-                      util::bundle::GetMethodId(util::bundle::kPutFloat),
-                      key_string, static_cast<jfloat>(value));
+                      util::bundle::GetMethodId(util::bundle::kPutDouble),
+                      key_string, static_cast<jdouble>(value));
   util::CheckAndClearJniExceptions(env);
   env->DeleteLocalRef(key_string);
 }
@@ -518,6 +521,60 @@ void LogEvent(const char* name, const Parameter* parameters,
   });
 }
 
+// log an event and the associated parameters via a vector.
+void LogEvent(const char* name, const std::vector<Parameter>& parameters) {
+  LogEvent(name, parameters.data(), parameters.size());
+}
+
+// Set the default event parameters.
+void SetDefaultEventParameters(const Parameter* parameters,
+                               size_t number_of_parameters) {
+  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
+  JNIEnv* env = g_app->GetJNIEnv();
+
+  if (!parameters || number_of_parameters == 0) {
+    env->CallVoidMethod(
+        g_analytics_class_instance,
+        analytics::GetMethodId(analytics::kSetDefaultEventParameters), nullptr);
+    if (util::CheckAndClearJniExceptions(env)) {
+      LogError("Failed to set default event parameters");
+    }
+    return;
+  }
+
+  jobject bundle =
+      env->NewObject(util::bundle::GetClass(),
+                     util::bundle::GetMethodId(util::bundle::kConstructor));
+  if (util::CheckAndClearJniExceptions(env) || !bundle) {
+    LogError("Failed to create bundle for SetDefaultEventParameters.");
+    if (bundle) env->DeleteLocalRef(bundle);
+    return;
+  }
+
+  for (size_t i = 0; i < number_of_parameters; ++i) {
+    const Parameter& parameter = parameters[i];
+    if (!AddVariantToBundle(env, bundle, parameter.name, parameter.value)) {
+      // A Variant type that couldn't be handled was passed in.
+      LogError(
+          "SetDefaultEventParameters(%s): %s is not a valid parameter value"
+          " type. Excluded from default parameters.",
+          parameter.name, Variant::TypeName(parameter.value.type()));
+    }
+  }
+  env->CallVoidMethod(
+      g_analytics_class_instance,
+      analytics::GetMethodId(analytics::kSetDefaultEventParameters), bundle);
+  if (util::CheckAndClearJniExceptions(env)) {
+    LogError("Failed to set default event parameters");
+  }
+  env->DeleteLocalRef(bundle);
+}
+
+// Set the default event parameters
+void SetDefaultEventParameters(const std::vector<Parameter>& parameters) {
+  SetDefaultEventParameters(parameters.data(), parameters.size());
+}
+
 /// Initiates on-device conversion measurement given a user email address on iOS
 /// (no-op on Android). On iOS, requires dependency
 /// GoogleAppMeasurementOnDeviceConversion to be linked in, otherwise it is a

analytics/src/analytics_desktop.cc

@@ -318,6 +318,11 @@ void LogEvent(const char* name, const Parameter* parameters,
   // c_event_params if non-null.
 }
 
+// log an event and the associated parameters via a vector.
+void LogEvent(const char* name, const std::vector<Parameter>& parameters) {
+  LogEvent(name, parameters.data(), parameters.size());
+}
+
 // Sets a user property to the given value.
 //
 // Up to 25 user property names are supported. Once set, user property values
@@ -480,6 +485,15 @@ void LogEvent(const char* name, const char* parameter_name,
 
 // --- Stub Implementations for Unsupported Features ---
 
+void SetDefaultEventParameters(const Parameter* parameters,
+                               size_t number_of_parameters) {
+  FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
+}
+
+void SetDefaultEventParameters(const std::vector<Parameter>& parameters) {
+  SetDefaultEventParameters(parameters.data(), parameters.size());
+}
+
 void SetConsent(const std::map<ConsentType, ConsentStatus>& consent_settings) {
   FIREBASE_ASSERT_RETURN_VOID(internal::IsInitialized());
 

analytics/src/analytics_desktop_dynamic.c

@@ -140,6 +140,10 @@ static void Stub_GoogleAnalytics_LogEvent(const char* name, GoogleAnalytics_Even
     // No return value.
 }
 
+static void Stub_GoogleAnalytics_SetDefaultEventParameters(GoogleAnalytics_EventParameters* parameters, size_t number_of_parameters) {
+    // No return value.
+}
+
 // Stub for GoogleAnalytics_SetUserProperty
 static void Stub_GoogleAnalytics_SetUserProperty(const char* name,
                                                    const char* value) {
@@ -191,6 +195,7 @@ bool (*ptr_GoogleAnalytics_EventParameters_InsertItemVector)(GoogleAnalytics_Eve
 void (*ptr_GoogleAnalytics_EventParameters_Destroy)(GoogleAnalytics_EventParameters* event_parameter_map) = &Stub_GoogleAnalytics_EventParameters_Destroy;
 bool (*ptr_GoogleAnalytics_Initialize)(GoogleAnalytics_Options* options) = &Stub_GoogleAnalytics_Initialize;
 void (*ptr_GoogleAnalytics_LogEvent)(const char* name, GoogleAnalytics_EventParameters* parameters) = &Stub_GoogleAnalytics_LogEvent;
+void (*ptr_GoogleAnalytics_SetDefaultEventParameters)(GoogleAnalytics_EventParameters* parameters, size_t number_of_parameters) = &Stub_GoogleAnalytics_SetDefaultEventParameters;
 void (*ptr_GoogleAnalytics_SetUserProperty)(const char* name, const char* value) = &Stub_GoogleAnalytics_SetUserProperty;
 void (*ptr_GoogleAnalytics_SetUserId)(const char* user_id) = &Stub_GoogleAnalytics_SetUserId;
 void (*ptr_GoogleAnalytics_ResetAnalyticsData)() = &Stub_GoogleAnalytics_ResetAnalyticsData;

analytics/src/analytics_desktop_dynamic.h

@@ -206,6 +206,7 @@ extern bool (*ptr_GoogleAnalytics_EventParameters_InsertItemVector)(GoogleAnalyt
 extern void (*ptr_GoogleAnalytics_EventParameters_Destroy)(GoogleAnalytics_EventParameters* event_parameter_map);
 extern bool (*ptr_GoogleAnalytics_Initialize)(GoogleAnalytics_Options* options);
 extern void (*ptr_GoogleAnalytics_LogEvent)(const char* name, GoogleAnalytics_EventParameters* parameters);
+extern void (*ptr_GoogleAnalytics_SetDefaultEventParameters)(GoogleAnalytics_EventParameters* parameters, size_t number_of_parameters);
 extern void (*ptr_GoogleAnalytics_SetUserProperty)(const char* name, const char* value);
 extern void (*ptr_GoogleAnalytics_SetUserId)(const char* user_id);
 extern void (*ptr_GoogleAnalytics_ResetAnalyticsData)();