Merge remote-tracking branch 'upstream/main' into issue/94051_webview_4.0

Author: mvanbeusekom

.ci/flutter_master.version

@@ -1 +1 @@
-4bed76757db7a4eea74d77d5a63804ef52198f37
+df7111a848cb0cc076a9c89d48332f0ec2700c45

packages/file_selector/file_selector_platform_interface/CHANGELOG.md

@@ -1,8 +1,6 @@
-## 2.0.5
+## NEXT
 
 * Removes unnecessary imports.
-* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
-  lint warnings.
 
 ## 2.0.4
 

packages/file_selector/file_selector_platform_interface/pubspec.yaml

@@ -4,7 +4,7 @@ repository: https://github.com/flutter/plugins/tree/main/packages/file_selector/
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
 # NOTE: We strongly prefer non-breaking changes, even at the expense of a
 # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes
-version: 2.0.5
+version: 2.0.4
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/local_auth/local_auth/CHANGELOG.md

@@ -1,11 +1,14 @@
+## 2.0.2
+
+* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
+  lint warnings.
+
 ## 2.0.1
 
 * Restores the ability to import `error_codes.dart`.
 * Updates README to match API changes in 2.0, and to improve clarity in
   general.
 * Removes unnecessary imports.
-* Fixes library_private_types_in_public_api, sort_child_properties_last and use_key_in_widget_constructors
-  lint warnings.
 
 ## 2.0.0
 

packages/local_auth/local_auth/example/lib/readme_excerpts.dart

@@ -24,10 +24,12 @@ import 'package:local_auth_ios/local_auth_ios.dart';
 // #enddocregion CustomMessages
 
 void main() {
-  runApp(MyApp());
+  runApp(const MyApp());
 }
 
 class MyApp extends StatefulWidget {
+  const MyApp({Key? key}) : super(key: key);
+
   @override
   State<MyApp> createState() => _MyAppState();
 }

packages/local_auth/local_auth/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for Android and iOS devices to allow local
   authentication via fingerprint, touch ID, face ID, passcode, pin, or pattern.
 repository: https://github.com/flutter/plugins/tree/main/packages/local_auth/local_auth
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
-version: 2.0.1
+version: 2.0.2
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

packages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/platform_webview_controller.dart

@@ -21,7 +21,8 @@ import 'webview_platform.dart';
 /// [WebViewCookieManagerDelegate] methods.
 abstract class PlatformWebViewController extends PlatformInterface {
   /// Creates a new [PlatformWebViewController]
-  factory PlatformWebViewController(WebViewControllerCreationParams params) {
+  factory PlatformWebViewController(
+      PlatformWebViewControllerCreationParams params) {
     final PlatformWebViewController webViewControllerDelegate =
         WebViewPlatform.instance!.createPlatformWebViewController(params);
     PlatformInterface.verify(webViewControllerDelegate, _token);
@@ -38,7 +39,7 @@ abstract class PlatformWebViewController extends PlatformInterface {
   static final Object _token = Object();
 
   /// The parameters used to initialize the [PlatformWebViewController].
-  final WebViewControllerCreationParams params;
+  final PlatformWebViewControllerCreationParams params;
 
   /// Loads the file located on the specified [absoluteFilePath].
   ///
@@ -156,12 +157,12 @@ abstract class PlatformWebViewController extends PlatformInterface {
         'clearLocalStorage is not implemented on the current platform');
   }
 
-  /// Sets the [NavigationCallbackDelegate] containing the callback methods that
+  /// Sets the [PlatformNavigationCallbackDelegate] containing the callback methods that
   /// are called during navigation events.
-  Future<void> setNavigationCallbackDelegate(
+  Future<void> setPlatformNavigationCallbackDelegate(
       PlatformNavigationCallbackDelegate handler) {
     throw UnimplementedError(
-        'setNavigationCallbackDelegate is not implemented on the current platform');
+        'setPlatformNavigationCallbackDelegate is not implemented on the current platform');
   }
 
   /// Runs the given JavaScript in the context of the current page.

…/webview_controller_creation_params.dart …_webview_controller_creation_params.dartpackages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/types/webview_controller_creation_params.dart renamed to packages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/types/platform_webview_controller_creation_params.dart packages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/types/webview_controller_creation_params.dart renamed to packages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/types/platform_webview_controller_creation_params.dart

@@ -4,31 +4,31 @@
 
 import 'package:flutter/material.dart';
 
-/// Object specifying creation parameters for creating a [WebViewControllerDelegate].
+/// Object specifying creation parameters for creating a [PlatformWebViewController].
 ///
 /// Platform specific implementations can add additional fields by extending
 /// this class.
 ///
 /// {@tool sample}
-/// This example demonstrates how to extend the [WebViewControllerCreationParams] to
+/// This example demonstrates how to extend the [PlatformWebViewControllerCreationParams] to
 /// provide additional platform specific parameters.
 ///
-/// When extending [WebViewControllerCreationParams] additional parameters
+/// When extending [PlatformWebViewControllerCreationParams] additional parameters
 /// should always accept `null` or have a default value to prevent breaking
 /// changes.
 ///
 /// ```dart
 /// class WKWebViewControllerCreationParams
-///     extends WebViewControllerCreationParams {
+///     extends PlatformWebViewControllerCreationParams {
 ///   WKWebViewControllerCreationParams._(
 ///     // This parameter prevents breaking changes later.
 ///     // ignore: avoid_unused_constructor_parameters
-///     WebViewControllerCreationParams params, {
+///     PlatformWebViewControllerCreationParams params, {
 ///     this.domain,
 ///   }) : super();
 ///
-///   factory WKWebViewControllerCreationParams.fromWebViewControllerCreationParams(
-///     WebViewControllerCreationParams params, {
+///   factory WKWebViewControllerCreationParams.fromPlatformWebViewControllerCreationParams(
+///     PlatformWebViewControllerCreationParams params, {
 ///     String? domain,
 ///   }) {
 ///     return WKWebViewControllerCreationParams._(params, domain: domain);
@@ -39,7 +39,7 @@ import 'package:flutter/material.dart';
 /// ```
 /// {@end-tool}
 @immutable
-class WebViewControllerCreationParams {
-  /// Used by the platform implementation to create a new [WebViewControllerCreationParams].
-  const WebViewControllerCreationParams();
+class PlatformWebViewControllerCreationParams {
+  /// Used by the platform implementation to create a new [PlatformWebViewController].
+  const PlatformWebViewControllerCreationParams();
 }

packages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/types/types.dart

@@ -6,8 +6,8 @@ export 'javascript_message.dart';
 export 'javascript_mode.dart';
 export 'load_request_params.dart';
 export 'platform_navigation_callback_delegate_creation_params.dart';
+export 'platform_webview_controller_creation_params.dart';
 export 'platform_webview_cookie_manager_creation_params.dart';
 export 'platform_webview_widget_creation_params.dart';
 export 'web_resource_error.dart';
-export 'webview_controller_creation_params.dart';
 export 'webview_cookie.dart';

packages/webview_flutter/webview_flutter_platform_interface/lib/v4/src/webview_platform.dart

@@ -63,7 +63,7 @@ abstract class WebViewPlatform extends PlatformInterface {
   /// This function should only be called by the app-facing package.
   /// Look at using [WebViewController] in `webview_flutter` instead.
   PlatformWebViewController createPlatformWebViewController(
-    WebViewControllerCreationParams params,
+    PlatformWebViewControllerCreationParams params,
   ) {
     throw UnimplementedError(
         'createWebViewControllerDelegate is not implemented on the current platform.');