Skip to content

Commit 01760ef

Browse files
committed
Merge branch 'master' into add_zoom_to_android_webview
* master: (150 commits) Update pull_request_label.yml (flutter#3647) migrate tests to null safety (flutter#3645) [shared_preferences] Don't create additional Handler when method channel is called. (flutter#3639) [image_picker_for_web] Bump version for NNBD stable (flutter#3635) [file_selector_platform_interface]: Verify that extensions don't have leading dots. (flutter#3451) Fix Cirrus script for firebase testlab tests (flutter#3634) [extension_google_sign_in_as_googleapis_auth] Migrate to null safety (flutter#3642) [file_selector] Endorse web (flutter#3643) [google_sign_in] Bump app-facing version for NNBD stable (flutter#3637) [google_sign_in_web] Migrate to null-safety (flutter#3628) Make executor an instance property (flutter#3633) [url_launcher] Added a note to the README (flutter#2031) Fix typo in image_picker_for_web README.md (flutter#2835) embedded_views_preview not required since v1.0.0 (flutter#3625) [file_selector] Migrate to null safety (flutter#3631) [camera_platform_interface] Stable null safety release. (flutter#3610) [wifi_info_flutter] null safety stable (flutter#3627) [in_app_purchase] Add support for InApp subscription upgrade/downgrade (flutter#2822) [cross_file] Fix base class nullability (flutter#3629) [file_selector] Return a non-null value from getSavePath on web (flutter#3630) ... # Conflicts: # packages/webview_flutter/CHANGELOG.md # packages/webview_flutter/pubspec.yaml
2 parents 9e82faf + c42db71 commit 01760ef

File tree

870 files changed

+14299
-15267
lines changed

Some content is hidden

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

870 files changed

+14299
-15267
lines changed

.cirrus.yml

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@ task:
1111
upgrade_script:
1212
- flutter channel stable
1313
- flutter upgrade
14+
- flutter channel beta
15+
- flutter upgrade
1416
- flutter channel master
1517
- flutter upgrade
1618
- git fetch origin master
17-
activate_script: pub global activate flutter_plugin_tools
19+
submodules_script:
20+
- git submodule init
21+
- git submodule update
1822
matrix:
1923
- name: publishable
2024
script:
@@ -31,6 +35,7 @@ task:
3135
env:
3236
matrix:
3337
CHANNEL: "master"
38+
CHANNEL: "beta"
3439
CHANNEL: "stable"
3540
test_script:
3641
# TODO(jackson): Allow web plugins once supported on stable
@@ -42,12 +47,14 @@ task:
4247
env:
4348
matrix:
4449
CHANNEL: "master"
50+
CHANNEL: "beta"
4551
CHANNEL: "stable"
4652
script: ./script/incremental_build.sh analyze
4753
- name: build_all_plugins_apk
4854
env:
4955
matrix:
5056
CHANNEL: "master"
57+
CHANNEL: "beta"
5158
CHANNEL: "stable"
5259
script:
5360
# TODO(jackson): Allow web plugins once supported on stable
@@ -77,6 +84,7 @@ task:
7784
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
7885
matrix:
7986
CHANNEL: "master"
87+
CHANNEL: "beta"
8088
CHANNEL: "stable"
8189
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
8290
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
@@ -97,11 +105,11 @@ task:
97105
- export CIRRUS_COMMIT_MESSAGE=""
98106
- ./script/incremental_build.sh build-examples --apk
99107
- ./script/incremental_build.sh java-test # must come after apk build
100-
- if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then
101-
- echo "This user does not have permission to run Firebase Test Lab tests."
102-
- else
108+
- if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
103109
- echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
104110
- ./script/incremental_build.sh firebase-test-lab --device model=flame,version=29 --device model=starqlteue,version=26
111+
- else
112+
- echo "This user does not have permission to run Firebase Test Lab tests."
105113
- fi
106114
- export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
107115
- export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
@@ -119,10 +127,14 @@ task:
119127
upgrade_script:
120128
- flutter channel stable
121129
- flutter upgrade
130+
- flutter channel beta
131+
- flutter upgrade
122132
- flutter channel master
123133
- flutter upgrade
124134
- git fetch origin master
125-
activate_script: pub global activate flutter_plugin_tools
135+
submodules_script:
136+
- git submodule init
137+
- git submodule update
126138
matrix:
127139
- name: build-linux+drive-examples
128140
install_script:
@@ -144,10 +156,14 @@ task:
144156
- sudo gem install cocoapods
145157
- flutter channel stable
146158
- flutter upgrade
159+
- flutter channel beta
160+
- flutter upgrade
147161
- flutter channel master
148162
- flutter upgrade
149163
- git fetch origin master
150-
activate_script: pub global activate flutter_plugin_tools
164+
submodules_script:
165+
- git submodule init
166+
- git submodule update
151167
create_simulator_script:
152168
- xcrun simctl list
153169
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
@@ -156,6 +172,7 @@ task:
156172
env:
157173
matrix:
158174
CHANNEL: "master"
175+
CHANNEL: "beta"
159176
CHANNEL: "stable"
160177
script:
161178
# TODO(jackson): Allow web plugins once supported on stable
@@ -166,14 +183,15 @@ task:
166183
- name: build-ipas+drive-examples
167184
env:
168185
PATH: $PATH:/usr/local/bin
169-
PLUGINS_TO_SKIP_XCTESTS: "battery/battery,camera/camera,connectivity/connectivity,device_info/device_info,espresso,google_maps_flutter/google_maps_flutter,google_sign_in/google_sign_in,in_app_purchase,integration_test,ios_platform_images,local_auth,package_info,path_provider/path_provider,quick_actions,sensors,shared_preferences/shared_preferences,url_launcher/url_launcher,video_player/video_player,webview_flutter,wifi_info_flutter/wifi_info_flutter"
186+
PLUGINS_TO_SKIP_XCTESTS: "battery/battery,camera/camera,connectivity/connectivity,device_info/device_info,espresso,google_maps_flutter/google_maps_flutter,google_sign_in/google_sign_in,in_app_purchase,integration_test,ios_platform_images,local_auth,package_info,path_provider/path_provider,sensors,shared_preferences/shared_preferences,url_launcher/url_launcher,video_player/video_player,webview_flutter,wifi_info_flutter/wifi_info_flutter"
170187
matrix:
171188
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
172189
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
173190
PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
174191
PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
175192
matrix:
176193
CHANNEL: "master"
194+
CHANNEL: "beta"
177195
CHANNEL: "stable"
178196
SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
179197
build_script:
@@ -183,8 +201,11 @@ task:
183201
- flutter channel $CHANNEL
184202
- flutter upgrade
185203
- ./script/incremental_build.sh build-examples --ipa
186-
- ./script/incremental_build.sh drive-examples
187204
- ./script/incremental_build.sh xctest --target RunnerUITests --skip $PLUGINS_TO_SKIP_XCTESTS --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=14.3"
205+
# `drive-examples` contains integration tests, which changes the UI of the application.
206+
# This UI change sometimes affects `xctest`.
207+
# So we run `drive-examples` after `xctest`, changing the order will result ci failure.
208+
- ./script/incremental_build.sh drive-examples --ios
188209

189210
task:
190211
# Xcode 11 task
@@ -201,7 +222,9 @@ task:
201222
- flutter channel master
202223
- flutter upgrade
203224
- git fetch origin master
204-
activate_script: pub global activate flutter_plugin_tools
225+
submodules_script:
226+
- git submodule init
227+
- git submodule update
205228
create_simulator_script:
206229
- xcrun simctl list
207230
- xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
@@ -231,7 +254,9 @@ task:
231254
- flutter channel master
232255
- flutter upgrade
233256
- git fetch origin master
234-
activate_script: pub global activate flutter_plugin_tools
257+
submodules_script:
258+
- git submodule init
259+
- git submodule update
235260
matrix:
236261
- name: build_all_plugins_app
237262
script:

.github/post_merge_labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
'needs-publishing':
2+
- packages/*/**
Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,31 @@
11
# This workflow applies labels to pull requests based on the
22
# paths that are modified in the pull request.
33
#
4-
# Edit `.github/labeler.yml` to configure labels.
4+
# Edit `.github/labeler.yml` and `.github/post_merge_labeler.yml`
5+
# to configure labels.
56
#
67
# For more information, see: https://github.com/actions/labeler
78

89
name: Pull Request Labeler
910

1011
on:
11-
- pull_request_target
12+
pull_request_target:
13+
types: [opened, synchronize, reopened, closed]
1214

1315
jobs:
1416
label:
1517
runs-on: ubuntu-latest
1618
steps:
17-
- uses: actions/labeler@main
18-
with:
19-
repo-token: "${{ secrets.GITHUB_TOKEN }}"
20-
sync-labels: true
19+
- uses: actions/labeler@9794b1493b6f1fa7b006c5f8635a19c76c98be95
20+
with:
21+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
22+
sync-labels: true
23+
24+
post_merge_label:
25+
if: github.event.action == 'closed' && github.event.pull_request.merged == true
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/labeler@9794b1493b6f1fa7b006c5f8635a19c76c98be95
29+
with:
30+
repo-token: "${{ secrets.GITHUB_TOKEN }}"
31+
configuration-path: .github/post_merge_labeler.yml

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ build/
4646
.project
4747
.classpath
4848
.settings
49+
50+
# Downloaded by the plugin tools.
51+
google-java-format-1.3-all-deps.jar

AUTHORS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,6 @@ Eitan Schwartz <[email protected]>
6060
Chris Rutkowski <[email protected]>
6161
Juan Alvarez <[email protected]>
6262
Aleksandr Yurkovskiy <[email protected]>
63-
Anton Borries <[email protected]>
63+
Anton Borries <[email protected]>
64+
65+
Rahul Raj <[email protected]>

CODEOWNERS

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,12 @@
44
# These names are just suggestions. It is fine to have your changes
55
# reviewed by someone else.
66

7-
packages/android_alarm_manager/** @bkonyi
8-
packages/android_intent/** @mklim @matthew-carroll
9-
packages/battery/** @matthew-carroll
7+
108
packages/camera/** @bparrishMines
11-
packages/connectivity/** @cyanglaz @matthew-carroll
129
packages/cross_file/** @ditman @mvanbeusekom
13-
packages/device_info/** @matthew-carroll
14-
packages/espresso/** @collinjackson @adazh
1510
packages/file_selector/** @ditman
1611
packages/google_maps_flutter/** @cyanglaz
17-
packages/google_sign_in/** @cyanglaz @mehmetf
1812
packages/image_picker/** @cyanglaz
1913
packages/integration_test/** @dnfield
20-
packages/in_app_purchase/** @mklim @cyanglaz @LHLL
14+
packages/in_app_purchase/** @cyanglaz @LHLL
2115
packages/ios_platform_images/** @gaaclarke
22-
packages/package_info/** @cyanglaz @matthew-carroll
23-
packages/path_provider/** @matthew-carroll
24-
packages/shared_preferences/** @matthew-carroll
25-
packages/url_launcher/** @mklim
26-
packages/video_player/** @iskakaushik @cyanglaz

CONTRIBUTING.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,25 @@
55

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

8+
## Important note
9+
10+
As of January 2021, we are no longer accepting non-critical PRs for plugins
11+
for which there is a corresponding [Flutter Community Plus
12+
Plugin](https://plus.fluttercommunity.dev/), as we hope in time to be able
13+
to transition users to those versions of the plugins. If you have a PR for
14+
something other than a critical issue (crashes, build failures, null safety, etc.)
15+
for any of the following plugins, we encourage you to submit it
16+
[there](https://github.com/fluttercommunity/plus_plugins/pulls) instead:
17+
- `android_alarm_manager`
18+
- `android_intent`
19+
- `battery`
20+
- `connectivity`
21+
- `device_info`
22+
- `package_info`
23+
- `sensors`
24+
- `share`
25+
- `wifi_info_flutter` (corresponds to `network_info_plus`)
26+
827
## Things you will need
928

1029

analysis_options.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ analyzer:
44
# Ignore generated files
55
- '**/*.g.dart'
66
- 'lib/src/generated/*.dart'
7+
- '**/*.mocks.dart' # Mockito @GenerateMocks
78
errors:
89
always_require_non_null_named_parameters: false # not needed with nnbd
910
unnecessary_null_comparison: false # Turned as long as nnbd mix-mode is supported.

packages/android_alarm_manager/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.0
2+
3+
* Migrate to null safety.
4+
15
## 0.4.5+20
26

37
* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.

packages/android_alarm_manager/README.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@
55
A Flutter plugin for accessing the Android AlarmManager service, and running
66
Dart code in the background when alarms fire.
77

8-
**Please set your constraint to `android_alarm_manager: '>=0.4.y+x <2.0.0'`**
9-
10-
## Backward compatible 1.0.0 version is coming
11-
The plugin has reached a stable API, we guarantee that version `1.0.0` will be backward compatible with `0.4.y+z`.
12-
Please use `android_alarm_manager: '>=0.4.y+x <2.0.0'` as your dependency constraint to allow a smoother ecosystem migration.
13-
For more details see: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
14-
158
## Getting Started
169

1710
After importing this plugin to your project as usual, add the following to your
@@ -109,17 +102,12 @@ Which must be reflected in the application's `AndroidManifest.xml`. E.g.:
109102
**Note:** Not calling `AlarmService.setPluginRegistrant` will result in an exception being
110103
thrown when an alarm eventually fires.
111104

112-
### Flutter Android Embedding V2 (Flutter Version >= 1.12)
105+
### Flutter Android Embedding V2
113106

114107
For the Flutter Android Embedding V2, plugins are registered with the background
115108
isolate via reflection so `AlarmService.setPluginRegistrant` does not need to be
116109
called.
117110

118-
**NOTE: this plugin is not completely compatible with the V2 embedding on
119-
Flutter versions < 1.12 as the background isolate will not automatically
120-
register plugins. This can be resolved by running `flutter upgrade` to upgrade
121-
to the latest Flutter version.**
122-
123111
For help getting started with Flutter, view our online
124112
[documentation](https://flutter.dev/).
125113

packages/android_alarm_manager/example/integration_test/android_alarm_manager_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
// @dart=2.9
6+
57
import 'dart:async';
68
import 'dart:io';
79
import 'package:android_alarm_manager_example/main.dart' as app;

packages/android_alarm_manager/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 0 additions & 30 deletions
This file was deleted.

packages/android_alarm_manager/example/ios/Flutter/Debug.xcconfig

Lines changed: 0 additions & 2 deletions
This file was deleted.

packages/android_alarm_manager/example/ios/Flutter/Release.xcconfig

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)