Merge branch 'main' of github.com:flutter/packages into url_change_pl…

…atforms

packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## 3.3.0
 
 * Adds support for `PlatformNavigationDelegate.onUrlChange`.
+
+## 3.2.4
+
+* Updates pigeon to fix warnings with clang 15.
 * Updates minimum Flutter version to 3.3.
 * Fixes common typos in tests and documentation.
 

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.h

@@ -598,7 +598,7 @@ NSObject<FlutterMessageCodec> *FWFNSObjectFlutterApiGetCodec(void);
                            objectIdentifier:(NSNumber *)objectIdentifier
                                  changeKeys:(NSArray<FWFNSKeyValueChangeKeyEnumData *> *)changeKeys
                                changeValues:(NSArray<FWFObjectOrIdentifier *> *)changeValues
-                                 completion:(void (^)(NSError *_Nullable))completion;
+                                 completion:(void (^)(FlutterError *_Nullable))completion;
 - (void)disposeObjectWithIdentifier:(NSNumber *)identifier
                          completion:(void (^)(FlutterError *_Nullable))completion;
 @end
@@ -748,7 +748,7 @@ NSObject<FlutterMessageCodec> *FWFNSUrlFlutterApiGetCodec(void);
 @interface FWFNSUrlFlutterApi : NSObject
 - (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger;
 - (void)createWithIdentifier:(NSNumber *)identifier
-                  completion:(void (^)(NSError *_Nullable))completion;
+                  completion:(void (^)(FlutterError *_Nullable))completion;
 @end
 
 NS_ASSUME_NONNULL_END

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFGeneratedWebKitApis.m

@@ -1777,7 +1777,7 @@ - (void)observeValueForObjectWithIdentifier:(NSNumber *)arg_identifier
                                  changeKeys:
                                      (NSArray<FWFNSKeyValueChangeKeyEnumData *> *)arg_changeKeys
                                changeValues:(NSArray<FWFObjectOrIdentifier *> *)arg_changeValues
-                                 completion:(void (^)(NSError *_Nullable))completion {
+                                 completion:(void (^)(FlutterError *_Nullable))completion {
   FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel
       messageChannelWithName:@"dev.flutter.pigeon.NSObjectFlutterApi.observeValue"
              binaryMessenger:self.binaryMessenger
@@ -2575,7 +2575,7 @@ void FWFWKHttpCookieStoreHostApiSetup(id<FlutterBinaryMessenger> binaryMessenger
     }
   }
 }
-NSObject<FlutterMessageCodec> *FWFNSUrlHostApiGetCodec() {
+NSObject<FlutterMessageCodec> *FWFNSUrlHostApiGetCodec(void) {
   static FlutterStandardMessageCodec *sSharedObject = nil;
   sSharedObject = [FlutterStandardMessageCodec sharedInstance];
   return sSharedObject;
@@ -2605,7 +2605,7 @@ void FWFNSUrlHostApiSetup(id<FlutterBinaryMessenger> binaryMessenger,
     }
   }
 }
-NSObject<FlutterMessageCodec> *FWFNSUrlFlutterApiGetCodec() {
+NSObject<FlutterMessageCodec> *FWFNSUrlFlutterApiGetCodec(void) {
   static FlutterStandardMessageCodec *sSharedObject = nil;
   sSharedObject = [FlutterStandardMessageCodec sharedInstance];
   return sSharedObject;
@@ -2625,7 +2625,7 @@ - (instancetype)initWithBinaryMessenger:(NSObject<FlutterBinaryMessenger> *)bina
   return self;
 }
 - (void)createWithIdentifier:(NSNumber *)arg_identifier
-                  completion:(void (^)(NSError *_Nullable))completion {
+                  completion:(void (^)(FlutterError *_Nullable))completion {
   FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel
       messageChannelWithName:@"dev.flutter.pigeon.NSUrlFlutterApi.create"
              binaryMessenger:self.binaryMessenger

packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.mocks.dart

@@ -5,18 +5,19 @@
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i5;
 import 'dart:math' as _i2;
+import 'dart:ui' as _i6;
 
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:webview_flutter_platform_interface/src/legacy/types/javascript_channel.dart'
-    as _i8;
-import 'package:webview_flutter_platform_interface/src/legacy/types/types.dart'
     as _i9;
+import 'package:webview_flutter_platform_interface/src/legacy/types/types.dart'
+    as _i10;
 import 'package:webview_flutter_platform_interface/src/webview_flutter_platform_interface_legacy.dart'
-    as _i7;
+    as _i8;
 import 'package:webview_flutter_wkwebview/src/foundation/foundation.dart'
-    as _i6;
+    as _i7;
 import 'package:webview_flutter_wkwebview/src/legacy/web_kit_webview_widget.dart'
-    as _i10;
+    as _i11;
 import 'package:webview_flutter_wkwebview/src/ui_kit/ui_kit.dart' as _i3;
 import 'package:webview_flutter_wkwebview/src/web_kit/web_kit.dart' as _i4;
 
@@ -205,7 +206,7 @@ class MockUIScrollView extends _i1.Mock implements _i3.UIScrollView {
         ),
       ) as _i3.UIScrollView);
   @override
-  _i5.Future<void> setBackgroundColor(dynamic color) => (super.noSuchMethod(
+  _i5.Future<void> setBackgroundColor(_i6.Color? color) => (super.noSuchMethod(
         Invocation.method(
           #setBackgroundColor,
           [color],
@@ -224,9 +225,9 @@ class MockUIScrollView extends _i1.Mock implements _i3.UIScrollView {
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -242,7 +243,7 @@ class MockUIScrollView extends _i1.Mock implements _i3.UIScrollView {
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -282,9 +283,9 @@ class MockWKNavigationDelegate extends _i1.Mock
       ) as _i4.WKNavigationDelegate);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -300,7 +301,7 @@ class MockWKNavigationDelegate extends _i1.Mock
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -348,9 +349,9 @@ class MockWKPreferences extends _i1.Mock implements _i4.WKPreferences {
       ) as _i4.WKPreferences);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -366,7 +367,7 @@ class MockWKPreferences extends _i1.Mock implements _i4.WKPreferences {
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -420,9 +421,9 @@ class MockWKScriptMessageHandler extends _i1.Mock
       ) as _i4.WKScriptMessageHandler);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -438,7 +439,7 @@ class MockWKScriptMessageHandler extends _i1.Mock
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -514,7 +515,7 @@ class MockWKWebView extends _i1.Mock implements _i4.WKWebView {
         returnValue: _i5.Future<double>.value(0.0),
       ) as _i5.Future<double>);
   @override
-  _i5.Future<void> loadRequest(_i6.NSUrlRequest? request) =>
+  _i5.Future<void> loadRequest(_i7.NSUrlRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #loadRequest,
@@ -654,7 +655,7 @@ class MockWKWebView extends _i1.Mock implements _i4.WKWebView {
         ),
       ) as _i4.WKWebView);
   @override
-  _i5.Future<void> setBackgroundColor(dynamic color) => (super.noSuchMethod(
+  _i5.Future<void> setBackgroundColor(_i6.Color? color) => (super.noSuchMethod(
         Invocation.method(
           #setBackgroundColor,
           [color],
@@ -673,9 +674,9 @@ class MockWKWebView extends _i1.Mock implements _i4.WKWebView {
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -691,7 +692,7 @@ class MockWKWebView extends _i1.Mock implements _i4.WKWebView {
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -776,9 +777,9 @@ class MockWKWebViewConfiguration extends _i1.Mock
       ) as _i4.WKWebViewConfiguration);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -794,7 +795,7 @@ class MockWKWebViewConfiguration extends _i1.Mock
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -857,9 +858,9 @@ class MockWKWebsiteDataStore extends _i1.Mock
       ) as _i4.WKWebsiteDataStore);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -875,7 +876,7 @@ class MockWKWebsiteDataStore extends _i1.Mock
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -914,9 +915,9 @@ class MockWKUIDelegate extends _i1.Mock implements _i4.WKUIDelegate {
       ) as _i4.WKUIDelegate);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -932,7 +933,7 @@ class MockWKUIDelegate extends _i1.Mock implements _i4.WKUIDelegate {
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -1026,9 +1027,9 @@ class MockWKUserContentController extends _i1.Mock
       ) as _i4.WKUserContentController);
   @override
   _i5.Future<void> addObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
-    required Set<_i6.NSKeyValueObservingOptions>? options,
+    required Set<_i7.NSKeyValueObservingOptions>? options,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1044,7 +1045,7 @@ class MockWKUserContentController extends _i1.Mock
       ) as _i5.Future<void>);
   @override
   _i5.Future<void> removeObserver(
-    _i6.NSObject? observer, {
+    _i7.NSObject? observer, {
     required String? keyPath,
   }) =>
       (super.noSuchMethod(
@@ -1062,16 +1063,16 @@ class MockWKUserContentController extends _i1.Mock
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockJavascriptChannelRegistry extends _i1.Mock
-    implements _i7.JavascriptChannelRegistry {
+    implements _i8.JavascriptChannelRegistry {
   MockJavascriptChannelRegistry() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  Map<String, _i8.JavascriptChannel> get channels => (super.noSuchMethod(
+  Map<String, _i9.JavascriptChannel> get channels => (super.noSuchMethod(
         Invocation.getter(#channels),
-        returnValue: <String, _i8.JavascriptChannel>{},
-      ) as Map<String, _i8.JavascriptChannel>);
+        returnValue: <String, _i9.JavascriptChannel>{},
+      ) as Map<String, _i9.JavascriptChannel>);
   @override
   void onJavascriptChannelMessage(
     String? channel,
@@ -1088,7 +1089,7 @@ class MockJavascriptChannelRegistry extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void updateJavascriptChannelsFromSet(Set<_i8.JavascriptChannel>? channels) =>
+  void updateJavascriptChannelsFromSet(Set<_i9.JavascriptChannel>? channels) =>
       super.noSuchMethod(
         Invocation.method(
           #updateJavascriptChannelsFromSet,
@@ -1102,7 +1103,7 @@ class MockJavascriptChannelRegistry extends _i1.Mock
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockWebViewPlatformCallbacksHandler extends _i1.Mock
-    implements _i7.WebViewPlatformCallbacksHandler {
+    implements _i8.WebViewPlatformCallbacksHandler {
   MockWebViewPlatformCallbacksHandler() {
     _i1.throwOnMissingStub(this);
   }
@@ -1148,7 +1149,7 @@ class MockWebViewPlatformCallbacksHandler extends _i1.Mock
         returnValueForMissingStub: null,
       );
   @override
-  void onWebResourceError(_i9.WebResourceError? error) => super.noSuchMethod(
+  void onWebResourceError(_i10.WebResourceError? error) => super.noSuchMethod(
         Invocation.method(
           #onWebResourceError,
           [error],
@@ -1161,7 +1162,7 @@ class MockWebViewPlatformCallbacksHandler extends _i1.Mock
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockWebViewWidgetProxy extends _i1.Mock
-    implements _i10.WebViewWidgetProxy {
+    implements _i11.WebViewWidgetProxy {
   MockWebViewWidgetProxy() {
     _i1.throwOnMissingStub(this);
   }
@@ -1171,8 +1172,8 @@ class MockWebViewWidgetProxy extends _i1.Mock
     _i4.WKWebViewConfiguration? configuration, {
     void Function(
       String,
-      _i6.NSObject,
-      Map<_i6.NSKeyValueChangeKey, Object?>,
+      _i7.NSObject,
+      Map<_i7.NSKeyValueChangeKey, Object?>,
     )? observeValue,
   }) =>
       (super.noSuchMethod(
@@ -1249,11 +1250,11 @@ class MockWebViewWidgetProxy extends _i1.Mock
     )? decidePolicyForNavigationAction,
     void Function(
       _i4.WKWebView,
-      _i6.NSError,
+      _i7.NSError,
     )? didFailNavigation,
     void Function(
       _i4.WKWebView,
-      _i6.NSError,
+      _i7.NSError,
     )? didFailProvisionalNavigation,
     void Function(_i4.WKWebView)? webViewWebContentProcessDidTerminate,
   }) =>