Merge branch 'main' into dependabot/gradle/packages/path_provider/pat…

…h_provider_android/android/junit-junit-4.13.2

.ci.yaml

@@ -13,15 +13,15 @@ platform_properties:
     properties:
       dependencies: >
         [
-          {"dependency": "curl"}
+          {"dependency": "curl", "version": "version:7.64.0"}
         ]
       device_type: none
       os: Linux
   windows:
     properties:
       dependencies: >
         [
-          {"dependency": "certs"}
+          {"dependency": "certs", "version": "version:9563bb"}
         ]
       device_type: none
       os: Windows
@@ -37,7 +37,7 @@ targets:
       version_file: flutter_master.version
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows win32-platform_tests stable
@@ -49,7 +49,7 @@ targets:
       channel: stable
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows windows-build_all_plugins master
@@ -62,7 +62,7 @@ targets:
       version_file: flutter_master.version
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows windows-build_all_plugins stable
@@ -74,7 +74,7 @@ targets:
       channel: stable
       dependencies: >
         [
-          {"dependency": "vs_build"}
+          {"dependency": "vs_build", "version": "version:vs2019"}
         ]
 
   - name: Windows plugin_tools_tests

.ci/flutter_master.version

@@ -1 +1 @@
-52c47e96a33df14a5f43216fa88cf2165ea4d659
+1b2ee411aa1389e74c7c2aada90bc468781532d2

.ci/scripts/prepare_tool.sh

@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 # To set FETCH_HEAD for "git merge-base" to work
-git fetch origin master
+git fetch origin main
 
 cd script/tool
 dart pub get

.cirrus.yml

@@ -86,9 +86,6 @@ task:
         - dart pub run test
     - name: publishable
       env:
-        # TODO (mvanbeusekom): Temporary override to "stable" because of failure on "master".
-        # Remove override once https://github.com/dart-lang/pub/issues/3152 is resolved.
-        CHANNEL: stable
         CHANGE_DESC: "$TMPDIR/change-description.txt"
       version_check_script:
         # For pre-submit, pass the PR description to the script to allow for

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,15 +21,15 @@
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[Contributor Guide]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md
+[Contributor Guide]: https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md
 [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
-[relevant style guides]: https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md#style
+[relevant style guides]: https://github.com/flutter/plugins/blob/main/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
 [exempt from version changes]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates
 [following repository CHANGELOG style]: https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style
-[the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
+[the auto-formatter]: https://github.com/flutter/plugins/blob/main/script/tool/README.md#format-code
 [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to Flutter Plugins
 
-[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
+[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/main)
 
 _See also: [Flutter's code of conduct](https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md)_
 
@@ -35,7 +35,7 @@ use, and use auto-formatters:
 - [C++](https://google.github.io/styleguide/cppguide.html) formatted with `clang-format`
   - **Note**: The Linux plugins generally follow idiomatic GObject-based C
     style. See [the engine style
-    notes](https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style)
+    notes](https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style)
     for more details, and exceptions.
 - [Java](https://google.github.io/styleguide/javaguide.html) formatted with
   `google-java-format`

README.md

@@ -1,6 +1,6 @@
 # Flutter plugins
 
-[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/master)
+[![Build Status](https://api.cirrus-ci.com/github/flutter/plugins.svg)](https://cirrus-ci.com/github/flutter/plugins/main)
 [![Release Status](https://github.com/flutter/plugins/actions/workflows/release.yml/badge.svg)](https://github.com/flutter/plugins/actions/workflows/release.yml)
 
 This repo is a companion repo to the main [flutter
@@ -34,7 +34,7 @@ is ready, you can [publish](https://flutter.dev/developing-packages/#publish) it
 to the [pub repository](https://pub.dev/).
 
 If you wish to contribute a change to any of the existing plugins in this repo,
-please review our [contribution guide](https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md),
+please review our [contribution guide](https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md),
 and send a [pull request](https://github.com/flutter/plugins/pulls).
 
 ## Plugins

packages/camera/camera/README.md

@@ -59,7 +59,7 @@ For web integration details, see the
 
 ### Handling Lifecycle states
 
-As of version [0.5.0](https://github.com/flutter/plugins/blob/master/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
+As of version [0.5.0](https://github.com/flutter/plugins/blob/main/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
 
 <?code-excerpt "main.dart (AppLifecycle)"?>
 ```dart

packages/camera/camera_web/lib/src/shims/dart_ui_fake.dart

@@ -11,21 +11,21 @@ import 'dart:html' as html;
 // ignore_for_file: camel_case_types
 
 /// Shim for web_ui engine.PlatformViewRegistry
-/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L62
+/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L62
 class platformViewRegistry {
   /// Shim for registerViewFactory
-  /// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L72
+  /// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L72
   static bool registerViewFactory(
       String viewTypeId, html.Element Function(int viewId) viewFactory) {
     return false;
   }
 }
 
 /// Shim for web_ui engine.AssetManager.
-/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L12
+/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L12
 class webOnlyAssetManager {
   /// Shim for getAssetUrl.
-  /// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L45
+  /// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L45
   static String getAssetUrl(String asset) => '';
 }
 

packages/camera/camera_windows/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0+2
+
+* Updates references to the obsolete master branch.
+
 ## 0.1.0+1
 
 * Removes unnecessary imports.

packages/camera/camera_windows/pubspec.yaml

@@ -1,8 +1,8 @@
 name: camera_windows
 description: A Flutter plugin for getting information about and controlling the camera on Windows.
-repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera_windows
+repository: https://github.com/flutter/plugins/tree/main/packages/camera/camera_windows
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.1.0+1
+version: 0.1.0+2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/e2e/README.md

@@ -1,3 +1,3 @@
 # e2e (deprecated)
 
-This package has been moved to [integration_test](https://github.com/flutter/plugins/tree/master/packages/integration_test).
+This package has been moved to [`integration_test` in the Flutter SDK](https://github.com/flutter/flutter/tree/master/packages/integration_test).

packages/espresso/android/src/main/java/androidx/test/espresso/flutter/internal/protocol/impl/DartVmService.java

@@ -42,7 +42,7 @@
  * An implementation of the Espresso-Flutter testing protocol by using the testing APIs exposed by
  * Dart VM service protocol.
  *
- * @see <a href="https://github.com/dart-lang/sdk/blob/master/runtime/vm/service/service.md">Dart VM
+ * @see <a href="https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/service.md">Dart VM
  *     Service Protocol</a>.
  */
 public final class DartVmService implements FlutterTestingProtocol {

packages/espresso/android/src/main/java/androidx/test/espresso/flutter/internal/protocol/impl/GetVmResponse.java

@@ -15,7 +15,7 @@
 
 /**
  * Represents a response of a <a
- * href="https://github.com/dart-lang/sdk/blob/master/runtime/vm/service/service.md#getvm">getVM()</a>
+ * href="https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/service.md#getvm">getVM()</a>
  * request.
  */
 public class GetVmResponse {

packages/file_selector/file_selector_macos/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.2+2
+
+* Updates references to the obsolete master branch.
+
 ## 0.8.2+1
 
 * Removes unnecessary imports.

packages/file_selector/file_selector_macos/pubspec.yaml

@@ -1,8 +1,8 @@
 name: file_selector_macos
 description: macOS implementation of the file_selector plugin.
-repository: https://github.com/flutter/plugins/tree/master/packages/file_selector/file_selector_macos
+repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_macos
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
-version: 0.8.2+1
+version: 0.8.2+2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/file_selector/file_selector_windows/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.2+2
+
+* Updates references to the obsolete master branch.
+
 ## 0.8.2+1
 
 * Removes unnecessary imports.

packages/file_selector/file_selector_windows/pubspec.yaml

@@ -1,8 +1,8 @@
 name: file_selector_windows
 description: Windows implementation of the file_selector plugin.
-repository: https://github.com/flutter/plugins/tree/master/packages/file_selector/file_selector_windows
+repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/file_selector_windows
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
-version: 0.8.2+1
+version: 0.8.2+2
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/google_maps_flutter/google_maps_flutter_web/lib/src/shims/dart_ui_fake.dart

@@ -11,21 +11,21 @@ import 'dart:html' as html;
 // ignore_for_file: camel_case_types
 
 /// Shim for web_ui engine.PlatformViewRegistry
-/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L62
+/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L62
 class platformViewRegistry {
   /// Shim for registerViewFactory
-  /// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/ui.dart#L72
+  /// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/ui.dart#L72
   static bool registerViewFactory(
       String viewTypeId, html.Element Function(int viewId) viewFactory) {
     return false;
   }
 }
 
 /// Shim for web_ui engine.AssetManager.
-/// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L12
+/// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L12
 class webOnlyAssetManager {
   /// Shim for getAssetUrl.
-  /// https://github.com/flutter/engine/blob/master/lib/web_ui/lib/src/engine/assets.dart#L45
+  /// https://github.com/flutter/engine/blob/main/lib/web_ui/lib/src/engine/assets.dart#L45
   static String getAssetUrl(String asset) => '';
 }
 

packages/google_sign_in/google_sign_in/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.3.3
+
+* Updates references to the obsolete master branch.
+
 ## 5.3.2
 
 * Enables mocking models by changing overridden operator == parameter type from `dynamic` to `Object`.

packages/google_sign_in/google_sign_in/README.md

@@ -126,4 +126,4 @@ Future<void> _handleSignIn() async {
 ## Example
 
 Find the example wiring in the
-[Google sign-in example application](https://github.com/flutter/plugins/blob/master/packages/google_sign_in/google_sign_in/example/lib/main.dart).
+[Google sign-in example application](https://github.com/flutter/plugins/blob/main/packages/google_sign_in/google_sign_in/example/lib/main.dart).

packages/google_sign_in/google_sign_in/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android and iOS.
 repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 5.3.2
+version: 5.3.3
 
 
 environment:

packages/google_sign_in/google_sign_in_ios/ios/google_sign_in_ios.podspec

@@ -11,7 +11,7 @@ Enables Google Sign-In in Flutter apps.
   s.homepage         = 'https://github.com/flutter/plugins/tree/main/packages/google_sign_in'
   s.license          = { :type => 'BSD', :file => '../LICENSE' }
   s.author           = { 'Flutter Team' => 'flutter-dev@googlegroups.com' }
-  s.source           = { :http => 'https://github.com/flutter/plugins/tree/master/packages/google_sign_in/google_sign_in_ios' }
+  s.source           = { :http => 'https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in_ios' }
   s.source_files = 'Classes/**/*.{h,m}'
   s.public_header_files = 'Classes/**/*.h'
   s.module_map = 'Classes/FLTGoogleSignInPlugin.modulemap'

packages/google_sign_in/google_sign_in_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.1+3
+
+* Updates references to the obsolete master branch.
+
 ## 0.10.1+2
 
 * Minor fixes for new analysis options.

packages/google_sign_in/google_sign_in_web/README.md

@@ -79,19 +79,19 @@ Future<void> _handleSignIn() async {
 
 ## Example
 
-Find the example wiring in the [Google sign-in example application](https://github.com/flutter/plugins/blob/master/packages/google_sign_in/google_sign_in/example/lib/main.dart).
+Find the example wiring in the [Google sign-in example application](https://github.com/flutter/plugins/blob/main/packages/google_sign_in/google_sign_in/example/lib/main.dart).
 
 ## API details
 
-See the [google_sign_in.dart](https://github.com/flutter/plugins/blob/master/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart) for more API details.
+See the [google_sign_in.dart](https://github.com/flutter/plugins/blob/main/packages/google_sign_in/google_sign_in/lib/google_sign_in.dart) for more API details.
 
 ## Contributions and Testing
 
 Tests are crucial for contributions to this package. All new contributions should be reasonably tested.
 
-**Check the [`test/README.md` file](https://github.com/flutter/plugins/blob/master/packages/google_sign_in/google_sign_in_web/test/README.md)** for more information on how to run tests on this package.
+**Check the [`test/README.md` file](https://github.com/flutter/plugins/blob/main/packages/google_sign_in/google_sign_in_web/test/README.md)** for more information on how to run tests on this package.
 
-Contributions to this package are welcome. Read the [Contributing to Flutter Plugins](https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md) guide to get started.
+Contributions to this package are welcome. Read the [Contributing to Flutter Plugins](https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md) guide to get started.
 
 ## Issues and feedback
 

packages/google_sign_in/google_sign_in_web/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Google Sign-In, a secure authentication system
   for signing in with a Google account on Android, iOS and Web.
 repository: https://github.com/flutter/plugins/tree/main/packages/google_sign_in/google_sign_in_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_sign_in%22
-version: 0.10.1+2
+version: 0.10.1+3
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/in_app_purchase/in_app_purchase/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.5
+
+* Updates references to the obsolete master branch.
+
 ## 3.0.4
 
 * Minor fixes for new analysis options.

packages/in_app_purchase/in_app_purchase/README.md

@@ -10,10 +10,10 @@ which can be the App Store (on iOS) or Google Play (on Android).
 | **Support** | SDK 16+ | 9.0+ |
 
 <p>
-  <img src="https://github.com/flutter/plugins/blob/master/packages/in_app_purchase/in_app_purchase/doc/iap_ios.gif?raw=true"
+  <img src="https://github.com/flutter/plugins/blob/main/packages/in_app_purchase/in_app_purchase/doc/iap_ios.gif?raw=true"
     alt="An animated image of the iOS in-app purchase UI" height="400"/>
   &nbsp;&nbsp;&nbsp;&nbsp;
-  <img src="https://github.com/flutter/plugins/blob/master/packages/in_app_purchase/in_app_purchase/doc/iap_android.gif?raw=true"
+  <img src="https://github.com/flutter/plugins/blob/main/packages/in_app_purchase/in_app_purchase/doc/iap_android.gif?raw=true"
    alt="An animated image of the Android in-app purchase UI" height="400"/>
 </p>
 
@@ -41,7 +41,7 @@ your app with each store. Both stores have extensive guides:
 > to a particular store.
 
 For a list of steps for configuring in-app purchases in both stores, see the
-[example app README](https://github.com/flutter/plugins/blob/master/packages/in_app_purchase/in_app_purchase/example/README.md).
+[example app README](https://github.com/flutter/plugins/blob/main/packages/in_app_purchase/in_app_purchase/example/README.md).
 
 Once you've configured your in-app purchases in their respective stores, you
 can start using the plugin. Two basic options are available:
@@ -426,4 +426,4 @@ iosPlatformAddition.presentCodeRedemptionSheet();
 ## Contributing to this plugin
 
 If you would like to contribute to the plugin, check out our
-[contribution guide](https://github.com/flutter/plugins/blob/master/CONTRIBUTING.md).
+[contribution guide](https://github.com/flutter/plugins/blob/main/CONTRIBUTING.md).

packages/in_app_purchase/in_app_purchase/pubspec.yaml

@@ -2,7 +2,7 @@ name: in_app_purchase
 description: A Flutter plugin for in-app purchases. Exposes APIs for making in-app purchases through the App Store and Google Play.
 repository: https://github.com/flutter/plugins/tree/main/packages/in_app_purchase/in_app_purchase
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
-version: 3.0.4
+version: 3.0.5
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.2+7
+
+* Updates references to the obsolete master branch.
+
 ## 0.2.2+6
 
 * Enables mocking models by changing overridden operator == parameter type from `dynamic` to `Object`.