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

.cirrus.yml

@@ -11,10 +11,14 @@ task:
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
+    - flutter channel beta
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
+  submodules_script:
+    - git submodule init
+    - git submodule update
   matrix:
     - name: publishable
       script:
@@ -31,6 +35,7 @@ task:
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       test_script:
         # TODO(jackson): Allow web plugins once supported on stable
@@ -42,12 +47,14 @@ task:
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script: ./script/incremental_build.sh analyze
     - name: build_all_plugins_apk
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
@@ -77,6 +84,7 @@ task:
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
         MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
         GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[07586610af1fdfc894e5969f70ef2458341b9b7e9c3b7c4225a663b4a48732b7208a4d91c3b7d45305a6b55fa2a37fc4]
@@ -97,11 +105,11 @@ task:
         - export CIRRUS_COMMIT_MESSAGE=""
         - ./script/incremental_build.sh build-examples --apk
         - ./script/incremental_build.sh java-test  # must come after apk build
-        - if [[ $GCLOUD_FIREBASE_TESTLAB_KEY == ENCRYPTED* ]]; then
-        -   echo "This user does not have permission to run Firebase Test Lab tests."
-        - else
+        - if [[ -n "$GCLOUD_FIREBASE_TESTLAB_KEY" ]]; then
         -   echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
         -   ./script/incremental_build.sh firebase-test-lab --device model=flame,version=29 --device model=starqlteue,version=26
+        - else
+        -   echo "This user does not have permission to run Firebase Test Lab tests."
         - fi
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
@@ -119,10 +127,14 @@ task:
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
+    - flutter channel beta
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
+  submodules_script:
+    - git submodule init
+    - git submodule update
   matrix:
     - name: build-linux+drive-examples
       install_script:
@@ -144,10 +156,14 @@ task:
     - sudo gem install cocoapods
     - flutter channel stable
     - flutter upgrade
+    - flutter channel beta
+    - flutter upgrade
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
+  submodules_script:
+    - git submodule init
+    - git submodule update
   create_simulator_script:
     - xcrun simctl list
     - 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:
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
@@ -166,14 +183,15 @@ task:
     - name: build-ipas+drive-examples
       env:
         PATH: $PATH:/usr/local/bin
-        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"
+        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"
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 2 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 3 --shardCount 4"
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       build_script:
@@ -183,8 +201,11 @@ task:
         - flutter channel $CHANNEL
         - flutter upgrade
         - ./script/incremental_build.sh build-examples --ipa
-        - ./script/incremental_build.sh drive-examples
         - ./script/incremental_build.sh xctest --target RunnerUITests --skip $PLUGINS_TO_SKIP_XCTESTS --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=14.3"
+        # `drive-examples` contains integration tests, which changes the UI of the application.
+        # This UI change sometimes affects `xctest`.
+        # So we run `drive-examples` after `xctest`, changing the order will result ci failure.
+        - ./script/incremental_build.sh drive-examples --ios
 
 task:
   # Xcode 11 task
@@ -201,7 +222,9 @@ task:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
+  submodules_script:
+    - git submodule init
+    - git submodule update
   create_simulator_script:
     - xcrun simctl list
     - 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:
     - flutter channel master
     - flutter upgrade
     - git fetch origin master
-  activate_script: pub global activate flutter_plugin_tools
+  submodules_script:
+    - git submodule init
+    - git submodule update
   matrix:
     - name: build_all_plugins_app
       script:

.github/post_merge_labeler.yml

@@ -0,0 +1,2 @@
+'needs-publishing':
+  - packages/*/**

.github/workflows/pull_request_label.yml

@@ -1,20 +1,31 @@
 # This workflow applies labels to pull requests based on the
 # paths that are modified in the pull request.
 #
-# Edit `.github/labeler.yml` to configure labels.
+# Edit `.github/labeler.yml` and `.github/post_merge_labeler.yml`
+# to configure labels.
 #
 # For more information, see: https://github.com/actions/labeler
 
 name: Pull Request Labeler
 
 on:
-  - pull_request_target
+  pull_request_target:
+    types: [opened, synchronize, reopened, closed]
 
 jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@main
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        sync-labels: true
+      - uses: actions/labeler@9794b1493b6f1fa7b006c5f8635a19c76c98be95
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          sync-labels: true
+
+  post_merge_label:
+    if: github.event.action == 'closed' && github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@9794b1493b6f1fa7b006c5f8635a19c76c98be95
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          configuration-path: .github/post_merge_labeler.yml

.gitignore

@@ -46,3 +46,6 @@ build/
 .project
 .classpath
 .settings
+
+# Downloaded by the plugin tools.
+google-java-format-1.3-all-deps.jar

AUTHORS

@@ -60,4 +60,6 @@ Eitan Schwartz <eshvartz@gmail.com>
 Chris Rutkowski <chrisrutkowski89@gmail.com>
 Juan Alvarez <juan.alvarez@resideo.com>
 Aleksandr Yurkovskiy <sanekyy@gmail.com>
-Anton Borries <mail@antonborri.es>
+Anton Borries <mail@antonborri.es>
+Alex Li <google@alexv525.com>
+Rahul Raj <64.rahulraj@gmail.com>

CODEOWNERS

@@ -4,23 +4,12 @@
 # These names are just suggestions. It is fine to have your changes
 # reviewed by someone else.
 
-packages/android_alarm_manager/**              @bkonyi
-packages/android_intent/**                     @mklim @matthew-carroll
-packages/battery/**                            @matthew-carroll
+
 packages/camera/**                             @bparrishMines
-packages/connectivity/**                       @cyanglaz @matthew-carroll
 packages/cross_file/**                         @ditman @mvanbeusekom
-packages/device_info/**                        @matthew-carroll
-packages/espresso/**                           @collinjackson @adazh
 packages/file_selector/**                      @ditman
 packages/google_maps_flutter/**                @cyanglaz
-packages/google_sign_in/**                     @cyanglaz @mehmetf
 packages/image_picker/**                       @cyanglaz
 packages/integration_test/**                   @dnfield
-packages/in_app_purchase/**                    @mklim @cyanglaz @LHLL
+packages/in_app_purchase/**                    @cyanglaz @LHLL
 packages/ios_platform_images/**                @gaaclarke
-packages/package_info/**                       @cyanglaz @matthew-carroll
-packages/path_provider/**                      @matthew-carroll
-packages/shared_preferences/**                 @matthew-carroll
-packages/url_launcher/**                       @mklim
-packages/video_player/**                       @iskakaushik @cyanglaz

CONTRIBUTING.md

@@ -5,6 +5,25 @@
 
 _See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
 
+## Important note
+
+As of January 2021, we are no longer accepting non-critical PRs for plugins
+for which there is a corresponding [Flutter Community Plus
+Plugin](https://plus.fluttercommunity.dev/), as we hope in time to be able
+to transition users to those versions of the plugins. If you have a PR for
+something other than a critical issue (crashes, build failures, null safety, etc.)
+for any of the following plugins, we encourage you to submit it
+[there](https://github.com/fluttercommunity/plus_plugins/pulls) instead:
+- `android_alarm_manager`
+- `android_intent`
+- `battery`
+- `connectivity`
+- `device_info`
+- `package_info`
+- `sensors`
+- `share`
+- `wifi_info_flutter` (corresponds to `network_info_plus`)
+
 ## Things you will need
 
 

analysis_options.yaml

@@ -4,6 +4,7 @@ analyzer:
     # Ignore generated files
     - '**/*.g.dart'
     - 'lib/src/generated/*.dart'
+    - '**/*.mocks.dart' # Mockito @GenerateMocks
   errors:
     always_require_non_null_named_parameters: false # not needed with nnbd
     unnecessary_null_comparison: false # Turned as long as nnbd mix-mode is supported.

packages/android_alarm_manager/CHANGELOG.md

@@ -1,3 +1,7 @@
+##  2.0.0
+
+* Migrate to null safety.
+
 ## 0.4.5+20
 
 * Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.

packages/android_alarm_manager/README.md

@@ -5,13 +5,6 @@
 A Flutter plugin for accessing the Android AlarmManager service, and running
 Dart code in the background when alarms fire.
 
-**Please set your constraint to `android_alarm_manager: '>=0.4.y+x <2.0.0'`**
-
-## Backward compatible 1.0.0 version is coming
-The plugin has reached a stable API, we guarantee that version `1.0.0` will be backward compatible with `0.4.y+z`.
-Please use `android_alarm_manager: '>=0.4.y+x <2.0.0'` as your dependency constraint to allow a smoother ecosystem migration.
-For more details see: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-
 ## Getting Started
 
 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.:
 **Note:** Not calling `AlarmService.setPluginRegistrant` will result in an exception being
 thrown when an alarm eventually fires.
 
-### Flutter Android Embedding V2 (Flutter Version >= 1.12)
+### Flutter Android Embedding V2
 
 For the Flutter Android Embedding V2, plugins are registered with the background
 isolate via reflection so `AlarmService.setPluginRegistrant` does not need to be
 called.
 
-**NOTE: this plugin is not completely compatible with the V2 embedding on
-Flutter versions < 1.12 as the background isolate will not automatically
-register plugins. This can be resolved by running `flutter upgrade` to upgrade
-to the latest Flutter version.**
-
 For help getting started with Flutter, view our online
 [documentation](https://flutter.dev/).
 

packages/android_alarm_manager/example/integration_test/android_alarm_manager_test.dart

@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';
 import 'package:android_alarm_manager_example/main.dart' as app;