Skip to content

Commit 8f74e64

Browse files
stuartmorgan-gmvanbeusekom
authored andcommitted
[various] Clean up obsolete references to "master" (flutter#5912)
1 parent 14577d0 commit 8f74e64

File tree

78 files changed

+204
-352
lines changed

Some content is hidden

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

78 files changed

+204
-352
lines changed

.ci/scripts/prepare_tool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# found in the LICENSE file.
55

66
# To set FETCH_HEAD for "git merge-base" to work
7-
git fetch origin master
7+
git fetch origin main
88

99
cd script/tool
1010
dart pub get

.cirrus.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ task:
8686
- dart pub run test
8787
- name: publishable
8888
env:
89-
# TODO (mvanbeusekom): Temporary override to "stable" because of failure on "master".
90-
# Remove override once https://github.com/dart-lang/pub/issues/3152 is resolved.
91-
CHANNEL: stable
9289
CHANGE_DESC: "$TMPDIR/change-description.txt"
9390
version_check_script:
9491
# For pre-submit, pass the PR description to the script to allow for

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
If you need help, consider asking for advice on the #hackers-new channel on [Discord].
2222

2323
<!-- Links -->
24-
[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
24+
[Contributor Guide]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md
2525
[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
26-
[relevant style guides]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md#style
26+
[relevant style guides]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md#style
2727
[CLA]: https://cla.developers.google.com/
2828
[flutter/tests]: https://github.com/flutter/tests
2929
[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
3030
[Discord]: https://github.com/flutter/flutter/wiki/Chat
3131
[pub versioning philosophy]: https://dart.dev/tools/pub/versioning
3232
[exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
3333
[following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
34-
[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
34+
[the auto-formatter]: https://github.com/flutter/plugins/blob/main/script/tool/README.md#format-code
3535
[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to Flutter Plugins
22

3-
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
3+
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/main)
44

55
_See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
66

@@ -35,7 +35,7 @@ use, and use auto-formatters:
3535
- [C++](https://google.github.io/styleguide/cppguide.html) formatted with `clang-format`
3636
- **Note**: The Linux plugins generally follow idiomatic GObject-based C
3737
style. See [the engine style
38-
notes](https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style)
38+
notes](https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style)
3939
for more details, and exceptions.
4040
- [Java](https://google.github.io/styleguide/javaguide.html) formatted with
4141
`google-java-format`

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Flutter plugins
22

3-
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
3+
[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/main)
44
[![Release Status](https://github.com/flutter/plugins/actions/workflows/release.yml/badge.svg)](https://github.com/flutter/plugins/actions/workflows/release.yml)
55

66
This repo is a companion repo to the main [flutter
@@ -34,7 +34,7 @@ is ready, you can [publish](https://flutter.dev/developing-packages/#publish) it
3434
to the [pub repository](https://pub.dev/).
3535

3636
If you wish to contribute a change to any of the existing plugins in this repo,
37-
please review our [contribution guide](https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md),
37+
please review our [contribution guide](https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md),
3838
and send a [pull request](https://github.com/flutter/plugins/pulls).
3939

4040
## Plugins

packages/camera/camera/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For web integration details, see the
5959

6060
### Handling Lifecycle states
6161

62-
As of version [0.5.0](https://github.com/flutter/plugins/blob/master/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
62+
As of version [0.5.0](https://github.com/flutter/plugins/blob/main/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
6363

6464
<?code-excerpt "main.dart (AppLifecycle)"?>
6565
```dart

packages/camera/camera_web/lib/src/shims/dart_ui_fake.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ import 'dart:html' as html;
1111
// ignore_for_file: camel_case_types
1212

1313
/// Shim for web_ui engine.PlatformViewRegistry
14-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L62
14+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L62
1515
class platformViewRegistry {
1616
/// Shim for registerViewFactory
17-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L72
17+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L72
1818
static bool registerViewFactory(
1919
String viewTypeId, html.Element Function(int viewId) viewFactory) {
2020
return false;
2121
}
2222
}
2323

2424
/// Shim for web_ui engine.AssetManager.
25-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L12
25+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L12
2626
class webOnlyAssetManager {
2727
/// Shim for getAssetUrl.
28-
/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L45
28+
/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L45
2929
static String getAssetUrl(String asset) => '';
3030
}
3131

packages/camera/camera_windows/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.1.0+2
2+
3+
* Updates references to the obsolete master branch.
4+
15
## 0.1.0+1
26

37
* Removes unnecessary imports.

packages/camera/camera_windows/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: camera_windows
22
description: A Flutter plugin for getting information about and controlling the camera on Windows.
3-
repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera_windows
3+
repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_windows
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.1.0+1
5+
version: 0.1.0+2
66

77
environment:
88
sdk: ">=2.12.0 <3.0.0"

packages/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# e2e (deprecated)
22

3-
This package has been moved to [integration_test](https://github.com/flutter/plugins/tree/master/packages/integration_test).
3+
This package has been moved to [`integration_test` in the Flutter SDK](https://github.com/flutter/flutter/tree/master/packages/integration_test).

0 commit comments

Comments
 (0)