Merge branch 'master' into add_zoom_to_android_webview

* master: (76 commits) Add plugin issue query to README (flutter#3493) Automatically add platform labels (flutter#3487) Migrate shared_preferences_platform_interfaces to null safety (flutter#3466) Remove Dart stubs from macOS plugins (flutter#3491) [path_provider_windows] Resolve FFI stabilization changes (flutter#3485) [local_auth] Fix incorrect switch fallthrough (flutter#3473) Remove amirh from CODEOWNERS (flutter#3484) [url_launcher_web] Fix Link misalignment issue (flutter#3476) [ci][image_picker][webviews_flutter] enable Xcode 12 (flutter#3461) [url_launcher] Update description in pubspec.yaml (flutter#2858) [integration_test] Fix tests from changes to `flutter test` machine output (flutter#3480) [package_info] Register IntegrationTestPlugin in the example app. (flutter#3478) [ci] fix ci failure on ios builds (flutter#3470) Reland "[cross_file] Migrate to null-safety. (flutter#3452)" (flutter#3469) Revert "[cross_file] Migrate to null-safety. (flutter#3452)" (flutter#3468) [image_picker_platform_interface] fix test asset file location (flutter#3467) [cross_file] Migrate to null-safety. (flutter#3452) [path_provider] drop uuid (flutter#3465) [cross_file] Use Uri when calling package:http methods (flutter#3462) bump vmservice (flutter#3463) ... # Conflicts: # packages/webview_flutter/CHANGELOG.md
NickalasB · Feb 2, 2021 · e29b045 · e29b045
2 parents df9a0a9 + a87497f
commit e29b045
Show file tree

Hide file tree

Showing 281 changed files with 8,787 additions and 1,644 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -134,11 +134,12 @@ 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
@@ -149,7 +150,7 @@ task:
   activate_script: pub global activate flutter_plugin_tools
   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:
@@ -162,17 +163,6 @@ task:
         - 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
@@ -191,15 +181,49 @@ task:
         # 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"
+
 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
+  activate_script: pub global activate flutter_plugin_tools
+  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:

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,37 +1,32 @@
-## Description
+*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.*
 
-*Replace this paragraph with a description of what this PR is doing. If you're modifying existing behavior, describe the existing behavior, how this PR is changing it, and what motivated the change.*
+*List which issues are fixed by this PR. You must list at least one issue.*
 
-## Related Issues
+*If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
 
-*Replace this paragraph with a list of issues related to this PR from the [issue database](https://github.com/flutter/flutter/issues). Indicate, which of these issues are resolved or fixed by this PR. Note that you'll have to prefix the issue numbers with flutter/flutter#.*
-
-## Checklist
-
-Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
+## Pre-launch Checklist
 
+- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. `[shared_preferences]`
 - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
-- [ ] My PR includes unit or integration tests for *all* changed/updated/fixed behaviors (See [Contributor Guide]).
-- [ ] All existing and new tests are passing.
-- [ ] I updated/added relevant documentation (doc comments with `///`).
-- [ ] The analyzer (`flutter analyze`) does not report any problems on my PR.
-- [ ] I read and followed the [Flutter Style Guide].
-- [ ] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
+- [ ] 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 listed at least one issue that this PR fixes in the description above.
+- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
 - [ ] I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
 - [ ] I updated CHANGELOG.md to add a description of the change.
+- [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] I signed the [CLA].
-- [ ] I am willing to follow-up on review comments in a timely manner.
-
-## Breaking Change
-
-Does your PR require plugin users to manually update their apps to accommodate your change?
+- [ ] All existing and new tests are passing.
 
-- [ ] Yes, this is a breaking change (please indicate a breaking change in CHANGELOG.md and increment major revision).
-- [ ] No, this is *not* a breaking change.
+If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[issue database]: https://github.com/flutter/flutter/issues
-[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
+[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
+[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
 [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
-[pub versioning philosophy]: https://www.dartlang.org/tools/pub/versioning
+[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/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
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,110 @@
+'p: android_alarm_manager':
+  - packages/android_alarm_manager/**/*
+
+'p: android_intent':
+  - packages/android_intent/**/*
+
+'p: battery':
+  - packages/battery/**/*
+
+'p: camera':
+  - packages/camera/**/*
+
+'p: connectivity':
+  - packages/connectivity/**/*
+
+'p: cross_file':
+  - packages/cross_file/**/*
+
+'p: device_info':
+  - packages/device_info/**/*
+
+'p: e2e':
+  - packages/e2e/**/*
+
+'p: espresso':
+  - packages/espresso/**/*
+
+'p: file_selector':
+  - packages/file_selector/**/*
+
+'p: flutter_plugin_android_lifecycle':
+  - packages/flutter_plugin_android_lifecycle/**/*
+
+'p: google_maps_flutter':
+  - packages/google_maps_flutter/**/*
+
+'p: google_sign_in':
+  - packages/google_sign_in/**/*
+
+'p: image_picker':
+  - packages/image_picker/**/*
+
+'p: in_app_purchase':
+  - packages/in_app_purchase/**/*
+
+'p: integration_test':
+  - packages/integration_test/**/*
+
+'p: ios_platform_images':
+  - packages/ios_platform_images/**/*
+
+'p: local_auth':
+  - packages/local_auth/**/*
+
+'p: package_info':
+  - packages/package_info/**/*
+
+'p: path_provider':
+  - packages/path_provider/**/*
+
+'p: plugin_platform_interface':
+  - packages/plugin_platform_interface/**/*
+
+'p: quick_actions':
+  - packages/quick_actions/**/*
+
+'p: sensors':
+  - packages/sensors/**/*
+
+'p: share':
+  - packages/share/**/*
+
+'p: shared_preferences':
+  - packages/shared_preferences/**/*
+
+'p: url_launcher':
+  - packages/url_launcher/**/*
+
+'p: video_player':
+  - packages/video_player/**/*
+
+'p: webview_flutter':
+  - packages/webview_flutter/**/*
+
+'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/**/*
diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml
@@ -0,0 +1,20 @@
+# 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.
+#
+# For more information, see: https://github.com/actions/labeler
+
+name: Pull Request Labeler
+
+on:
+  - pull_request_target
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@main
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        sync-labels: true
diff --git a/AUTHORS b/AUTHORS
@@ -59,3 +59,5 @@ Kazuki Yamaguchi <y.kazuki0614n@gmail.com>
 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>
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -6,7 +6,7 @@
 
 packages/android_alarm_manager/**              @bkonyi
 packages/android_intent/**                     @mklim @matthew-carroll
-packages/battery/**                            @amirh @matthew-carroll
+packages/battery/**                            @matthew-carroll
 packages/camera/**                             @bparrishMines
 packages/connectivity/**                       @cyanglaz @matthew-carroll
 packages/cross_file/**                         @ditman @mvanbeusekom
@@ -24,4 +24,3 @@ packages/path_provider/**                      @matthew-carroll
 packages/shared_preferences/**                 @matthew-carroll
 packages/url_launcher/**                       @mklim
 packages/video_player/**                       @iskakaushik @cyanglaz
-packages/webview_flutter/**                    @amirh
diff --git a/README.md b/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

diff --git a/packages/android_alarm_manager/CHANGELOG.md b/packages/android_alarm_manager/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.5+20
+
+* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
+
 ## 0.4.5+19
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))

diff --git a/packages/android_alarm_manager/example/lib/main.dart b/packages/android_alarm_manager/example/lib/main.dart
@@ -131,7 +131,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> {
                 ),
               ],
             ),
-            RaisedButton(
+            ElevatedButton(
               child: Text(
                 'Schedule OneShot Alarm',
               ),

diff --git a/packages/android_alarm_manager/pubspec.yaml b/packages/android_alarm_manager/pubspec.yaml
@@ -4,7 +4,7 @@ description: Flutter plugin for accessing the Android AlarmManager service, and
 # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.4.5+19
+version: 0.4.5+20
 homepage: https://github.com/flutter/plugins/tree/master/packages/android_alarm_manager
 
 dependencies:

diff --git a/packages/android_intent/CHANGELOG.md b/packages/android_intent/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety.2
+
+* Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets.
+
 ## 2.0.0-nullsafety.1
 
 * Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))