Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 5ef2ba7

Browse files
stuartmorgan-gstuartmorgan-g
authored
Merge branch 'master' into master
2 parents 822ffa0 + d5e200b commit 5ef2ba7

1,294 files changed

Lines changed: 20867 additions & 31202 deletions

File tree

Some content is hidden

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

‎.ci/scripts/build_examples_uwp.sh‎

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

66
dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --winuwp \
7-
--packages-for-branch
7+
--packages-for-branch --log-timing

‎.ci/scripts/build_examples_win32.sh‎

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

66
dart ./script/tool/bin/flutter_plugin_tools.dart build-examples --windows \
7-
--packages-for-branch
7+
--packages-for-branch --log-timing

‎.ci/scripts/drive_examples_win32.sh‎

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

66
dart ./script/tool/bin/flutter_plugin_tools.dart drive-examples --windows \
7-
--packages-for-branch
7+
--packages-for-branch --log-timing

‎.ci/scripts/native_test_win32.sh‎

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

66
dart ./script/tool/bin/flutter_plugin_tools.dart native-test --windows \
7-
--no-integration --packages-for-branch
7+
--no-integration --packages-for-branch --log-timing

‎.cirrus.yml‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gcp_credentials: ENCRYPTED[!48cff44dd32e9cc412d4d381c7fe68d373ca04cf2639f8192d21cb1a9ab5e21129651423a1cf88f3fd7fe2125c1cabd9!]
1+
gcp_credentials: ENCRYPTED[!cc769765170bebc37e0556e2da5915ca64ee37f4ec8c966ec147e2f59578b476c99e457eafce4e2f8b1a4e305f7096b8!]
22

33
# Don't run on release tags since it creates O(n^2) tasks where n is the
44
# number of plugins
@@ -75,16 +75,16 @@ task:
7575
CHANGE_DESC: "$TMPDIR/change-description.txt"
7676
version_check_script:
7777
# For pre-submit, pass the PR description to the script to allow for
78-
# platform version breaking version change justifications.
79-
# For post-submit, ignore platform version breaking version changes.
80-
# The PR description isn't reliably part of the commit message, so using
81-
# the same flags as for presubmit would likely result in false-positive
82-
# post-submit failures.
78+
# version check overrides.
79+
# For post-submit, ignore platform version breaking version changes and
80+
# missing version/CHANGELOG detection; the PR description isn't reliably
81+
# part of the commit message, so using the same flags as for presubmit
82+
# would likely result in false-positive post-submit failures.
8383
- if [[ $CIRRUS_PR == "" ]]; then
8484
- ./script/tool_runner.sh version-check --ignore-platform-interface-breaks
8585
- else
8686
- echo "$CIRRUS_CHANGE_MESSAGE" > "$CHANGE_DESC"
87-
- ./script/tool_runner.sh version-check --change-description-file="$CHANGE_DESC"
87+
- ./script/tool_runner.sh version-check --check-for-missing-changes --change-description-file="$CHANGE_DESC"
8888
- fi
8989
publish_check_script: ./script/tool_runner.sh publish-check
9090
- name: format
@@ -109,13 +109,25 @@ task:
109109
matrix:
110110
CHANNEL: "master"
111111
CHANNEL: "stable"
112-
tool_script:
112+
analyze_tool_script:
113113
- cd script/tool
114114
- dart analyze --fatal-infos
115-
script:
115+
analyze_script:
116116
# DO NOT change the custom-analysis argument here without changing the Dart repo.
117117
# See the comment in script/configs/custom_analysis.yaml for details.
118118
- ./script/tool_runner.sh analyze --custom-analysis=script/configs/custom_analysis.yaml
119+
pathified_analyze_script:
120+
# Re-run analysis with path-based dependencies to ensure that publishing
121+
# the changes won't break analysis of other packages in the respository
122+
# that depend on it.
123+
- ./script/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
124+
# This uses --run-on-dirty-packages rather than --packages-for-branch
125+
# since only the packages changed by 'make-deps-path-based' need to be
126+
# checked.
127+
- dart $PLUGIN_TOOL analyze --run-on-dirty-packages --log-timing --custom-analysis=script/configs/custom_analysis.yaml
128+
# Restore the tree to a clean state, to avoid accidental issues if
129+
# other script steps are added to this task.
130+
- git checkout .
119131
### Android tasks ###
120132
- name: android-build_all_plugins
121133
env:
@@ -174,10 +186,11 @@ task:
174186
- name: android-platform_tests
175187
env:
176188
matrix:
177-
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
178-
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
179-
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
180-
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
189+
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 5"
190+
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 5"
191+
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 5"
192+
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 5"
193+
PLUGIN_SHARDING: "--shardIndex 4 --shardCount 5"
181194
matrix:
182195
CHANNEL: "master"
183196
CHANNEL: "stable"
@@ -228,6 +241,9 @@ task:
228241
### Web tasks ###
229242
- name: web-platform_tests
230243
env:
244+
matrix:
245+
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
246+
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
231247
matrix:
232248
CHANNEL: "master"
233249
CHANNEL: "stable"
@@ -281,7 +297,7 @@ task:
281297
xcode_analyze_script:
282298
- ./script/tool_runner.sh xcode-analyze --ios
283299
native_test_script:
284-
- ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest" --exclude=script/configs/exclude_native_ios.yaml
300+
- ./script/tool_runner.sh native-test --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
285301
drive_script:
286302
# `drive-examples` contains integration tests, which changes the UI of the application.
287303
# This UI change sometimes affects `xctest`.
@@ -309,6 +325,6 @@ task:
309325
xcode_analyze_script:
310326
- ./script/tool_runner.sh xcode-analyze --macos
311327
native_test_script:
312-
- ./script/tool_runner.sh native-test --macos --exclude=script/configs/exclude_native_macos.yaml
328+
- ./script/tool_runner.sh native-test --macos
313329
drive_script:
314330
- ./script/tool_runner.sh drive-examples --macos

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
1010
- [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
11-
- [ ] I read and followed the [relevant style guides] and ran [the auto-formatter]. (Note that unlike the flutter/flutter repo, the flutter/plugins repo does use `dart format`.)
11+
- [ ] I read and followed the [relevant style guides] and ran [the auto-formatter]. (Unlike the flutter/flutter repo, the flutter/plugins repo does use `dart format`.)
1212
- [ ] I signed the [CLA].
1313
- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
1414
- [ ] I listed at least one issue that this PR fixes in the description above.
15-
- [ ] I [updated pubspec.yaml](https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates) with an appropriate new version according to the [pub versioning philosophy].
16-
- [ ] I updated CHANGELOG.md to add a description of the change.
15+
- [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or this PR is [exempt from version changes].
16+
- [ ] I updated `CHANGELOG.md` to add a description of the change, [following repository CHANGELOG style].
1717
- [ ] I updated/added relevant documentation (doc comments with `///`).
18-
- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
18+
- [ ] I added new tests to check the change I am making, or this PR is [test-exempt].
1919
- [ ] All existing and new tests are passing.
2020

2121
If you need help, consider asking for advice on the #hackers-new channel on [Discord].
@@ -29,4 +29,7 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
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
32+
[exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
33+
[following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
3234
[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
35+
[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

‎.github/labeler.yml‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
1-
'p: android_alarm_manager':
2-
- packages/android_alarm_manager/**/*
3-
4-
'p: android_intent':
5-
- packages/android_intent/**/*
6-
7-
'p: battery':
8-
- packages/battery/**/*
9-
101
'p: camera':
112
- packages/camera/**/*
123

13-
'p: connectivity':
14-
- packages/connectivity/**/*
15-
16-
'p: cross_file':
17-
- packages/cross_file/**/*
18-
19-
'p: device_info':
20-
- packages/device_info/**/*
21-
224
'p: espresso':
235
- packages/espresso/**/*
246

@@ -46,9 +28,6 @@
4628
'p: local_auth':
4729
- packages/local_auth/**/*
4830

49-
'p: package_info':
50-
- packages/package_info/**/*
51-
5231
'p: path_provider':
5332
- packages/path_provider/**/*
5433

@@ -58,12 +37,6 @@
5837
'p: quick_actions':
5938
- packages/quick_actions/**/*
6039

61-
'p: sensors':
62-
- packages/sensors/**/*
63-
64-
'p: share':
65-
- packages/share/**/*
66-
6740
'p: shared_preferences':
6841
- packages/shared_preferences/**/*
6942

@@ -76,15 +49,14 @@
7649
'p: webview_flutter':
7750
- packages/webview_flutter/**/*
7851

79-
'p: wifi_info_flutter':
80-
- packages/wifi_info_flutter/**/*
81-
8252
'platform-android':
8353
- packages/*/*_android/**/*
8454
- packages/**/android/**/*
8555

8656
'platform-ios':
8757
- packages/*/*_ios/**/*
58+
- packages/*/*_storekit/**/*
59+
- packages/*/*_wkwebview/**/*
8860
- packages/**/ios/**/*
8961

9062
'platform-linux':

‎.github/workflows/mirror.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Copyright 2013 The Flutter Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# Mirror master to main branches in the plugins repository.
6+
on:
7+
push:
8+
branches:
9+
- 'master'
10+
11+
jobs:
12+
mirror_job:
13+
permissions:
14+
pull-requests: write
15+
runs-on: ubuntu-latest
16+
if: ${{ github.repository == 'flutter/plugins' }}
17+
name: Mirror master branch to main branch
18+
steps:
19+
- name: Mirror action step
20+
id: mirror
21+
uses: google/mirror-branch-action@c6b07e441a7ffc5ae15860c1d0a8107a3a151db8
22+
with:
23+
github-token: ${{ secrets.FLUTTERGITHUBBOT_TOKEN }}
24+
source: 'master'
25+
dest: 'main'

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ Additional resources specific to the plugins repository:
2424
for more information about how to make PRs for this repository, especially when
2525
changing federated plugins.
2626

27-
## Important note
28-
29-
As of January 2021, we are no longer accepting non-critical PRs for the
30-
[deprecated plugins](./README.md#deprecated), as all new development should
31-
happen in the Flutter Community Plus replacements. If you have a PR for
32-
something other than a critical issue (crashes, build failures, security issues)
33-
in one of those pluigns, please [submit it to the Flutter Community Plus
34-
replacement](https://github.com/fluttercommunity/plus_plugins/pulls) instead.
35-
3627
## Other notes
3728

3829
### Style

‎README.md‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,20 +59,3 @@ These are the available plugins in this repository.
5959
| [url_launcher](./packages/url_launcher/) | [![pub package](https://img.shields.io/pub/v/url_launcher.svg)](https://pub.dev/packages/url_launcher) | [![pub points](https://badges.bar/url_launcher/pub%20points)](https://pub.dev/packages/url_launcher/score) | [![popularity](https://badges.bar/url_launcher/popularity)](https://pub.dev/packages/url_launcher/score) | [![likes](https://badges.bar/url_launcher/likes)](https://pub.dev/packages/url_launcher/score) |
6060
| [video_player](./packages/video_player/) | [![pub package](https://img.shields.io/pub/v/video_player.svg)](https://pub.dev/packages/video_player) | [![pub points](https://badges.bar/video_player/pub%20points)](https://pub.dev/packages/video_player/score) | [![popularity](https://badges.bar/video_player/popularity)](https://pub.dev/packages/video_player/score) | [![likes](https://badges.bar/video_player/likes)](https://pub.dev/packages/video_player/score) |
6161
| [webview_flutter](./packages/webview_flutter/) | [![pub package](https://img.shields.io/pub/v/webview_flutter.svg)](https://pub.dev/packages/webview_flutter) | [![pub points](https://badges.bar/webview_flutter/pub%20points)](https://pub.dev/packages/webview_flutter/score) | [![popularity](https://badges.bar/webview_flutter/popularity)](https://pub.dev/packages/webview_flutter/score) | [![likes](https://badges.bar/webview_flutter/likes)](https://pub.dev/packages/webview_flutter/score) |
62-
63-
### Deprecated
64-
65-
The following plugins are also part of this repository, but are deprecated in
66-
favor of the [Flutter Community Plus](https://plus.fluttercommunity.dev/) versions.
67-
68-
| Plugin | Pub | | Replacement | Pub |
69-
|--------|-----|--|-------------|-----|
70-
| [android_alarm_manager](./packages/android_alarm_manager/) | [![pub package](https://img.shields.io/pub/v/android_alarm_manager.svg)](https://pub.dev/packages/android_alarm_manager) | | android_alarm_manager_plus | [![pub package](https://img.shields.io/pub/v/android_alarm_manager_plus.svg)](https://pub.dev/packages/android_alarm_manager_plus) |
71-
| [android_intent](./packages/android_intent/) | [![pub package](https://img.shields.io/pub/v/android_intent.svg)](https://pub.dev/packages/android_intent) | | android_intent_plus | [![pub package](https://img.shields.io/pub/v/android_intent_plus.svg)](https://pub.dev/packages/android_intent_plus) |
72-
| [battery](./packages/battery/) | [![pub package](https://img.shields.io/pub/v/battery.svg)](https://pub.dev/packages/battery) | | battery_plus | [![pub package](https://img.shields.io/pub/v/battery_plus.svg)](https://pub.dev/packages/battery_plus) |
73-
| [connectivity](./packages/connectivity/) | [![pub package](https://img.shields.io/pub/v/connectivity.svg)](https://pub.dev/packages/connectivity) | | connectivity_plus | [![pub package](https://img.shields.io/pub/v/connectivity_plus.svg)](https://pub.dev/packages/connectivity_plus) |
74-
| [device_info](./packages/device_info/) | [![pub package](https://img.shields.io/pub/v/device_info.svg)](https://pub.dev/packages/device_info) | | device_info_plus | [![pub package](https://img.shields.io/pub/v/device_info_plus.svg)](https://pub.dev/packages/device_info_plus) |
75-
| [package_info](./packages/package_info/) | [![pub package](https://img.shields.io/pub/v/package_info.svg)](https://pub.dev/packages/package_info) | | package_info_plus | [![pub package](https://img.shields.io/pub/v/package_info_plus.svg)](https://pub.dev/packages/package_info_plus) |
76-
| [sensors](./packages/sensors/) | [![pub package](https://img.shields.io/pub/v/sensors.svg)](https://pub.dev/packages/sensors) | | sensors_plus | [![pub package](https://img.shields.io/pub/v/sensors_plus.svg)](https://pub.dev/packages/sensors_plus) |
77-
| [share](./packages/share/) | [![pub package](https://img.shields.io/pub/v/share.svg)](https://pub.dev/packages/share) | | share_plus | [![pub package](https://img.shields.io/pub/v/share_plus.svg)](https://pub.dev/packages/share_plus) |
78-
| [wifi_info_flutter](./packages/wifi_info_flutter/) | [![pub package](https://img.shields.io/pub/v/wifi_info_flutter.svg)](https://pub.dev/packages/wifi_info_flutter) | | network_info_plus | [![pub package](https://img.shields.io/pub/v/network_info_plus.svg)](https://pub.dev/packages/network_info_plus) |

0 commit comments

Comments
 (0)