Skip to content

Commit d41e30a

Browse files
authored
chore: move from master to main (#13127)
1 parent 04d2bf3 commit d41e30a

File tree

84 files changed

+165
-165
lines changed

Some content is hidden

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

84 files changed

+165
-165
lines changed

.github/ISSUE_TEMPLATE/ios_background_message_handling.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ body:
124124
attributes:
125125
label: Are you sending messages to your app from the Firebase Admin SDK?
126126
description: |
127-
For an example of sending messages to your app, please see [FlutterFire's nodejs Firebase Admin SDK script](https://github.com/firebase/flutterfire/blob/master/packages/firebase_messaging/firebase_messaging/example/scripts/send-message.js). FlutterFire does not support sending messages from 3rd party packages.
127+
For an example of sending messages to your app, please see [FlutterFire's nodejs Firebase Admin SDK script](https://github.com/firebase/flutterfire/blob/main/packages/firebase_messaging/firebase_messaging/example/scripts/send-message.js). FlutterFire does not support sending messages from 3rd party packages.
128128
129129
It is essential you include the `contentAvailable` flag in your message payload when sending messages to your app from the Firebase Admin SDK.
130130
@@ -201,8 +201,8 @@ body:
201201
5. Now send the message to your device
202202
6. Select all the rows on the logs & copy them, Cmd + C (not available on right-click menu)
203203
204-
[Example of successfully delivered data-only background message](https://github.com/firebase/flutterfire/blob/master/.github/images/ios-background-message-delivered.png)
205-
[Example of unsuccessfully delivered data-only background message](https://github.com/firebase/flutterfire/blob/master/.github/images/ios-background-message-not-delivered.png)
204+
[Example of successfully delivered data-only background message](https://github.com/firebase/flutterfire/blob/main/.github/images/ios-background-message-delivered.png)
205+
[Example of unsuccessfully delivered data-only background message](https://github.com/firebase/flutterfire/blob/main/.github/images/ios-background-message-not-delivered.png)
206206
207207
REQUIRED: Please paste your logs from the above steps in the text area so we can see if a message was delivered but not received by the background message handler.
208208
validations:

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Does your PR require plugin users to manually update their apps to accommodate y
2929

3030
<!-- Links -->
3131
[issue database]: https://github.com/flutter/flutter/issues
32-
[Contributor Guide]: https://github.com/firebase/flutterfire/blob/master/CONTRIBUTING.md
32+
[Contributor Guide]: https://github.com/firebase/flutterfire/blob/main/CONTRIBUTING.md
3333
[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
3434
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning
3535
[CLA]: https://cla.developers.google.com/

.github/workflows/all_plugins.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- '**.md'
1313
push:
1414
branches:
15-
- master
15+
- main
1616
paths-ignore:
1717
- 'docs/**'
1818
- 'website/**'

.github/workflows/e2e_tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- '**.md'
1515
push:
1616
branches:
17-
- master
17+
- main
1818
paths-ignore:
1919
- 'docs/**'
2020
- 'website/**'

.github/workflows/ossf-scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
schedule:
1313
- cron: '24 5 * * 5'
1414
push:
15-
branches: [ "master" ]
15+
branches: [ "main" ]
1616

1717
# Declare default permissions as read only.
1818
permissions: read-all

CHANGELOG.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6-
## 2024-07-30 - [BoM 2.4.0](https://github.com/firebase/flutterfire/blob/master/VERSIONS.md#flutter-bom-240-2024-07-30)
6+
## 2024-07-30 - [BoM 2.4.0](https://github.com/firebase/flutterfire/blob/main/VERSIONS.md#flutter-bom-240-2024-07-30)
77

88
### Changes
99

@@ -148,7 +148,7 @@ Packages with dependency updates only:
148148
- **DOCS**(messaging,android): update inline documentation on behavior ([#12948](https://github.com/firebase/flutterfire/issues/12948)). ([8d7e2217](https://github.com/firebase/flutterfire/commit/8d7e2217446618b93c064933ef0bf2506c219275))
149149

150150

151-
## 2024-07-09 - [BoM 2.3.0](https://github.com/firebase/flutterfire/blob/master/VERSIONS.md#flutter-bom-230-2024-07-09)
151+
## 2024-07-09 - [BoM 2.3.0](https://github.com/firebase/flutterfire/blob/main/VERSIONS.md#flutter-bom-230-2024-07-09)
152152

153153
### Changes
154154

@@ -302,7 +302,7 @@ Packages with dependency updates only:
302302
- **FIX**(storage,web): ensure exact same streams are not unsubscribed ([#13034](https://github.com/firebase/flutterfire/issues/13034)). ([20d00023](https://github.com/firebase/flutterfire/commit/20d000234072ece9def6c91bf4dfec57091ea8db))
303303

304304

305-
## 2024-06-25 - [BoM 2.2.0](https://github.com/firebase/flutterfire/blob/master/VERSIONS.md#flutter-bom-220-2024-06-25)
305+
## 2024-06-25 - [BoM 2.2.0](https://github.com/firebase/flutterfire/blob/main/VERSIONS.md#flutter-bom-220-2024-06-25)
306306

307307
### Changes
308308

@@ -431,7 +431,7 @@ Packages with dependency updates only:
431431
- **FEAT**(storage,windows): add support for creationTime and updateTime ([#12966](https://github.com/firebase/flutterfire/issues/12966)). ([70a3fbc9](https://github.com/firebase/flutterfire/commit/70a3fbc97ec34c811616e92333aae299dd2ef569))
432432

433433

434-
## 2024-06-11 - [BoM 2.1.0](https://github.com/firebase/flutterfire/blob/master/VERSIONS.md#flutter-bom-210-2024-06-11)
434+
## 2024-06-11 - [BoM 2.1.0](https://github.com/firebase/flutterfire/blob/main/VERSIONS.md#flutter-bom-210-2024-06-11)
435435

436436
### Changes
437437

@@ -609,7 +609,7 @@ Packages with other changes:
609609
- **FIX**(vertexai): fix the countTokens brokage ([#12899](https://github.com/firebase/flutterfire/issues/12899)). ([e946eb9b](https://github.com/firebase/flutterfire/commit/e946eb9b429da16bea617b68dda32f23d0deb5bc))
610610

611611

612-
## 2024-06-04 - [BoM 2.0.0](https://github.com/firebase/flutterfire/blob/master/VERSIONS.md#flutter-bom-200-2024-06-04)
612+
## 2024-06-04 - [BoM 2.0.0](https://github.com/firebase/flutterfire/blob/main/VERSIONS.md#flutter-bom-200-2024-06-04)
613613

614614
### Changes
615615

@@ -827,7 +827,7 @@ Packages with dependency updates only:
827827
- **FIX**(web): fix some casting issue on Web JS Interop ([#12852](https://github.com/firebase/flutterfire/issues/12852)). ([4b56df1c](https://github.com/firebase/flutterfire/commit/4b56df1cc187d77ef22a82688a37f1c7aba4ed40))
828828

829829

830-
## 2024-05-28 - [BoM 1.1.0](https://github.com/firebase/flutterfire/blob/master/VERSIONS.md#flutter-bom-110-2024-05-28)
830+
## 2024-05-28 - [BoM 1.1.0](https://github.com/firebase/flutterfire/blob/main/VERSIONS.md#flutter-bom-110-2024-05-28)
831831

832832
### Changes
833833

CONTRIBUTING.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ _See also: [Flutter's code of conduct](https://flutter.io/design-principles/#cod
2828
to generate an SSH key.
2929
- `git clone [email protected]:<your_name_here>/flutterfire.git`
3030
- `git remote add upstream [email protected]:firebase/flutterfire.git` (So that you
31-
fetch from the master repository, not your clone, when running `git fetch`
31+
fetch from the main repository, not your clone, when running `git fetch`
3232
et al.)
3333

3434
## 3. Environment Setup
@@ -174,7 +174,7 @@ For the rest of the plugins:
174174
melos run test:e2e:web
175175
```
176176

177-
A full list of all commands can be found within the [`melos.yaml`](https://github.com/firebase/flutterfire/blob/master/melos.yaml)
177+
A full list of all commands can be found within the [`melos.yaml`](https://github.com/firebase/flutterfire/blob/main/melos.yaml)
178178
file.
179179

180180
## 7. Contributing code
@@ -190,7 +190,7 @@ keep the code consistent and avoid common pitfalls.
190190
To start working on a patch:
191191

192192
1. `git fetch upstream`
193-
2. `git checkout upstream/master -b <name_of_your_branch>`
193+
2. `git checkout upstream/main -b <name_of_your_branch>`
194194
3. Hack away!
195195

196196
Once you have made your changes, ensure that it passes the internal analyzer & formatting checks. The following
@@ -279,12 +279,12 @@ generated via the commit types and changelogs via the commit messages.
279279

280280
Some things to keep in mind before publishing the release:
281281

282-
- Has CI ran on the master commit and gone green? Even if CI shows as green on
282+
- Has CI ran on the main commit and gone green? Even if CI shows as green on
283283
the PR it's still possible for it to fail on merge, for multiple reasons.
284284
There may have been some bug in the merge that introduced new failures. CI
285285
runs on PRs as it's configured on their branch state, and not on tip of tree.
286286
CI on PRs also only runs tests for packages that it detects have been directly
287-
changed, vs running on every single package on master.
287+
changed, vs running on every single package on main.
288288
- [Publishing is
289289
forever.](https://dart.dev/tools/pub/publishing#publishing-is-forever)
290290
Hopefully any bugs or breaking in changes in this PR have already been caught
@@ -297,29 +297,29 @@ Some things to keep in mind before publishing the release:
297297

298298
### Run a release...
299299

300-
1. Switch to `master` branch locally.
301-
2. Run `git pull origin master`.
300+
1. Switch to `main` branch locally.
301+
2. Run `git pull origin main`.
302302
3. Run `git pull --tags` to make sure all tags are fetched.
303303
4. Create new branch with the signature "release/[year]-[month]-[day]".
304304
5. Push your branch to git running `git push origin [RELEASE BRANCH NAME]`.
305305
6. Run `melos version` to automatically version packages and update Changelogs.
306306
7. Run `melos publish` to dry run and confirm all packages are publishable.
307307
8. Run `melos bom [optional-version]` to update the `VERSIONS.md` and `scripts/versions.json` files.
308308
9. Run `git push origin [RELEASE BRANCH NAME]` & open pull request for review on GitHub.
309-
10. After successful review and merge of the pull request, switch to `master` branch locally, & run `git pull origin master`.
309+
10. After successful review and merge of the pull request, switch to `main` branch locally, & run `git pull origin main`.
310310
11. Run `melos publish --no-dry-run` to now publish to Pub.dev.
311311
12. Run `git push --tags` to push tags to repository.
312312
13. Ping @kevinthecheung to get the changelog in Firebase releases.
313313

314314
### Run a BoM release only...
315315

316-
1. Switch to `master` branch locally.
317-
2. Run `git pull origin master`.
316+
1. Switch to `main` branch locally.
317+
2. Run `git pull origin main`.
318318
3. Run `git pull --tags` to make sure all tags are fetched.
319319
4. Create new branch with the signature "release/[year]-[month]-[day]-BoM".
320320
5. Run `melos bom [optional-version]` to update the `VERSIONS.md` and `scripts/versions.json` files.
321321
6. Push your branch to git running `git push origin [RELEASE BRANCH NAME]`.
322-
7. After successful review and merge of the pull request, switch to `master` branch locally, & run `git pull origin master`.
322+
7. After successful review and merge of the pull request, switch to `main` branch locally, & run `git pull origin main`.
323323
8. Run `git push --tags` to push tags to repository.
324324
9. Ping @kevinthecheung to get the changelog in Firebase releases.
325325

@@ -328,8 +328,8 @@ Some things to keep in mind before publishing the release:
328328
Sometimes you may need to 'graduate' a package from a 'dev' or 'beta' (versions tagged like this: `0.10.0-dev.4`) to a stable version. Melos can also be used
329329
to graduate multiple packages using the following steps:
330330

331-
1. Switch to `master` branch locally.
332-
2. Run 'git pull origin master'.
331+
1. Switch to `main` branch locally.
332+
2. Run 'git pull origin main'.
333333
3. Run `git fetch --all` to make sure all tags and commits are fetched.
334334
4. Run `melos version --graduate` to prompt a list of all packages to be graduated (You may also specifically select packages using the scope flag like this: `--scope="*firestore*"`)
335335
5. Run `git push --follow-tags` to push the auto commits and tags to the remote repository.

0 commit comments

Comments
 (0)