Skip to content

Commit 023d220

Browse files
firebase-workflow-trigger[bot]firebase-workflow-trigger[bot]
authored
Merge 423e019 into 1097939 
2 parents 1097939 + 423e019 commit 023d220

File tree

45 files changed

+208
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+208
-135
lines changed

‎Android/firebase_dependencies.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def firebaseDependenciesMap = [
3636
'remote_config' : ['com.google.firebase:firebase-config'],
3737
'storage' : ['com.google.firebase:firebase-storage'],
3838
'testlab' : [],
39-
'ump' : ['com.google.android.ump:user-messaging-platform:3.2.0']
39+
'ump' : ['com.google.android.ump:user-messaging-platform:4.0.0']
4040
]
4141

4242
// A map of library to the gradle resources that they depend upon.
@@ -149,7 +149,7 @@ project.afterEvaluate {
149149

150150
// Add the bill-of-materials
151151
project.dependencies {
152-
implementation platform('com.google.firebase:firebase-bom:34.4.0')
152+
implementation platform('com.google.firebase:firebase-bom:34.6.0')
153153
}
154154
for (String lib : firebaseCpp.dependencies.libSet) {
155155
// Generate and include the proguard file

‎analytics/integration_test/Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
55

66
target 'integration_test' do
77
platform :ios, '15.0'
8-
pod 'Firebase/Analytics', '12.4.0'
8+
pod 'Firebase/Analytics', '12.6.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '15.0'
13-
pod 'Firebase/Analytics', '12.4.0'
13+
pod 'Firebase/Analytics', '12.6.0'
1414
end
1515

1616
post_install do |installer|

‎analytics/ios_headers/FIREventNames.h‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2025 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 12.4.0.
3+
// Copied from Firebase Analytics iOS SDK 12.6.0.
44

55
/// @file FIREventNames.h
66
///
@@ -151,6 +151,26 @@ static NSString *const kFIREventEarnVirtualCurrency
151151
static NSString *const kFIREventGenerateLead NS_SWIFT_NAME(AnalyticsEventGenerateLead) =
152152
@"generate_lead";
153153

154+
/// In-App Purchase event. This event signifies that extra content or a subscription was purchased
155+
/// by a user inside an app. Note: This is different from the ecommerce purchase event. Note: If you
156+
/// supply the @c AnalyticsParameterValue parameter, you must also supply the
157+
/// @c AnalyticsParameterCurrency parameter so that revenue metrics can be computed accurately.
158+
/// Params:
159+
///
160+
/// <ul>
161+
/// <li>@c AnalyticsParameterCurrency (String)</li>
162+
/// <li>@c AnalyticsParameterFreeTrial (Int) (optional)</li>
163+
/// <li>@c AnalyticsParameterPrice (Double) (optional)</li>
164+
/// <li>@c AnalyticsParameterPriceIsDiscounted (Int) (optional)</li>
165+
/// <li>@c AnalyticsParameterProductID (String) (optional)</li>
166+
/// <li>@c AnalyticsParameterProductName (String) (optional)</li>
167+
/// <li>@c AnalyticsParameterQuantity (Int) (optional)</li>
168+
/// <li>@c AnalyticsParameterSubscription (Int) (optional)</li>
169+
/// <li>@c AnalyticsParameterValue (Double)</li>
170+
/// </ul>
171+
static NSString *const kFIREventInAppPurchase NS_SWIFT_NAME(AnalyticsEventInAppPurchase) =
172+
@"in_app_purchase";
173+
154174
/// Join Group event. Log this event when a user joins a group such as a guild, team or family. Use
155175
/// this event to analyze how popular certain groups or social features are in your app. Params:
156176
///

‎analytics/ios_headers/FIRParameterNames.h‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2025 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 12.4.0.
3+
// Copied from Firebase Analytics iOS SDK 12.6.0.
44

55
/// @file FIRParameterNames.h
66
///
@@ -248,6 +248,17 @@ static NSString *const kFIRParameterExtendSession NS_SWIFT_NAME(AnalyticsParamet
248248
static NSString *const kFIRParameterFlightNumber NS_SWIFT_NAME(AnalyticsParameterFlightNumber) =
249249
@"flight_number";
250250

251+
/// Indicates if the user is on a free trial of a subscription. Specify 1 to indicate true and 0 to
252+
/// indicate false (Int).
253+
/// <pre>
254+
/// let params = [
255+
/// AnalyticsParameterFreeTrial : 1,
256+
/// // ...
257+
/// ]
258+
/// </pre>
259+
static NSString *const kFIRParameterFreeTrial NS_SWIFT_NAME(AnalyticsParameterFreeTrial) =
260+
@"free_trial";
261+
251262
/// Group/clan/guild ID (String).
252263
/// <pre>
253264
/// let params = [
@@ -519,6 +530,37 @@ static NSString *const kFIRParameterPaymentType NS_SWIFT_NAME(AnalyticsParameter
519530
/// </pre>
520531
static NSString *const kFIRParameterPrice NS_SWIFT_NAME(AnalyticsParameterPrice) = @"price";
521532

533+
/// Indicates if an item's price is discounted. Specify 1 to indicate true and 0 to indicate false
534+
/// (Int).
535+
/// <pre>
536+
/// let params = [
537+
/// AnalyticsParameterPriceIsDiscounted : 1,
538+
/// // ...
539+
/// ]
540+
/// </pre>
541+
static NSString *const kFIRParameterPriceIsDiscounted
542+
NS_SWIFT_NAME(AnalyticsParameterPriceIsDiscounted) = @"price_is_discounted";
543+
544+
/// The ID of a product (String).
545+
/// <pre>
546+
/// let params = [
547+
/// AnalyticsParameterProductID : "PROD_12345",
548+
/// // ...
549+
/// ]
550+
/// </pre>
551+
static NSString *const kFIRParameterProductID NS_SWIFT_NAME(AnalyticsParameterProductID) =
552+
@"product_id";
553+
554+
/// The name of a product (String).
555+
/// <pre>
556+
/// let params = [
557+
/// AnalyticsParameterProductName : "My Awesome Product",
558+
/// // ...
559+
/// ]
560+
/// </pre>
561+
static NSString *const kFIRParameterProductName NS_SWIFT_NAME(AnalyticsParameterProductName) =
562+
@"product_name";
563+
522564
/// The ID of a product promotion (String).
523565
/// <pre>
524566
/// let params = [
@@ -646,6 +688,17 @@ static NSString *const kFIRParameterSourcePlatform NS_SWIFT_NAME(AnalyticsParame
646688
static NSString *const kFIRParameterStartDate NS_SWIFT_NAME(AnalyticsParameterStartDate) =
647689
@"start_date";
648690

691+
/// Indicates if the purchase is a subscription. Specify 1 to indicate true and 0 to indicate false
692+
/// (Int).
693+
/// <pre>
694+
/// let params = [
695+
/// AnalyticsParameterSubscription : 1,
696+
/// // ...
697+
/// ]
698+
/// </pre>
699+
static NSString *const kFIRParameterSubscription NS_SWIFT_NAME(AnalyticsParameterSubscription) =
700+
@"subscription";
701+
649702
/// The result of an operation. Specify 1 to indicate success and 0 to indicate failure (Int).
650703
/// <pre>
651704
/// let params = [

‎analytics/ios_headers/FIRUserPropertyNames.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2025 Google LLC
22

3-
// Copied from Firebase Analytics iOS SDK 12.4.0.
3+
// Copied from Firebase Analytics iOS SDK 12.6.0.
44

55
/// @file FIRUserPropertyNames.h
66
///

‎app/app_resources/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ android {
5656
}
5757

5858
dependencies {
59-
implementation platform('com.google.firebase:firebase-bom:34.4.0')
59+
implementation platform('com.google.firebase:firebase-bom:34.6.0')
6060
implementation 'com.google.firebase:firebase-analytics'
6161
}
6262

‎app/google_api_resources/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ android {
5959
}
6060

6161
dependencies {
62-
implementation platform('com.google.firebase:firebase-bom:34.4.0')
62+
implementation platform('com.google.firebase:firebase-bom:34.6.0')
6363
implementation 'com.google.firebase:firebase-analytics'
6464
implementation 'com.google.android.gms:play-services-base:18.9.0'
6565
implementation project(':app:app_resources')

‎app/integration_test/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ platform :ios, '15.0'
44
use_frameworks! :linkage => :static
55

66
target 'integration_test' do
7-
pod 'Firebase/Analytics', '12.4.0'
7+
pod 'Firebase/Analytics', '12.6.0'
88
end
99

1010
post_install do |installer|

‎app_check/app_check_resources/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ android {
5555
}
5656

5757
dependencies {
58-
implementation platform('com.google.firebase:firebase-bom:34.4.0')
58+
implementation platform('com.google.firebase:firebase-bom:34.6.0')
5959
implementation 'com.google.firebase:firebase-appcheck'
6060
}
6161

‎app_check/integration_test/Podfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ use_frameworks! :linkage => :static
44

55
target 'integration_test' do
66
platform :ios, '15.0'
7-
pod 'Firebase/AppCheck', '12.4.0'
8-
pod 'Firebase/Database', '12.4.0'
9-
pod 'Firebase/Auth', '12.4.0'
10-
pod 'Firebase/Storage', '12.4.0'
11-
pod 'Firebase/Functions', '12.4.0'
7+
pod 'Firebase/AppCheck', '12.6.0'
8+
pod 'Firebase/Database', '12.6.0'
9+
pod 'Firebase/Auth', '12.6.0'
10+
pod 'Firebase/Storage', '12.6.0'
11+
pod 'Firebase/Functions', '12.6.0'
1212
end
1313

1414
target 'integration_test_tvos' do
1515
platform :tvos, '15.0'
16-
pod 'Firebase/AppCheck', '12.4.0'
17-
pod 'Firebase/Database', '12.4.0'
18-
pod 'Firebase/Auth', '12.4.0'
19-
pod 'Firebase/Storage', '12.4.0'
20-
pod 'Firebase/Functions', '12.4.0'
16+
pod 'Firebase/AppCheck', '12.6.0'
17+
pod 'Firebase/Database', '12.6.0'
18+
pod 'Firebase/Auth', '12.6.0'
19+
pod 'Firebase/Storage', '12.6.0'
20+
pod 'Firebase/Functions', '12.6.0'
2121
end
2222

2323
post_install do |installer|

0 commit comments

Comments
 (0)