Skip to content

Commit b839e62

Browse files
committed
Merge branch 'main' into nc/followup-async
2 parents 2dda025 + 380a861 commit b839e62

File tree

250 files changed

+2637
-1124
lines changed

Some content is hidden

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

250 files changed

+2637
-1124
lines changed

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ body:
5454
- Authentication
5555
- Crashlytics
5656
- Database
57+
- Data Connect
5758
- DynamicLinks
5859
- Firestore
5960
- Functions

.github/actions/notices_generation/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ runs:
4040
fi
4141
shell: bash
4242
- name: Upload artifacts
43-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
4444
with:
4545
name: notices
4646
path: ${{ inputs.notices-path }}

.github/workflows/api_diff_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup python
3737
uses: actions/setup-python@v5
3838
with:
39-
python-version: '3.10'
39+
python-version: '3.11'
4040

4141
- name: Install Prerequisites
4242
run: ~/api_diff_report/prerequisite.sh

.github/workflows/auth.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
env:
222222
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
223223
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
224-
runs-on: macos-14
224+
runs-on: macos-15
225225
steps:
226226
- uses: actions/checkout@v4
227227
- uses: ruby/setup-ruby@v1

.github/workflows/cocoapods-integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
tests:
1919
# Don't run on private repo unless it is a PR.
2020
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
21+
|| github.event_name == 'workflow_dispatch'
2122

2223
runs-on: macos-14
2324
steps:

.github/workflows/core.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,19 @@ jobs:
2222
matrix:
2323
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
2424
target: [ios, tvos, macos --skip-tests, watchos]
25-
os: [macos-14]
26-
xcode: [Xcode_15.2, Xcode_16]
27-
runs-on: ${{ matrix.os }}
25+
build-env:
26+
- os: macos-14
27+
xcode: Xcode_15.2
28+
- os: macos-15
29+
xcode: Xcode_16.1
30+
runs-on: ${{ matrix.build-env.os }}
2831
steps:
2932
- uses: actions/checkout@v4
3033
- uses: ruby/setup-ruby@v1
3134
- name: Setup Bundler
3235
run: scripts/setup_bundler.sh
3336
- name: Xcode
34-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
37+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3538
- name: Build and test
3639
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=${{ matrix.target }}
3740

@@ -72,22 +75,22 @@ jobs:
7275
xcode: Xcode_15.4
7376
target: iOS
7477
- os: macos-15
75-
xcode: Xcode_16
78+
xcode: Xcode_16.1
7679
target: iOS
7780
- os: macos-15
78-
xcode: Xcode_16
81+
xcode: Xcode_16.1
7982
target: tvOS
8083
- os: macos-15
81-
xcode: Xcode_16
84+
xcode: Xcode_16.1
8285
target: macOS
8386
- os: macos-15
84-
xcode: Xcode_16
87+
xcode: Xcode_16.1
8588
target: watchOS
8689
- os: macos-15
87-
xcode: Xcode_16
90+
xcode: Xcode_16.1
8891
target: catalyst
8992
- os: macos-15
90-
xcode: Xcode_16
93+
xcode: Xcode_16.1
9194
target: visionOS
9295
runs-on: ${{ matrix.os }}
9396
steps:

.github/workflows/core_extension.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ jobs:
2020
strategy:
2121
matrix:
2222
target: [ios, tvos, macos, watchos]
23-
os: [macos-14]
24-
xcode: [Xcode_15.2, Xcode_16]
25-
runs-on: ${{ matrix.os }}
23+
build-env:
24+
- os: macos-14
25+
xcode: Xcode_15.2
26+
- os: macos-15
27+
xcode: Xcode_16.1
28+
runs-on: ${{ matrix.build-env.os }}
2629
steps:
2730
- uses: actions/checkout@v4
2831
- uses: ruby/setup-ruby@v1
2932
- name: Setup Bundler
3033
run: scripts/setup_bundler.sh
3134
- name: Xcode
32-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
35+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3336
- name: Build and test
3437
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreExtension.podspec --platforms=${{ matrix.target }}
3538

.github/workflows/core_internal.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,19 @@ jobs:
1818
strategy:
1919
matrix:
2020
target: [ios, tvos, macos, watchos]
21-
os: [macos-14]
22-
xcode: [Xcode_15.2, Xcode_16]
23-
runs-on: ${{ matrix.os }}
21+
build-env:
22+
- os: macos-14
23+
xcode: Xcode_15.2
24+
- os: macos-15
25+
xcode: Xcode_16.1
26+
runs-on: ${{ matrix.build-env.os }}
2427
steps:
2528
- uses: actions/checkout@v4
2629
- uses: ruby/setup-ruby@v1
2730
- name: Setup Bundler
2831
run: scripts/setup_bundler.sh
2932
- name: Xcode
30-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
33+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3134
- name: Build and test
3235
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }}
3336

@@ -68,22 +71,22 @@ jobs:
6871
xcode: Xcode_15.4
6972
target: iOS
7073
- os: macos-15
71-
xcode: Xcode_16
74+
xcode: Xcode_16.1
7275
target: iOS
7376
- os: macos-15
74-
xcode: Xcode_16
77+
xcode: Xcode_16.1
7578
target: tvOS
7679
- os: macos-15
77-
xcode: Xcode_16
80+
xcode: Xcode_16.1
7881
target: macOS
7982
- os: macos-15
80-
xcode: Xcode_16
83+
xcode: Xcode_16.1
8184
target: watchOS
8285
- os: macos-15
83-
xcode: Xcode_16
86+
xcode: Xcode_16.1
8487
target: catalyst
8588
- os: macos-15
86-
xcode: Xcode_16
89+
xcode: Xcode_16.1
8790
target: visionOS
8891
runs-on: ${{ matrix.os }}
8992
steps:

.github/workflows/crashlytics.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,23 @@ jobs:
2525
strategy:
2626
matrix:
2727
target: [ios, tvos, macos, watchos --skip-tests]
28-
os: [macos-14]
2928
flags: [
3029
'--use-modular-headers --skip-tests',
3130
''
3231
]
33-
xcode: [Xcode_15.2, Xcode_16]
34-
runs-on: ${{ matrix.os }}
32+
build-env:
33+
- os: macos-14
34+
xcode: Xcode_15.2
35+
- os: macos-15
36+
xcode: Xcode_16.1
37+
runs-on: ${{ matrix.build-env.os }}
3538
steps:
3639
- uses: actions/checkout@v4
3740
- uses: ruby/setup-ruby@v1
3841
- name: Setup Bundler
3942
run: scripts/setup_bundler.sh
4043
- name: Xcode
41-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
44+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
4245
- uses: nick-fields/retry@v3
4346
with:
4447
timeout_minutes: 120
@@ -85,22 +88,22 @@ jobs:
8588
xcode: Xcode_15.4
8689
target: iOS
8790
- os: macos-15
88-
xcode: Xcode_16
91+
xcode: Xcode_16.1
8992
target: iOS
9093
- os: macos-15
91-
xcode: Xcode_16
94+
xcode: Xcode_16.1
9295
target: tvOS
9396
- os: macos-15
94-
xcode: Xcode_16
97+
xcode: Xcode_16.1
9598
target: macOS
9699
- os: macos-15
97-
xcode: Xcode_16
100+
xcode: Xcode_16.1
98101
target: watchOS
99102
- os: macos-15
100-
xcode: Xcode_16
103+
xcode: Xcode_16.1
101104
target: catalyst
102105
- os: macos-15
103-
xcode: Xcode_16
106+
xcode: Xcode_16.1
104107
target: visionOS
105108
runs-on: ${{ matrix.os }}
106109
steps:
@@ -149,7 +152,7 @@ jobs:
149152
env:
150153
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
151154
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
152-
runs-on: macos-14
155+
runs-on: macos-15
153156
steps:
154157
- uses: actions/checkout@v4
155158
- uses: ruby/setup-ruby@v1

.github/workflows/database.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ jobs:
2626
strategy:
2727
matrix:
2828
target: [ios, tvos, macos --skip-tests, watchos]
29-
os: [macos-14]
30-
xcode: [Xcode_15.2, Xcode_16]
31-
runs-on: ${{ matrix.os }}
29+
build-env:
30+
- os: macos-14
31+
xcode: Xcode_15.2
32+
- os: macos-15
33+
xcode: Xcode_16.1
34+
runs-on: ${{ matrix.build-env.os }}
3235
steps:
3336
- uses: actions/checkout@v4
3437
- uses: ruby/setup-ruby@v1
3538
- name: Setup Bundler
3639
run: scripts/setup_bundler.sh
3740
- name: Xcode
38-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
41+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
3942
- name: Build and test
4043
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --test-specs=unit --platforms=${{ matrix.target }}
4144

@@ -96,22 +99,22 @@ jobs:
9699
xcode: Xcode_15.4
97100
target: iOS
98101
- os: macos-15
99-
xcode: Xcode_16
102+
xcode: Xcode_16.1
100103
target: iOS
101104
- os: macos-15
102-
xcode: Xcode_16
105+
xcode: Xcode_16.1
103106
target: tvOS
104107
- os: macos-15
105-
xcode: Xcode_16
108+
xcode: Xcode_16.1
106109
target: macOS
107110
- os: macos-15
108-
xcode: Xcode_16
111+
xcode: Xcode_16.1
109112
target: watchOS
110113
- os: macos-15
111-
xcode: Xcode_16
114+
xcode: Xcode_16.1
112115
target: catalyst
113116
- os: macos-15
114-
xcode: Xcode_16
117+
xcode: Xcode_16.1
115118
target: visionOS
116119
runs-on: ${{ matrix.os }}
117120
steps:

0 commit comments

Comments
 (0)