Skip to content

Commit 96959eb

Browse files
committed
Merge branch 'main' into update-ubuntu-runners
2 parents cabc9c2 + 3116ed0 commit 96959eb

File tree

49 files changed

+187
-169
lines changed

Some content is hidden

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

49 files changed

+187
-169
lines changed

.github/workflows/desktop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
LANG: en_US
224224
run: |
225225
cd build
226-
ctest --repeat until-pass:3 --output-on-failure
226+
ctest --repeat until-pass:3 --output-on-failure -E firestore_util_test
227227
228228
- name: Run unit tests (linux)
229229
# Linux exists as its own standalone execution step in order to invoke

.github/workflows/update-dependencies.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ on:
2121
description: 'optional comment to add to PR'
2222
default: ''
2323

24+
permissions: write-all
25+
2426
env:
2527
branchPrefix: "workflow/auto-update-deps-"
2628
triggerTestsLabel: "tests-requested: quick"

Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ project.afterEvaluate {
159159

160160
// Add the bill-of-materials
161161
project.dependencies {
162-
implementation platform('com.google.firebase:firebase-bom:33.9.0')
162+
implementation platform('com.google.firebase:firebase-bom:33.10.0')
163163
}
164164
for (String lib : firebaseCpp.dependencies.libSet) {
165165
// 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, '13.0'
8-
pod 'Firebase/Analytics', '11.8.1'
8+
pod 'Firebase/Analytics', '11.9.0'
99
end
1010

1111
target 'integration_test_tvos' do
1212
platform :tvos, '13.0'
13-
pod 'Firebase/Analytics', '11.8.1'
13+
pod 'Firebase/Analytics', '11.9.0'
1414
end
1515

1616
post_install do |installer|

analytics/ios_headers/FIREventNames.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 11.8.1.
3+
// Copied from Firebase Analytics iOS SDK 11.9.0.
44

55
/// @file FIREventNames.h
66
///

analytics/ios_headers/FIRParameterNames.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 11.8.1.
3+
// Copied from Firebase Analytics iOS SDK 11.9.0.
44

55
/// @file FIRParameterNames.h
66
///

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 11.8.1.
3+
// Copied from Firebase Analytics iOS SDK 11.9.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:33.9.0')
59+
implementation platform('com.google.firebase:firebase-bom:33.10.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:33.9.0')
62+
implementation platform('com.google.firebase:firebase-bom:33.10.0')
6363
implementation 'com.google.firebase:firebase-analytics'
6464
implementation 'com.google.android.gms:play-services-base:18.5.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, '13.0'
44
use_frameworks! :linkage => :static
55

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

1010
post_install do |installer|

0 commit comments

Comments
 (0)