Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Android/firebase_dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions analytics/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
22 changes: 21 additions & 1 deletion analytics/ios_headers/FIREventNames.h
Original file line number Diff line number Diff line change
@@ -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
///
Expand Down Expand Up @@ -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:
///
Expand Down
55 changes: 54 additions & 1 deletion analytics/ios_headers/FIRParameterNames.h
Original file line number Diff line number Diff line change
@@ -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
///
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion analytics/ios_headers/FIRUserPropertyNames.h
Original file line number Diff line number Diff line change
@@ -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
///
Expand Down
2 changes: 1 addition & 1 deletion app/app_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.4.0')
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation 'com.google.firebase:firebase-analytics'
}

Expand Down
2 changes: 1 addition & 1 deletion app/google_api_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.4.0')
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.android.gms:play-services-base:18.9.0'
implementation project(':app:app_resources')
Expand Down
2 changes: 1 addition & 1 deletion app/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '15.0'
use_frameworks! :linkage => :static

target 'integration_test' do
pod 'Firebase/Analytics', '12.4.0'
pod 'Firebase/Analytics', '12.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion app_check/app_check_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.4.0')
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation 'com.google.firebase:firebase-appcheck'
}

Expand Down
20 changes: 10 additions & 10 deletions app_check/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/AppCheck', '12.4.0'
pod 'Firebase/Database', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Storage', '12.4.0'
pod 'Firebase/Functions', '12.4.0'
pod 'Firebase/AppCheck', '12.6.0'
pod 'Firebase/Database', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
pod 'Firebase/Storage', '12.6.0'
pod 'Firebase/Functions', '12.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '15.0'
pod 'Firebase/AppCheck', '12.4.0'
pod 'Firebase/Database', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Storage', '12.4.0'
pod 'Firebase/Functions', '12.4.0'
pod 'Firebase/AppCheck', '12.6.0'
pod 'Firebase/Database', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
pod 'Firebase/Storage', '12.6.0'
pod 'Firebase/Functions', '12.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.4.0')
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-auth'
implementation project(':app:app_resources')
Expand Down
4 changes: 2 additions & 2 deletions auth/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Auth', '12.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '15.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Auth', '12.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion cmake/external/firestore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ endif()
# If the format of the line below changes, then be sure to update
# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
#set(version CocoaPods-11.8.1)
set(version CocoaPods-12.4.0)
set(version CocoaPods-12.6.0)

function(GetReleasedDep)
message("Getting released firebase-ios-sdk @ ${version}")
Expand Down
2 changes: 1 addition & 1 deletion database/database_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.4.0')
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-database'
//implementation project(':app:app_resources')
Expand Down
8 changes: 4 additions & 4 deletions database/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/Database', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Database', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '15.0'
pod 'Firebase/Database', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Database', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

post_install do |installer|
Expand Down
2 changes: 1 addition & 1 deletion firestore/firestore_resources/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ android {
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:34.4.0')
implementation platform('com.google.firebase:firebase-bom:34.6.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-firestore'
}
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/Firestore', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Firestore', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '15.0'
pod 'FirebaseFirestore', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'FirebaseFirestore', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions firestore/integration_test_internal/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/Firestore', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Firestore', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '15.0'
pod 'FirebaseFirestore', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'FirebaseFirestore', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

post_install do |installer|
Expand Down
8 changes: 4 additions & 4 deletions functions/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/Functions', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Functions', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

target 'integration_test_tvos' do
platform :tvos, '15.0'
pod 'Firebase/Functions', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Functions', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
end

post_install do |installer|
Expand Down
4 changes: 2 additions & 2 deletions installations/integration_test/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use_frameworks! :linkage => :static

target 'integration_test' do
platform :ios, '15.0'
pod 'Firebase/Analytics', '12.4.0'
pod 'Firebase/Installations', '12.4.0'
pod 'Firebase/Analytics', '12.6.0'
pod 'Firebase/Installations', '12.6.0'
end

post_install do |installer|
Expand Down
24 changes: 12 additions & 12 deletions ios_pod/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ platform :ios, '15.0'
use_frameworks!

target 'GetPods' do
pod 'Firebase/Core', '12.4.0'
pod 'Firebase/Core', '12.6.0'

pod 'GoogleUserMessagingPlatform', '2.3.0'
pod 'Firebase/Analytics', '12.4.0'
pod 'Firebase/AppCheck', '12.4.0'
pod 'Firebase/Auth', '12.4.0'
pod 'Firebase/Crashlytics', '12.4.0'
pod 'Firebase/Database', '12.4.0'
pod 'Firebase/Firestore', '12.4.0'
pod 'Firebase/Functions', '12.4.0'
pod 'Firebase/Installations', '12.4.0'
pod 'Firebase/Messaging', '12.4.0'
pod 'Firebase/RemoteConfig', '12.4.0'
pod 'Firebase/Storage', '12.4.0'
pod 'Firebase/Analytics', '12.6.0'
pod 'Firebase/AppCheck', '12.6.0'
pod 'Firebase/Auth', '12.6.0'
pod 'Firebase/Crashlytics', '12.6.0'
pod 'Firebase/Database', '12.6.0'
pod 'Firebase/Firestore', '12.6.0'
pod 'Firebase/Functions', '12.6.0'
pod 'Firebase/Installations', '12.6.0'
pod 'Firebase/Messaging', '12.6.0'
pod 'Firebase/RemoteConfig', '12.6.0'
pod 'Firebase/Storage', '12.6.0'

end

Expand Down
Loading
Loading