Skip to content

Commit 36e1ac2

Browse files
author
Marina González
committed
Merge branch 'master' into quick_actions_fix
* master: (21 commits) Add versions to all the dependencies so they are pinned (flutter#5887) Roll Flutter from 52c47e9 to 1b2ee41 (8 revisions) (flutter#5916) [various] Clean up obsolete references to "master" (flutter#5912) Re-add tag filter (flutter#5918) [video_player] Android: Rotate videos recorded in landscapeRight (flutter#3820) Revert "Add automatic updating of github-actions (flutter#5880)" (flutter#5917) Add automatic updating of github-actions (flutter#5880) Roll Flutter from 2e1ebd8 to 52c47e9 (9 revisions) (flutter#5911) Roll Flutter from 889a15e to 2e1ebd8 (6 revisions) (flutter#5910) Revert "All the workflows have been migrated to use main. (flutter#5874)" (flutter#5907) Update filter to run tasks only on PRs and main branch. (flutter#5883) [image_picker_android] Add jetifier back with gradle and androidx upgrades (flutter#5890) Roll Flutter from e899573 to 889a15e (176 revisions) (flutter#5905) ignore upcoming warnings in webview_flutter_wkwebview (flutter#5856) ignore upcoming warnings in webview_flutter_platform_interface (flutter#5855) [webview_flutter_wkwebview] Implement one callback method for review of the design (flutter#5700) [image_picker_android] Remove `jetifier` and `enableUnitTestBinaryResources` from gradle properties (flutter#5889) update key (flutter#5882) All the workflows have been migrated to use main. (flutter#5874) [google_maps_flutter] Objective-C code clean up (flutter#5780) ...
2 parents 60e8635 + 395dc14 commit 36e1ac2

File tree

159 files changed

+3062
-2065
lines changed

Some content is hidden

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

159 files changed

+3062
-2065
lines changed

.ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ platform_properties:
1313
properties:
1414
dependencies: >
1515
[
16-
{"dependency": "curl"}
16+
{"dependency": "curl", "version": "version:7.64.0"}
1717
]
1818
device_type: none
1919
os: Linux
2020
windows:
2121
properties:
2222
dependencies: >
2323
[
24-
{"dependency": "certs"}
24+
{"dependency": "certs", "version": "version:9563bb"}
2525
]
2626
device_type: none
2727
os: Windows
@@ -37,7 +37,7 @@ targets:
3737
version_file: flutter_master.version
3838
dependencies: >
3939
[
40-
{"dependency": "vs_build"}
40+
{"dependency": "vs_build", "version": "version:vs2019"}
4141
]
4242
4343
- name: Windows win32-platform_tests stable
@@ -49,7 +49,7 @@ targets:
4949
channel: stable
5050
dependencies: >
5151
[
52-
{"dependency": "vs_build"}
52+
{"dependency": "vs_build", "version": "version:vs2019"}
5353
]
5454
5555
- name: Windows windows-build_all_plugins master
@@ -62,7 +62,7 @@ targets:
6262
version_file: flutter_master.version
6363
dependencies: >
6464
[
65-
{"dependency": "vs_build"}
65+
{"dependency": "vs_build", "version": "version:vs2019"}
6666
]
6767
6868
- name: Windows windows-build_all_plugins stable
@@ -74,7 +74,7 @@ targets:
7474
channel: stable
7575
dependencies: >
7676
[
77-
{"dependency": "vs_build"}
77+
{"dependency": "vs_build", "version": "version:vs2019"}
7878
]
7979
8080
- name: Windows plugin_tools_tests

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e8995736bf556458db4e908d918b48cae0fa1992
1+
1b2ee411aa1389e74c7c2aada90bc468781532d2

.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: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
gcp_credentials: ENCRYPTED[!ebad0a1f4f7a446b77944c33651460a7ab010b4617273cb016cf354eb8fc22aa92e37a3c58bfa4a0c40a799351e027a6!]
22

3-
# Don't run on release tags since it creates O(n^2) tasks where n is the
4-
# number of plugins.
5-
# Don't run on 'master' since it's a mirror of 'main'.
6-
only_if: $CIRRUS_TAG == '' && $CIRRUS_BRANCH != 'master'
3+
# Run on PRs and main branch post submit only. Don't run tests when tagging.
4+
only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
75
env:
86
CHANNEL: "master" # Default to master when not explicitly set by a task.
97
PLUGIN_TOOL: "./script/tool/bin/flutter_plugin_tools.dart"
@@ -88,9 +86,6 @@ task:
8886
- dart pub run test
8987
- name: publishable
9088
env:
91-
# TODO (mvanbeusekom): Temporary override to "stable" because of failure on "master".
92-
# Remove override once https://github.com/dart-lang/pub/issues/3152 is resolved.
93-
CHANNEL: stable
9489
CHANGE_DESC: "$TMPDIR/change-description.txt"
9590
version_check_script:
9691
# For pre-submit, pass the PR description to the script to allow for
@@ -232,7 +227,7 @@ task:
232227
CHANNEL: "master"
233228
CHANNEL: "stable"
234229
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
235-
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[4c11f1a80a5741d51e92ab609bc7214ab2aa015e68a490e4d6777ebdf84f9c899b97c0ded2f4b2e6adf2c8b5ead1e3c5]
230+
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[c84a06b85f9c906705732aea6142ef6f63ff1a6f07372dc36880a9d0c2c4b9cb35b2e35cd19edc6285167c2a5cc075ec]
236231
build_script:
237232
# Unsetting CIRRUS_CHANGE_MESSAGE and CIRRUS_COMMIT_MESSAGE as they
238233
# might include non-ASCII characters which makes Gradle crash.

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

0 commit comments

Comments
 (0)