Merge branch 'upstream-share-final-null-release' into pull-in-upstream-changes

* upstream-share-final-null-release: (233 commits)
  [q-w] Update Flutter SDK constraint (flutter#3323)
  [i-p] Update Flutter SDK constraint (flutter#3322)
  [d-g] Update Flutter SDK constraint (flutter#3321)
  [a-c] Update Flutter SDK constraint (flutter#3320)
  [image_picker_platform_interface] Pass Uri to package:http APIs (flutter#3309)
  Exclude null-safe plugins from testing on stable (flutter#3318)
  [documentation] [url_launcher] fix for readme code sample (flutter#3308)
  [camera] Add zoom support to platform interface (flutter#3312)
  update analysis options for nnbd (flutter#3319)
  [camera] Suppress unchecked cast warning in java test (flutter#3316)
  [image_picker] [integration_test] Fixes to make the tree green (flutter#3317)
  [camera] Expanded platform interface to support setting flash mode (flutter#3313)
  [Espresso] Android Code Inspection and Clean up (flutter#3111)
  [camera] Add `camera_platform_interface` package (flutter#3253)
  [camera] Support Android 30 (flutter#3299)
  bump integration test to 1.0.0 (flutter#3295)
  [android_alarm_manager] fix AndroidManifest.xml for android lint issue "XML tag has empty body" (flutter#3288)
  Use testWidgets instead of test to fix failures not surfacing on CI (flutter#3279)
  [file_selector_platform_interface] Migrate to cross_file package (flutter#3286)
  Fix broken link (flutter#3280)
  ...

Author: samandmoore

.ci/Dockerfile-LinuxDesktop

@@ -21,3 +21,11 @@ RUN sudo apt-get install -y xvfb libegl1-mesa
 RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
 # Install necessary libraries.
 RUN sudo apt-get install -y libgtk-3-dev
+
+# Add repo for Google Chrome and install it, for url_launcher tests.
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
+RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends google-chrome-stable
+# Make it the default so http: has a handler.
+RUN sudo apt-get install -y xdg-utils
+RUN xdg-settings set default-web-browser google-chrome.desktop

.ci/dev/README.md

@@ -0,0 +1,19 @@
+This directory contains resources that the Flutter team uses during 
+the development of plugins.
+
+## Luci builder file
+`try_builders.json` contains the supported luci try builders 
+for plugins. It follows format:
+```json
+{
+    "builders":[
+        {
+            "name":"yyy",
+            "repo":"plugins",
+            "enabled":true
+        }
+    ]
+}
+```
+This file will be mainly used in [`flutter/cocoon`](https://github.com/flutter/cocoon) 
+to trigger/update pre-submit luci tasks.

.ci/dev/try_builders.json

@@ -0,0 +1,9 @@
+{
+   "builders":[
+      {
+         "name":"Windows Plugins",
+         "repo":"plugins",
+         "enabled":true
+      }
+   ]
+}

.cirrus.yml

@@ -7,7 +7,7 @@ task:
     cpu: 8
     memory: 16G
   env:
-    E2E_PATH: "./packages/e2e"
+    INTEGRATION_TEST_PATH: "./packages/integration_test"
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
@@ -47,9 +47,9 @@ task:
         - if [[ "$CHANNEL" -eq "stable" ]]; then find . | grep _web$ | xargs rm -rf; fi
         - flutter channel $CHANNEL
         - ./script/build_all_plugins_app.sh apk
-    - name: e2e_web_smoke_test
-      # Tests e2e example test in web.
-      only_if: "changesInclude('.cirrus.yml', 'packages/e2e/**') || $CIRRUS_PR == ''"
+    - name: integration_web_smoke_test
+      # Tests integration example test in web.
+      only_if: "changesInclude('.cirrus.yml', 'packages/integration_test/**') || $CIRRUS_PR == ''"
       install_script:
         - flutter config --enable-web
         - git clone https://github.com/flutter/web_installers.git
@@ -58,13 +58,15 @@ task:
         - dart lib/web_driver_installer.dart chromedriver --install-only
         - ./chromedriver/chromedriver --port=4444 &
       test_script:
-        - cd $E2E_PATH/example/
-        - flutter drive -v --target=test_driver/example_e2e.dart -d web-server --release --browser-name=chrome
+        - cd $INTEGRATION_TEST_PATH/example/
+        - flutter drive -v --driver=test_driver/integration_test.dart --target=integration_test/example_test.dart -d web-server --release --browser-name=chrome
     - name: build-apks+java-test+firebase-test-lab
       env:
         matrix:
-          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
-          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
+          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: "stable"
@@ -91,7 +93,7 @@ task:
         -   echo "This user does not have permission to run Firebase Test Lab tests."
         - else
         -   echo $GCLOUD_FIREBASE_TESTLAB_KEY > ${HOME}/gcloud-service-key.json
-        -   ./script/incremental_build.sh firebase-test-lab
+        -   ./script/incremental_build.sh firebase-test-lab --device model=flame,version=29 --device model=starqlteue,version=26
         - fi
         - export CIRRUS_CHANGE_MESSAGE=`cat /tmp/cirrus_change_message.txt`
         - export CIRRUS_COMMIT_MESSAGE=`cat /tmp/cirrus_commit_message.txt`
@@ -105,7 +107,7 @@ task:
     cpu: 8
     memory: 16G
   env:
-    E2E_PATH: "./packages/e2e"
+    INTEGRATION_TEST_PATH: "./packages/integration_test"
   upgrade_script:
     - flutter channel stable
     - flutter upgrade
@@ -157,10 +159,11 @@ task:
         - 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 --no-analyze camera --ignore-warnings camera
+        - ./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"
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
@@ -177,6 +180,7 @@ task:
         - flutter channel $CHANNEL
         - ./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
 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 == ''

.clang-format

@@ -0,0 +1 @@
+BasedOnStyle: Google

.gitignore

@@ -37,6 +37,7 @@ gradle-wrapper.jar
 generated_plugin_registrant.dart
 GeneratedPluginRegistrant.h
 GeneratedPluginRegistrant.m
+generated_plugin_registrant.cc
 GeneratedPluginRegistrant.java
 GeneratedPluginRegistrant.swift
 build/

AUTHORS

@@ -58,4 +58,5 @@ Théo Champion <[email protected]>
 Kazuki Yamaguchi <[email protected]>
 Eitan Schwartz <[email protected]>
 Chris Rutkowski <[email protected]>
+Juan Alvarez <[email protected]>
 Jorge Galvão <[email protected]>

CODEOWNERS

@@ -4,22 +4,24 @@
 # 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/device_info/*                        @matthew-carroll
-packages/e2e/*                                @collinjackson @digiter
-packages/espresso/*                           @collinjackson @adazh
-packages/google_maps_flutter/*                @cyanglaz
-packages/google_sign_in/*                     @cyanglaz @mehmetf
-packages/image_picker/*                       @cyanglaz
-packages/in_app_purchase/*                    @mklim @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
+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/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

@@ -40,6 +40,28 @@ USB and debugging enabled on that device.
  * `cd packages/battery/example`
  * `flutter run`
 
+## Setting up XCUITests
+
+Sometimes, XCUITests are useful when integration testing a plugin that has native UI on iOS (e.g image_picker, in_app_purchase, camera, share, local_auth etc). Most of the time, XCUITests are not necessary, consider using [integration_test](https://pub.dev/packages/integration_test) if the tests are not focused on iOS system UI.
+
+If XCUITests has always been set up for the plugin, a RunnerUITests folder under `<the_plugin>/example/ios` directory can be found.
+If XCUITests has not been set up for the plugin, follow these steps to set it up:
+
+1. Open <path_to_plugin>/example/ios/Runner.xcworkspace using XCode.
+1. Create a new "UI Testing Bundle".
+1. In the target options window, populate details as following, then click on "Finish".
+  * In the "product name" field, type in "RunnerUITests" (this is the test target name our CI looks for.).
+  * In the "Team" field, select "None".
+  * In the Organization Name field, type in "Flutter". This should usually be pre-populated.
+  * In the organization identifer field, type in "com.google". This should usually be pre-populated.
+  * In the Language field, select "Objective-C".
+  * In the Project field, select the xcodeproj "Runner" (blue color).
+  * In the Target to be Tested, select xcworkspace "Runner" (white color).
+1. A RunnerUITests folder should be created and you can start hacking in `RunnerUITests.m`.
+1. To enable the test on CI, the plugin needs to be removed from the "skip" list:
+  * Open `./cirrus.yml` and find PLUGINS_TO_SKIP_XCTESTS.
+  * Remove the plugin name from the list.
+
 ## Running the tests
 
 ### Integration tests
@@ -84,6 +106,26 @@ cd android
 ./gradlew test
 ```
 
+### XCTests (iOS)
+
+XCUnitTests are typically configured to run with cocoapods in this repo. To run all the XCUnitTests for a plugin:
+
+```console
+cd ios
+pod lib lint --allow-warnings
+```
+
+XCUITests aren't usually configured with cocoapods in this repo. They are configured in a xcode workspace target named RunnerUITests.
+To run all the XCUITests in a plugin, follow the steps in a regular iOS development workflow [here](https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/testing_with_xcode/chapters/05-running_tests.html)
+
+For convenience, a [flutter_plugin_tools](https://pub.dev/packages/flutter_plugin_tools) command `xctest` could also be used to run all the XCUITests in the repo:
+
+```console
+pub global activate flutter_plugin_tools
+cd <path_to_plugins>/packages
+pub global run flutter_plugin_tools xctest --target RunnerUITests --skip <plugins_to_skip>
+```
+
 ## Contributing code
 
 We gladly accept contributions via GitHub pull requests.

LICENSE

@@ -1,27 +1,25 @@
 Copyright 2017 The Chromium Authors. All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.