Skip to content

Commit 4cd98b2

Browse files
tom-andersentom-andersen
authored
Merge branch 'main' into tomandersen/streamRefactor
2 parents ab073f4 + ed5ea20 commit 4cd98b2

File tree

538 files changed

+11979
-5242
lines changed

Some content is hidden

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

538 files changed

+11979
-5242
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/Gemfile.lock‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,12 @@ GEM
7979
sawyer (~> 0.8.0, >= 0.5.3)
8080
plist (3.6.0)
8181
public_suffix (4.0.6)
82-
rexml (3.3.6)
83-
strscan
82+
rexml (3.3.9)
8483
ruby-macho (2.5.1)
8584
ruby2_keywords (0.0.2)
8685
sawyer (0.8.2)
8786
addressable (>= 2.3.5)
8887
faraday (> 0.8, < 2.0)
89-
strscan (3.1.0)
9088
typhoeus (1.4.1)
9189
ethon (>= 0.9.0)
9290
tzinfo (2.0.6)

‎.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/abtesting.yml‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,25 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
26-
target: [ios, tvos, macos --skip-tests, watchos]
27-
os: [macos-14]
28-
xcode: [Xcode_15.2, Xcode_16]
25+
include:
26+
- os: macos-13
27+
xcode: Xcode_15.2
28+
target: ios
29+
- os: macos-14
30+
xcode: Xcode_15.4
31+
target: ios
32+
- os: macos-15
33+
xcode: Xcode_16
34+
target: ios
35+
- os: macos-15
36+
xcode: Xcode_16
37+
target: tvos
38+
- os: macos-15
39+
xcode: Xcode_16
40+
target: macos
41+
- os: macos-15
42+
xcode: Xcode_16
43+
target: watchos
2944
runs-on: ${{ matrix.os }}
3045
steps:
3146
- uses: actions/checkout@v4
@@ -71,9 +86,31 @@ jobs:
7186
needs: [spm-package-resolved]
7287
strategy:
7388
matrix:
74-
target: [iOS, tvOS, macOS, catalyst, watchOS]
75-
os: [macos-14]
76-
xcode: [Xcode_15.2, Xcode_16]
89+
include:
90+
- os: macos-13
91+
xcode: Xcode_15.2
92+
target: iOS
93+
- os: macos-14
94+
xcode: Xcode_15.4
95+
target: iOS
96+
- os: macos-15
97+
xcode: Xcode_16
98+
target: iOS
99+
- os: macos-15
100+
xcode: Xcode_16
101+
target: tvOS
102+
- os: macos-15
103+
xcode: Xcode_16
104+
target: macOS
105+
- os: macos-15
106+
xcode: Xcode_16
107+
target: watchOS
108+
- os: macos-15
109+
xcode: Xcode_16
110+
target: catalyst
111+
- os: macos-15
112+
xcode: Xcode_16
113+
target: visionOS
77114
runs-on: ${{ matrix.os }}
78115
steps:
79116
- uses: actions/checkout@v4

‎.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/appdistribution.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
target: [ios]
25-
os: [macos-14]
26-
xcode: [Xcode_15.2, Xcode_16]
24+
include:
25+
- os: macos-13
26+
xcode: Xcode_15.2
27+
- os: macos-14
28+
xcode: Xcode_15.4
29+
- os: macos-15
30+
xcode: Xcode_16
2731
runs-on: ${{ matrix.os }}
2832
steps:
2933
- uses: actions/checkout@v4
@@ -35,7 +39,7 @@ jobs:
3539
- name: Build and test
3640
run: |
3741
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
38-
--platforms=${{ matrix.target }}
42+
--platforms=ios
3943
4044
spm-package-resolved:
4145
env:
@@ -66,8 +70,13 @@ jobs:
6670
needs: [spm-package-resolved]
6771
strategy:
6872
matrix:
69-
os: [macos-14]
70-
xcode: [Xcode_15.2, Xcode_16]
73+
include:
74+
- os: macos-13
75+
xcode: Xcode_15.2
76+
- os: macos-14
77+
xcode: Xcode_15.4
78+
- os: macos-15
79+
xcode: Xcode_16
7180
runs-on: ${{ matrix.os }}
7281
steps:
7382
- uses: actions/checkout@v4

‎.github/workflows/auth.yml‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
matrix:
5959
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
6060
target: [ios, tvos, macos --skip-tests --allow-warnings, watchos]
61-
os: [macos-14]
62-
xcode: [Xcode_16]
61+
os: [macos-15]
62+
xcode: [Xcode_16.1]
6363
runs-on: ${{ matrix.os }}
6464
steps:
6565
- uses: actions/checkout@v4
@@ -107,9 +107,31 @@ jobs:
107107
needs: [spm-package-resolved]
108108
strategy:
109109
matrix:
110-
target: [iOS spm, tvOS spm, macOS spmbuildonly, catalyst spm, watchOS spm]
111-
os: [macos-14]
112-
xcode: [Xcode_15.2, Xcode_16]
110+
include:
111+
- os: macos-13
112+
xcode: Xcode_15.2
113+
target: iOS spm
114+
- os: macos-14
115+
xcode: Xcode_15.4
116+
target: iOS spm
117+
- os: macos-15
118+
xcode: Xcode_16.1
119+
target: iOS spm
120+
- os: macos-15
121+
xcode: Xcode_16.1
122+
target: tvOS spm
123+
- os: macos-15
124+
xcode: Xcode_16.1
125+
target: macOS spmbuildonly
126+
- os: macos-15
127+
xcode: Xcode_16.1
128+
target: watchOS spm
129+
- os: macos-15
130+
xcode: Xcode_16.1
131+
target: catalyst spm
132+
- os: macos-15
133+
xcode: Xcode_16.1
134+
target: visionOS spm
113135
runs-on: ${{ matrix.os }}
114136
steps:
115137
- uses: actions/checkout@v4
@@ -139,7 +161,7 @@ jobs:
139161
env:
140162
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
141163
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
142-
runs-on: macos-14
164+
runs-on: macos-15
143165
steps:
144166
- uses: actions/checkout@v4
145167
- uses: actions/cache/restore@v4
@@ -163,7 +185,7 @@ jobs:
163185
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
164186
FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
165187
- name: Xcode
166-
run: sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
188+
run: sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer
167189
- uses: nick-fields/retry@v3
168190
with:
169191
timeout_minutes: 120
@@ -199,7 +221,7 @@ jobs:
199221
env:
200222
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
201223
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
202-
runs-on: macos-14
224+
runs-on: macos-15
203225
steps:
204226
- uses: actions/checkout@v4
205227
- 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: 32 additions & 7 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

@@ -64,9 +67,31 @@ jobs:
6467
needs: [spm-package-resolved]
6568
strategy:
6669
matrix:
67-
target: [iOS, tvOS, macOS, catalyst, watchOS]
68-
os: [macos-14]
69-
xcode: [Xcode_15.2, Xcode_16]
70+
include:
71+
- os: macos-13
72+
xcode: Xcode_15.2
73+
target: iOS
74+
- os: macos-14
75+
xcode: Xcode_15.4
76+
target: iOS
77+
- os: macos-15
78+
xcode: Xcode_16.1
79+
target: iOS
80+
- os: macos-15
81+
xcode: Xcode_16.1
82+
target: tvOS
83+
- os: macos-15
84+
xcode: Xcode_16.1
85+
target: macOS
86+
- os: macos-15
87+
xcode: Xcode_16.1
88+
target: watchOS
89+
- os: macos-15
90+
xcode: Xcode_16.1
91+
target: catalyst
92+
- os: macos-15
93+
xcode: Xcode_16.1
94+
target: visionOS
7095
runs-on: ${{ matrix.os }}
7196
steps:
7297
- uses: actions/checkout@v4

‎.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

0 commit comments

Comments
 (0)