Merge branch 'master' into gmain

* master: (175 commits)
  [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)
  [device_info] null safety stable  (flutter#3626)
  [file_selector_web] Migrated to null-safety (flutter#3550)
  ...

# Conflicts:
#	packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapBuilder.java
#	packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
#	packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapOptionsSink.java
#	packages/google_maps_flutter/google_maps_flutter/lib/src/google_map.dart

Author: yasargil

.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:
@@ -134,80 +146,117 @@ task:
         - xvfb-run ./script/incremental_build.sh drive-examples --linux
 
 task:
+  # Xcode 12 task
   # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
   only_if: $CIRRUS_TAG == ''
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
-    image: catalina-xcode-11.3.1-flutter
+    image: big-sur-xcode-12.3
   upgrade_script:
     - 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-X com.apple.CoreSimulator.SimRuntime.iOS-13-3 | xargs xcrun simctl boot
+    - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-3 | xargs xcrun simctl boot
   matrix:
     - name: build_all_plugins_ipa
       env:
         matrix:
           CHANNEL: "master"
+          CHANNEL: "beta"
           CHANNEL: "stable"
       script:
         # TODO(jackson): Allow web plugins once supported on stable
         # https://github.com/flutter/flutter/issues/42864
         - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
         - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh ios --no-codesign
-    - name: lint_darwin_plugins
-      env:
-        matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
-      script:
-        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
-        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
-        # Skip the dummy podspecs used to placate the tool.
-        - find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
-        - ./script/incremental_build.sh podspecs
     - 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:
         # TODO(jackson): Allow web plugins once supported on stable
         # https://github.com/flutter/flutter/issues/42864
         - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
         - 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
+        - ./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
+  # TODO(cyanglaz): merge Xcode 11 task to Xcode 12 task when all the matrix can be run in Xcode 12.
   # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
   only_if: $CIRRUS_TAG == ''
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
     image: catalina-xcode-11.3.1-flutter
+  upgrade_script:
+    - sudo gem install cocoapods
+    - flutter channel stable
+    - flutter upgrade
+    - flutter channel master
+    - flutter upgrade
+    - git fetch origin master
+  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
+  matrix:
+    - name: lint_darwin_plugins
+      env:
+        matrix:
+          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
+          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+      script:
+        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
+        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
+        # Skip the dummy podspecs used to placate the tool.
+        - find . -name "*_web*.podspec" -o -name "*_mac*.podspec" | xargs rm
+        - ./script/incremental_build.sh podspecs
+
+task:
+  # don't run on release tags since it creates O(n^2) tasks where n is the number of plugins
+  only_if: $CIRRUS_TAG == ''
+  use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
+  osx_instance:
+    image: big-sur-xcode-12.3
   setup_script:
     - flutter config --enable-macos-desktop
   upgrade_script:
     - sudo gem install cocoapods
     - 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/labeler.yml

@@ -84,3 +84,27 @@
 
 'p: wifi_info_flutter':
   - packages/wifi_info_flutter/**/*
+
+'platform-android':
+  - packages/*/*_android/**/*
+  - packages/**/android/**/*
+
+'platform-ios':
+  - packages/*/*_ios/**/*
+  - packages/**/ios/**/*
+
+'platform-linux':
+  - packages/*/*_linux/**/*
+  - packages/**/linux/**/*
+
+'platform-macos':
+  - packages/*/*_macos/**/*
+  - packages/**/macos/**/*
+
+'platform-web':
+  - packages/*/*_web/**/*
+  - packages/**/web/**/*
+
+'platform-windows':
+  - packages/*/*_windows/**/*
+  - packages/**/windows/**/*

.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@v3
+        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@v3
+        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 <[email protected]>
 Chris Rutkowski <[email protected]>
 Juan Alvarez <[email protected]>
 Aleksandr Yurkovskiy <[email protected]>
-Anton Borries <[email protected]>
+Anton Borries <[email protected]>
+Alex Li <[email protected]>
+Rahul Raj <[email protected]>

CODEOWNERS

@@ -4,24 +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/**                            @amirh @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
-packages/webview_flutter/**                    @amirh

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
 
 

README.md

@@ -19,6 +19,9 @@ These plugins are also available on
 Please file any issues, bugs, or feature requests in the [main flutter
 repo](https://github.com/flutter/flutter/issues/new).
 
+Issues pertaining to this repository are [labeled
+"plugin"](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3Aplugin).
+
 ## Contributing
 
 If you wish to contribute a new plugin to the Flutter ecosystem, please

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.