Merge remote-tracking branch 'upstream/master' into webview_load_file_wkwebview

Author: mvanbeusekom

.cirrus.yml

@@ -174,10 +174,11 @@ task:
     - name: android-platform_tests
       env:
         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"
+          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 5"
+          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 5"
+          PLUGIN_SHARDING: "--shardIndex 2 --shardCount 5"
+          PLUGIN_SHARDING: "--shardIndex 3 --shardCount 5"
+          PLUGIN_SHARDING: "--shardIndex 4 --shardCount 5"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"
@@ -228,6 +229,9 @@ task:
     ### Web tasks ###
     - name: web-platform_tests
       env:
+        matrix:
+          PLUGIN_SHARDING: "--shardIndex 0 --shardCount 2"
+          PLUGIN_SHARDING: "--shardIndex 1 --shardCount 2"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,14 +8,14 @@
 
 - [ ] 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 [relevant style guides] and ran [the auto-formatter]. (Note that unlike the flutter/flutter repo, the flutter/plugins repo does use `dart format`.)
+- [ ] I read and followed the [relevant style guides] and ran [the auto-formatter]. (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.
-- [ ] I [updated pubspec.yaml](https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#version-and-changelog-updates) with an appropriate new version according to the [pub versioning philosophy].
-- [ ] I updated CHANGELOG.md to add a description of the change.
+- [ ] I updated `pubspec.yaml` with an appropriate new version according to the [pub versioning philosophy], or this PR is [exempt from version changes].
+- [ ] I updated `CHANGELOG.md` to add a description of the change.
 - [ ] I updated/added relevant documentation (doc comments with `///`).
-- [ ] 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 added new tests to check the change I am making, or this PR is [test-exempt].
 - [ ] All existing and new tests are passing.
 
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
@@ -29,4 +29,6 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 [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
 [the auto-formatter]: https://github.com/flutter/plugins/blob/master/script/tool/README.md#format-code
+[test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests

packages/google_maps_flutter/google_maps_flutter/example/ios/RunnerUITests/GoogleMapsUITests.m

@@ -17,6 +17,8 @@ - (void)setUp {
   self.app = [[XCUIApplication alloc] init];
   [self.app launch];
 
+  // The location permission interception is currently not working.
+  // See: https://github.com/flutter/flutter/issues/93325.
   [self
       addUIInterruptionMonitorWithDescription:@"Permission popups"
                                       handler:^BOOL(XCUIElement* _Nonnull interruptingElement) {
@@ -42,7 +44,8 @@ - (void)setUp {
                                       }];
 }
 
-- (void)testUserInterface {
+// Temporarily disabled due to https://github.com/flutter/flutter/issues/93325
+- (void)skip_testUserInterface {
   XCUIApplication* app = self.app;
   XCUIElement* userInteface = app.staticTexts[@"User interface"];
   if (![userInteface waitForExistenceWithTimeout:30.0]) {
@@ -63,4 +66,59 @@ - (void)testUserInterface {
   [compass tap];
 }
 
+- (void)testMapCoordinatesPage {
+  XCUIApplication* app = self.app;
+  XCUIElement* mapCoordinates = app.staticTexts[@"Map coordinates"];
+  if (![mapCoordinates waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find 'Map coordinates''");
+  }
+  [mapCoordinates tap];
+
+  XCUIElement* platformView = app.otherElements[@"platform_view[0]"];
+  if (![platformView waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find platform view");
+  }
+
+  XCUIElement* getVisibleRegionBoundsButton = app.buttons[@"Get Visible Region Bounds"];
+  if (![getVisibleRegionBoundsButton waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find 'Get Visible Region Bounds''");
+  }
+  [getVisibleRegionBoundsButton tap];
+}
+
+- (void)testMapClickPage {
+  XCUIApplication* app = self.app;
+  XCUIElement* mapClick = app.staticTexts[@"Map click"];
+  if (![mapClick waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find 'Map click''");
+  }
+  [mapClick tap];
+
+  XCUIElement* platformView = app.otherElements[@"platform_view[0]"];
+  if (![platformView waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find platform view");
+  }
+
+  [platformView tap];
+
+  XCUIElement* tapped = app.staticTexts[@"Tapped"];
+  if (![tapped waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find 'tapped''");
+  }
+
+  [platformView pressForDuration:5.0];
+
+  XCUIElement* longPressed = app.staticTexts[@"Long pressed"];
+  if (![longPressed waitForExistenceWithTimeout:30.0]) {
+    os_log_error(OS_LOG_DEFAULT, "%@", app.debugDescription);
+    XCTFail(@"Failed due to not able to find 'longPressed''");
+  }
+}
+
 @end

packages/google_maps_flutter/google_maps_flutter/example/lib/map_click.dart

@@ -68,15 +68,27 @@ class _MapClickBodyState extends State<_MapClickBody> {
     if (mapController != null) {
       final String lastTap = 'Tap:\n${_lastTap ?? ""}\n';
       final String lastLongPress = 'Long press:\n${_lastLongPress ?? ""}';
-      columnChildren
-          .add(Center(child: Text(lastTap, textAlign: TextAlign.center)));
+      columnChildren.add(Center(
+          child: Text(
+        lastTap,
+        textAlign: TextAlign.center,
+      )));
+      columnChildren.add(Center(
+          child: Text(
+        _lastTap != null ? 'Tapped' : '',
+        textAlign: TextAlign.center,
+      )));
       columnChildren.add(Center(
           child: Text(
         lastLongPress,
         textAlign: TextAlign.center,
       )));
+      columnChildren.add(Center(
+          child: Text(
+        _lastLongPress != null ? 'Long pressed' : '',
+        textAlign: TextAlign.center,
+      )));
     }
-
     return Column(
       mainAxisAlignment: MainAxisAlignment.start,
       crossAxisAlignment: CrossAxisAlignment.stretch,

packages/package_info/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Remove references to the Android v1 embedding.
 * Updated Android lint settings.
+* Update Android compileSdkVersion to 30.
 
 ## 2.0.2
 
@@ -30,7 +31,7 @@
 
 ## 0.4.3+1
 
-* Update android compileSdkVersion to 29.
+* Update Android compileSdkVersion to 29.
 
 ## 0.4.3
 

packages/package_info/example/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     lintOptions {
         disable 'InvalidPackage'

packages/path_provider/path_provider/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.7
+
+* Moved Android and iOS implementations to federated packages.
+
 ## 2.0.6
 
 * Added support for Background Platform Channels on Android when it is

packages/path_provider/path_provider/android/settings.gradle

@@ -2,7 +2,10 @@ name: path_provider
 description: Flutter plugin for getting commonly used locations on host platform file systems, such as the temp and app data directories.
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.0.6
+version: 2.0.7
+# Temporarily disable publishing to allow moving Android and iOS
+# implementations.
+publish_to: none
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
@@ -12,10 +15,9 @@ flutter:
   plugin:
     platforms:
       android:
-        package: io.flutter.plugins.pathprovider
-        pluginClass: PathProviderPlugin
+        default_package: path_provider_android
       ios:
-        pluginClass: FLTPathProviderPlugin
+        default_package: path_provider_ios
       macos:
         default_package: path_provider_macos
       linux:
@@ -26,6 +28,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
+  # Temporary path dependencies to allow moving Android and iOS implementations.
+  path_provider_android:
+    path: ../path_provider_android
+  path_provider_ios:
+    path: ../path_provider_ios
   path_provider_linux: ^2.0.0
   path_provider_macos: ^2.0.0
   path_provider_platform_interface: ^2.0.0

packages/path_provider/path_provider/pubspec.yaml

@@ -0,0 +1,66 @@
+# Below is a list of people and organizations that have contributed
+# to the Flutter project. Names should be added to the list like so:
+#
+#   Name/Organization <email address>
+
+Google Inc.
+The Chromium Authors
+German Saprykin <[email protected]>
+Benjamin Sauer <[email protected]>
+[email protected]
+Ali Bitek <[email protected]>
+Pol Batlló <[email protected]>
+Anatoly Pulyaevskiy
+Hayden Flinner <[email protected]>
+Stefano Rodriguez <[email protected]>
+Salvatore Giordano <[email protected]>
+Brian Armstrong <[email protected]>
+Paul DeMarco <[email protected]>
+Fabricio Nogueira <[email protected]>
+Simon Lightfoot <[email protected]>
+Ashton Thomas <[email protected]>
+Thomas Danner <[email protected]>
+Diego Velásquez <[email protected]>
+Hajime Nakamura <[email protected]>
+Tuyển Vũ Xuân <[email protected]>
+Miguel Ruivo <[email protected]>
+Sarthak Verma <[email protected]>
+Mike Diarmid <[email protected]>
+Invertase <[email protected]>
+Elliot Hesp <[email protected]>
+Vince Varga <[email protected]>
+Aawaz Gyawali <[email protected]>
+EUI Limited <[email protected]>
+Katarina Sheremet <[email protected]>
+Thomas Stockx <[email protected]>
+Sarbagya Dhaubanjar <[email protected]>
+Ozkan Eksi <[email protected]>
+Rishab Nayak <[email protected]>
+ko2ic <[email protected]>
+Jonathan Younger <[email protected]>
+Jose Sanchez <[email protected]>
+Debkanchan Samadder <[email protected]>
+Audrius Karosevicius <[email protected]>
+Lukasz Piliszczuk <[email protected]>
+SoundReply Solutions GmbH <[email protected]>
+Rafal Wachol <[email protected]>
+Pau Picas <[email protected]>
+Christian Weder <[email protected]>
+Alexandru Tuca <[email protected]>
+Christian Weder <[email protected]>
+Rhodes Davis Jr. <[email protected]>
+Luigi Agosti <[email protected]>
+Quentin Le Guennec <[email protected]>
+Koushik Ravikumar <[email protected]>
+Nissim Dsilva <[email protected]>
+Giancarlo Rocha <[email protected]>
+Ryo Miyake <[email protected]>
+Théo Champion <[email protected]>
+Kazuki Yamaguchi <[email protected]>
+Eitan Schwartz <[email protected]>
+Chris Rutkowski <[email protected]>
+Juan Alvarez <[email protected]>
+Aleksandr Yurkovskiy <[email protected]>
+Anton Borries <[email protected]>
+Alex Li <[email protected]>
+Rahul Raj <[email protected]>

packages/path_provider/path_provider_android/AUTHORS

@@ -0,0 +1,3 @@
+## 2.0.6
+
+* Split from `path_provider` as a federated implementation.

packages/path_provider/path_provider_android/CHANGELOG.md

@@ -0,0 +1,25 @@
+Copyright 2013 The Flutter 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:
+
+    * 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.

packages/path_provider/path_provider_android/LICENSE

@@ -0,0 +1,11 @@
+# path\_provider\_android
+
+The Android implementation of [`path_provider`].
+
+## Usage
+
+This package is [endorsed][2], which means you can simply use `path_provider`
+normally. This package will be automatically included in your app when you do.
+
+[1]: https://pub.dev/packages/path_provider
+[2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin

packages/path_provider/path_provider_android/README.md

@@ -0,0 +1 @@
+rootProject.name = 'path_provider_android'

packages/path_provider/path_provider/android/build.gradle renamed to packages/path_provider/path_provider_android/android/build.gradle

@@ -0,0 +1,8 @@
+# path_provider_example
+
+Demonstrates how to use the path_provider plugin.
+
+## Getting Started
+
+For help getting started with Flutter, view our online
+[documentation](https://flutter.dev/).