Skip to content

Commit b8dcd16

Browse files
committed
Merge branch 'main' into app_check_debug_tokens_resolve_comments
2 parents 54e7970 + 75d315e commit b8dcd16

File tree

972 files changed

+38289
-20263
lines changed

Some content is hidden

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

972 files changed

+38289
-20263
lines changed

.github/ISSUE_TEMPLATE/---feature-request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
name: "🚀Feature Request"
2+
name: "🚀 Feature Request"
33
about: Make a feature request for FlutterFire.
4-
title: "\U0001F41B [PLUGIN_NAME_HERE] Your feature request title here"
4+
title: "\U0001F680 [PLUGIN_NAME_HERE] Your feature request title here"
55
labels: 'Needs Attention, type: enhancement'
66
assignees: ''
77

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ body:
101101
attributes:
102102
value: |
103103
---
104+
105+
- type: markdown
106+
attributes:
107+
value: |
108+
> **ℹ️ Please remove any API keys or other sensitive credentials from your bug report before submitting.**
104109
105110
- type: textarea
106111
attributes:

.github/workflows/all_plugins.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
27-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
27+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
2828
with:
2929
channel: 'stable'
3030
cache: true
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
45-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
45+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
4646
with:
4747
channel: 'stable'
4848
cache: true
@@ -59,7 +59,7 @@ jobs:
5959
runs-on: ubuntu-latest
6060
steps:
6161
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
62-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
62+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
6363
with:
6464
channel: 'stable'
6565
cache: true
@@ -77,7 +77,7 @@ jobs:
7777
timeout-minutes: 20
7878
steps:
7979
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
80-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
80+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
8181
with:
8282
channel: 'stable'
8383
cache: true
@@ -111,7 +111,7 @@ jobs:
111111
runs-on: ubuntu-latest
112112
steps:
113113
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
114-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
114+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
115115
with:
116116
channel: 'stable'
117117
cache: true
@@ -123,16 +123,18 @@ jobs:
123123
melos exec -c 1 --scope="*example*" --dir-exists="web" -- \
124124
"flutter build web"
125125
swift-integration:
126-
runs-on: macos-latest
127-
timeout-minutes: 30
126+
runs-on: macos-15
127+
timeout-minutes: 45
128128
env:
129-
FLUTTER_DEPENDENCIES: "cloud_firestore firebase_remote_config cloud_functions firebase_database firebase_auth firebase_storage firebase_analytics firebase_messaging firebase_app_check firebase_in_app_messaging firebase_performance firebase_dynamic_links firebase_crashlytics firebase_ml_model_downloader firebase_app_installations"
129+
FLUTTER_DEPENDENCIES: "cloud_firestore firebase_remote_config cloud_functions firebase_database firebase_auth firebase_storage firebase_analytics firebase_messaging firebase_app_check firebase_in_app_messaging firebase_performance firebase_crashlytics firebase_ml_model_downloader firebase_app_installations"
130+
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
130131
steps:
131132
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
132-
- uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
133+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
133134
with:
134-
# TODO - enabling swift is on `master` channel at the moment. Update when it's on `stable`
135-
channel: 'master'
135+
channel: 'stable'
136+
- name: Xcode
137+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
136138
- name: Setup firebase_core example app to test Swift integration
137139
# run this before running melos boostrap to ensure the example app is set up
138140
run: |
@@ -152,7 +154,7 @@ jobs:
152154
timeout-minutes: 30
153155
steps:
154156
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
155-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
157+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
156158
with:
157159
channel: 'stable'
158160
cache: true
@@ -169,7 +171,7 @@ jobs:
169171
timeout-minutes: 30
170172
steps:
171173
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
172-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32
174+
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
173175
with:
174176
go-version: '^1.13.1'
175177
# Go is used by addlicense command (addlicense is used in melos run

.github/workflows/android.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
['tests', 'packages/cloud_firestore/cloud_firestore/example']
3636
steps:
3737
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
38-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
38+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
3939
name: Install Node.js 20
4040
with:
4141
node-version: '20'
@@ -44,12 +44,12 @@ jobs:
4444
distribution: 'temurin'
4545
java-version: '17'
4646
- name: Firebase Emulator Cache
47-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
47+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
4848
with:
4949
path: ~/.cache/firebase/emulators
5050
key: firebase-emulators-v3-${{ runner.os }}
5151
restore-keys: firebase-emulators-v3
52-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
52+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
5353
with:
5454
channel: 'stable'
5555
cache: true
@@ -74,7 +74,7 @@ jobs:
7474
- name: Gradle cache
7575
uses: gradle/actions/setup-gradle@v4
7676
- name: AVD cache
77-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
77+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
7878
id: avd-cache
7979
with:
8080
path: |
@@ -89,7 +89,7 @@ jobs:
8989
arch: x86_64
9090
working-directory: ${{ matrix.working_directory }}
9191
script: |
92-
flutter test integration_test/e2e_test.dart --dart-define=CI=true -d emulator-5554
92+
flutter test integration_test/e2e_test.dart --ignore-timeouts --dart-define=CI=true -d emulator-5554
9393
- name: Ensure Appium is shut down
9494
# Required because of below issue where emulator failing to shut down properly causes tests to fail
9595
# https://github.com/ReactiveCircus/android-emulator-runner/issues/385

.github/workflows/e2e_tests_fdc.yaml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
steps:
3131
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
32-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
32+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
3333
name: Install Node.js 20
3434
with:
3535
node-version: '20'
@@ -38,12 +38,12 @@ jobs:
3838
distribution: 'temurin'
3939
java-version: '17'
4040
- name: Firebase Emulator Cache
41-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
41+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
4242
with:
4343
path: ~/.cache/firebase/emulators
4444
key: firebase-emulators-v3-fdc-${{ runner.os }}
4545
restore-keys: firebase-emulators-v3
46-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
46+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
4747
with:
4848
channel: 'stable'
4949
cache: true
@@ -60,7 +60,7 @@ jobs:
6060
sudo npm i -g firebase-tools
6161
- name: Start Firebase Emulator
6262
run: |
63-
cd ./packages/firebase_data_connect/firebase_data_connect/example
63+
cd ./packages/firebase_data_connect/firebase_data_connect/example
6464
unset PGSERVICEFILE
6565
firebase experiments:enable dataconnect
6666
./start-firebase-emulator.sh
@@ -72,13 +72,13 @@ jobs:
7272
- name: Gradle cache
7373
uses: gradle/actions/setup-gradle@v4
7474
- name: AVD cache
75-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
75+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
7676
id: avd-cache
7777
with:
7878
path: |
7979
~/.android/avd/*
8080
~/.android/adb*
81-
key: avd-${{ runner.os }}
81+
key: avd-${{ runner.os }}
8282
- name: Start AVD then run E2E tests
8383
uses: reactivecircus/android-emulator-runner@v2
8484
with:
@@ -90,41 +90,43 @@ jobs:
9090
flutter test integration_test/e2e_test.dart --dart-define=CI=true -d emulator-5554
9191
9292
ios:
93-
runs-on: macos-14
93+
runs-on: macos-15
9494
timeout-minutes: 45
9595
strategy:
9696
fail-fast: false
9797
steps:
9898
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
99-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
99+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
100100
name: Install Node.js 20
101101
with:
102102
node-version: '20'
103+
- name: Xcode
104+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
103105
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
104106
with:
105107
distribution: 'temurin'
106108
java-version: '17'
107109
- name: Setup PostgreSQL for Linux/macOS/Windows
108-
uses: ikalnytskyi/action-setup-postgres@v7
110+
uses: ikalnytskyi/action-setup-postgres@v7
109111
- uses: hendrikmuhs/ccache-action@c92f40bee50034e84c763e33b317c77adaa81c92
110112
name: Xcode Compile Cache
111113
with:
112-
key: xcode-cache-${{ runner.os }}
114+
key: xcode-cache-${{ runner.os }}
113115
max-size: 700M
114-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
116+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
115117
name: Pods Cache
116118
id: pods-cache
117119
with:
118120
path: tests/ios/Pods
119121
key: ${{ runner.os }}-fdc-pods-v3-${{ hashFiles('tests/ios/Podfile.lock') }}
120122
restore-keys: ${{ runner.os }}-ios-pods-v2
121123
- name: Firebase Emulator Cache
122-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
124+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
123125
with:
124126
path: ~/.cache/firebase/emulators
125127
key: firebase-emulators-v3-fdc-${{ runner.os }}
126128
restore-keys: firebase-emulators-v3
127-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
129+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
128130
with:
129131
channel: 'stable'
130132
cache: true
@@ -151,7 +153,7 @@ jobs:
151153
- name: Start Firebase Emulator
152154
run: |
153155
sudo chown -R 501:20 "/Users/runner/.npm"
154-
cd ./packages/firebase_data_connect/firebase_data_connect/example
156+
cd ./packages/firebase_data_connect/firebase_data_connect/example
155157
unset PGSERVICEFILE
156158
firebase experiments:enable dataconnect
157159
./start-firebase-emulator.sh
@@ -160,7 +162,7 @@ jobs:
160162
run: |
161163
# Boot simulator and wait for System app to be ready.
162164
# List of available simulators: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#installed-simulators
163-
SIMULATOR="iPhone 15"
165+
SIMULATOR="iPhone 16"
164166
xcrun simctl bootstatus "$SIMULATOR" -b
165167
xcrun simctl logverbose "$SIMULATOR" enable
166168
# Sleep to allow simulator to settle.
@@ -176,7 +178,7 @@ jobs:
176178
fail-fast: false
177179
steps:
178180
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
179-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
181+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
180182
name: Install Node.js 20
181183
with:
182184
node-version: '20'
@@ -186,7 +188,7 @@ jobs:
186188
java-version: '17'
187189
- name: Setup PostgreSQL for Linux/macOS/Windows
188190
uses: ikalnytskyi/action-setup-postgres@v7
189-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
191+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
190192
with:
191193
channel: 'stable'
192194
cache: true
@@ -199,15 +201,15 @@ jobs:
199201
- name: 'Install Tools'
200202
run: sudo npm i -g firebase-tools
201203
- name: Cache Firebase Emulator
202-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
204+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
203205
with:
204206
path: ~/.cache/firebase/emulators
205207
key: firebase-emulators-v3-fdc-${{ runner.os }}
206208
restore-keys: firebase-emulators-v3
207209
- name: Start Firebase Emulator
208210
run: |
209211
sudo chown -R 501:20 "/Users/runner/.npm"
210-
cd ./packages/firebase_data_connect/firebase_data_connect/example
212+
cd ./packages/firebase_data_connect/firebase_data_connect/example
211213
unset PGSERVICEFILE
212214
firebase experiments:enable dataconnect
213215
./start-firebase-emulator.sh

.github/workflows/ios.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,21 @@ on:
2626

2727
jobs:
2828
ios:
29-
runs-on: macos-14
30-
timeout-minutes: 45
29+
runs-on: macos-15
30+
timeout-minutes: 60
3131
strategy:
3232
fail-fast: false
3333
matrix:
3434
working_directory:
3535
['tests', 'packages/cloud_firestore/cloud_firestore/example']
3636
steps:
3737
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
38-
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
38+
- uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
3939
name: Install Node.js 20
4040
with:
4141
node-version: '20'
42+
- name: Xcode
43+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
4244
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
4345
with:
4446
distribution: 'temurin'
@@ -48,20 +50,20 @@ jobs:
4850
with:
4951
key: xcode-cache-${{ runner.os }}
5052
max-size: 700M
51-
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
53+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
5254
name: Pods Cache
5355
id: pods-cache
5456
with:
5557
path: tests/ios/Pods
5658
key: pods-v3-${{ runner.os }}-${{ hashFiles('tests/ios/Podfile.lock') }}
5759
restore-keys: pods-v3-${{ runner.os }}
5860
- name: Firebase Emulator Cache
59-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
61+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57
6062
with:
6163
path: ~/.cache/firebase/emulators
6264
key: firebase-emulators-v3-${{ runner.os }}
6365
restore-keys: firebase-emulators-v3
64-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
66+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
6567
with:
6668
channel: 'stable'
6769
cache: true
@@ -103,16 +105,16 @@ jobs:
103105
ccache -s
104106
- name: Start Firebase Emulator
105107
run: sudo chown -R 501:20 "/Users/runner/.npm" && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh
106-
- uses: futureware-tech/simulator-action@bde6805eedaeaba7775a9959970edc7d8bf10c4d
108+
- uses: futureware-tech/simulator-action@9150831bad21ed25e472017a746f49ccbd0e674a
107109
id: simulator
108110
with:
109111
# List of available simulators: https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md#installed-simulators
110-
model: "iPhone 15"
112+
model: "iPhone 16"
111113
- name: 'E2E Tests'
112114
working-directory: ${{ matrix.working_directory }}
113115
env:
114116
SIMULATOR: ${{ steps.simulator.outputs.udid }}
115117
run: |
116118
# Uncomment following line to have simulator logs printed out for debugging purposes.
117119
# xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' &
118-
flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true
120+
flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --ignore-timeouts --dart-define=CI=true

0 commit comments

Comments
 (0)