Merge branch 'flutter:master' into master

Author: jerryrt

.ci.yaml

@@ -0,0 +1,16 @@
+# Describes the targets run in continuous integration environment.
+#
+# Flutter infra uses this file to generate a checklist of tasks to be performed
+# for every commit.
+#
+# More information at:
+#  * https://github.com/flutter/cocoon/blob/master/scheduler/README.md
+enabled_branches:
+  - master
+
+targets:
+  - name: Windows Plugins
+    builder: Windows Plugins
+    postsubmit: false
+    scheduler: luci
+

.ci/dev/README.md

@@ -4,15 +4,14 @@ gcp_credentials: ENCRYPTED[ec898795b6f1b54f9cc2ab4104909f1053651f65fcab96397cfdc
 # number of plugins
 only_if: $CIRRUS_TAG == ''
 env:
-  INTEGRATION_TEST_PATH: "./packages/integration_test"
   CHANNEL: "master" # Default to master when not explicitly set by a task.
   PLUGIN_TOOLS: "dart run ./script/tool/lib/src/main.dart"
 
 tool_setup_template: &TOOL_SETUP_TEMPLATE
   tool_setup_script:
     - git fetch origin master # To set FETCH_HEAD for "git merge-base" to work
     - cd script/tool
-    - pub get
+    - dart pub get
 
 flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
   upgrade_flutter_script:
@@ -25,7 +24,7 @@ macos_template: &MACOS_TEMPLATE
   # PRs on macOS.
   use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true'
   osx_instance:
-    image: big-sur-xcode-12.3
+    image: big-sur-xcode-12.5
   cocoapod_install_script: sudo gem install cocoapods
 
 # Light-workload Linux tasks.
@@ -48,41 +47,30 @@ task:
         - CIRRUS_BUILD_ID=null pub run test
     - name: publishable
       script:
-        - if [[ "$CIRRUS_BRANCH" == "master" ]]; then
-        -   $PLUGIN_TOOLS version-check
-        - else
-        -   $PLUGIN_TOOLS version-check --run-on-changed-packages
-        - fi
-        - ./script/check_publish.sh
+        - ./script/tool_runner.sh version-check
+        - ./script/tool_runner.sh publish-check
     - name: format
-      format_script: ./script/incremental_build.sh format --fail-on-change
+      format_script: ./script/tool_runner.sh format --fail-on-change
+      pubspec_script: ./script/tool_runner.sh pubspec-check
       license_script:
-        - cd script/tool
-        - pub get
-        - cd ../..
         - dart script/tool/lib/src/main.dart license-check
     - name: test
       env:
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
       test_script:
-        - ./script/incremental_build.sh test
-    - name: analyze_master
+        - ./script/tool_runner.sh test
+    - name: analyze
       env:
         matrix:
           CHANNEL: "master"
-      script:
-        - ./script/incremental_build.sh analyze
-    ## TODO(cyanglaz):
-    ## Combing stable and master analyze jobs when integration test null safety is ready on flutter stable.
-    - name: analyze_stable
-      env:
-        matrix:
           CHANNEL: "stable"
+      tool_script:
+        - cd script/tool
+        - dart analyze --fatal-infos
       script:
-        - find . -depth -type d -wholename '*_web/example' -exec rm -rf {} \;
-        - ./script/incremental_build.sh analyze
+        - ./script/tool_runner.sh analyze
     ### Android tasks ###
     - name: build_all_plugins_apk
       env:
@@ -115,9 +103,9 @@ task:
           CHANNEL: "stable"
       build_script:
         - flutter config --enable-linux-desktop
-        - ./script/incremental_build.sh build-examples --linux
-      test_script:
-        - xvfb-run ./script/incremental_build.sh drive-examples --linux
+        - ./script/tool_runner.sh build-examples --linux
+      drive_script:
+        - xvfb-run ./script/tool_runner.sh drive-examples --linux
 
 # Heavy-workload Linux tasks.
 # These use machines with more CPUs and memory, so will reduce parallelization
@@ -158,11 +146,11 @@ task:
         - echo "$CIRRUS_COMMIT_MESSAGE" > /tmp/cirrus_commit_message.txt
         - export CIRRUS_CHANGE_MESSAGE=""
         - export CIRRUS_COMMIT_MESSAGE=""
-        - ./script/incremental_build.sh build-examples --apk
-        - ./script/incremental_build.sh java-test  # must come after apk build
+        - ./script/tool_runner.sh build-examples --apk
+        - ./script/tool_runner.sh java-test  # must come after apk build
         - 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
+        -   ./script/tool_runner.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
@@ -171,30 +159,32 @@ task:
     ### Web tasks ###
     - name: build-web+drive-examples
       env:
+        # Currently missing; see https://github.com/flutter/flutter/issues/81982
+        # and https://github.com/flutter/flutter/issues/82211
+        PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS: "file_selector,image_picker_for_web,shared_preferences_web"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
       install_script:
         - git clone https://github.com/flutter/web_installers.git
         - cd web_installers/packages/web_drivers/
-        - pub get
+        - dart pub get
         - dart lib/web_driver_installer.dart chromedriver --install-only
         - ./chromedriver/chromedriver --port=4444 &
       build_script:
-        - ./script/incremental_build.sh build-examples --web
-      test_script:
-        # TODO(stuartmorgan): Eliminate this check once 2.1 reaches stable.
-        - if [[ "$CHANNEL" == "master" ]]; then
-        -   ./script/incremental_build.sh drive-examples --web
-        - else
-        -   echo "Requires null-safe integration_test; skipping."
-        - fi
+        - ./script/tool_runner.sh build-examples --web
+      drive_script:
+        - ./script/tool_runner.sh drive-examples --web --exclude $PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS
 
 # macOS tasks.
 task:
   << : *MACOS_TEMPLATE
   << : *FLUTTER_UPGRADE_TEMPLATE
   matrix:
+    ### iOS+macOS tasks ***
+    - name: lint_darwin_plugins
+      script:
+        - ./script/tool_runner.sh podspecs
     ### iOS tasks ###
     - name: build_all_plugins_ipa
       env:
@@ -206,7 +196,10 @@ task:
     - name: build-ipas+drive-examples
       env:
         PATH: $PATH:/usr/local/bin
-        PLUGINS_TO_SKIP_XCTESTS: "integration_test"
+        # in_app_purchase_ios is currently missing tests; see https://github.com/flutter/flutter/issues/81695
+        # ios_platform_images is currently missing tests; see https://github.com/flutter/flutter/issues/82208
+        # sensor hangs on CI.
+        PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS: "in_app_purchase_ios,ios_platform_images,sensors"
         matrix:
           PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
           PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"
@@ -218,15 +211,16 @@ task:
         SIMCTL_CHILD_MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
       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
+        - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-11 com.apple.CoreSimulator.SimRuntime.iOS-14-5 | xargs xcrun simctl boot
       build_script:
-        - ./script/incremental_build.sh build-examples --ipa
-      test_script:
-        - ./script/incremental_build.sh xctest --skip $PLUGINS_TO_SKIP_XCTESTS --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
+        - ./script/tool_runner.sh build-examples --ipa
+      xctest_script:
+        - ./script/tool_runner.sh xctest --ios --ios-destination "platform=iOS Simulator,name=iPhone 11,OS=latest"
+      drive_script:
         # `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
+        - ./script/tool_runner.sh drive-examples --ios --exclude $PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS
     ### macOS desktop tasks ###
     - name: build_all_plugins_macos
       env:
@@ -238,23 +232,17 @@ task:
         - ./script/build_all_plugins_app.sh macos
     - name: build-macos+drive-examples
       env:
+        # conncectivity_macos is deprecated, so is not getting unit test backfill.
+        # package_info is deprecated, so is not getting unit test backfill.
+        PLUGINS_TO_EXCLUDE_MACOS_XCTESTS: "connectivity_macos,package_info"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
         PATH: $PATH:/usr/local/bin
       build_script:
         - flutter config --enable-macos-desktop
-        - ./script/incremental_build.sh build-examples --macos --no-ipa
-      test_script:
-        - ./script/incremental_build.sh drive-examples --macos
-
-task:
-  # Don't use FLUTTER_UPGRADE_TEMPLATE, Flutter tooling not needed.
-  << : *MACOS_TEMPLATE
-  << : *TOOL_SETUP_TEMPLATE
-  matrix:
-    - name: lint_darwin_plugins
-      script:
-        # TODO(jmagman): Lint macOS podspecs but skip any that fail library validation.
-        - find . -name "*.podspec" | xargs grep -l "osx" | xargs rm
-        - ./script/incremental_build.sh podspecs
+        - ./script/tool_runner.sh build-examples --macos --no-ipa
+      xctest_script:
+        - ./script/tool_runner.sh xctest --macos --exclude $PLUGINS_TO_EXCLUDE_MACOS_XCTESTS
+      drive_script:
+        - ./script/tool_runner.sh drive-examples --macos

.ci/dev/try_builders.json

@@ -8,7 +8,7 @@
 
 - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
 - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
-- [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides].
+- [ ] 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`.)
 - [ ] I signed the [CLA].
 - [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
 - [ ] I listed at least one issue that this PR fixes in the description above.
@@ -21,12 +21,12 @@
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
+[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
 [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
-[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
-[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style
+[relevant style guides]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md#style
 [CLA]: https://cla.developers.google.com/
 [flutter/tests]: https://github.com/flutter/tests
 [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
 [Discord]: https://github.com/flutter/flutter/wiki/Chat
 [pub versioning philosophy]: https://dart.dev/tools/pub/versioning
+[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code

.cirrus.yml

@@ -19,9 +19,6 @@
 'p: device_info':
   - packages/device_info/**/*
 
-'p: e2e':
-  - packages/e2e/**/*
-
 'p: espresso':
   - packages/espresso/**/*
 
@@ -43,9 +40,6 @@
 'p: in_app_purchase':
   - packages/in_app_purchase/**/*
 
-'p: integration_test':
-  - packages/integration_test/**/*
-
 'p: ios_platform_images':
   - packages/ios_platform_images/**/*
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,2 +1,2 @@
 'needs-publishing':
-  - packages/*/**
+  - packages/**/pubspec.yaml