diff --git a/packages/webview_flutter/webview_flutter/CHANGELOG.md b/packages/webview_flutter/webview_flutter/CHANGELOG.md
index 01026fa627d0..f274f5684e6a 100644
--- a/packages/webview_flutter/webview_flutter/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.12.0
+
+- enh: DEV-156308 Convert flutter_platform out of a monorepo
+
 # 5.11.0
 
 - enh: DEV-148888 Drop Android 8 Support
diff --git a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
index c54350ea73bf..14fb8efd658d 100644
--- a/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -7,8 +7,11 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:webview_flutter/platform_interface.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
diff --git a/packages/webview_flutter/webview_flutter/example/lib/main.dart b/packages/webview_flutter/webview_flutter/example/lib/main.dart
index aae35b5eb758..9043a780aa00 100644
--- a/packages/webview_flutter/webview_flutter/example/lib/main.dart
+++ b/packages/webview_flutter/webview_flutter/example/lib/main.dart
@@ -5,7 +5,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:permission_handler/permission_handler.dart';
+
 import 'package:webview_flutter/webview_flutter.dart';
 
 Future<void> main() async {
diff --git a/packages/webview_flutter/webview_flutter/example/pubspec.yaml b/packages/webview_flutter/webview_flutter/example/pubspec.yaml
index 302e0e561b96..78d174cec855 100644
--- a/packages/webview_flutter/webview_flutter/example/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter/example/pubspec.yaml
@@ -7,10 +7,6 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
 
@@ -25,10 +21,6 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   espresso: ^0.1.0+2
   flutter_driver:
     sdk: flutter
diff --git a/packages/webview_flutter/webview_flutter/lib/src/webview.dart b/packages/webview_flutter/webview_flutter/lib/src/webview.dart
index 34cf0f3480cc..50c18df09ef8 100644
--- a/packages/webview_flutter/webview_flutter/lib/src/webview.dart
+++ b/packages/webview_flutter/webview_flutter/lib/src/webview.dart
@@ -5,14 +5,12 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-import 'package:flutter/rendering.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:webview_flutter/webview_flutter.dart';
 import 'package:webview_flutter_android/webview_android_cookie_manager.dart';
-import 'package:webview_flutter_android/webview_surface_android.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
-import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
-
-import '../platform_interface.dart';
 
 /// Optional callback invoked when a web view is first created. [controller] is
 /// the [WebViewController] for the created web view.
diff --git a/packages/webview_flutter/webview_flutter/pubspec.yaml b/packages/webview_flutter/webview_flutter/pubspec.yaml
index f0e9a5e3b285..6ee15005e3e6 100644
--- a/packages/webview_flutter/webview_flutter/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter/pubspec.yaml
@@ -2,7 +2,7 @@ name: webview_flutter
 description: A Flutter plugin that provides a WebView widget on Android and iOS.
 repository: https://github.com/Alkami/plugins/tree/main/packages/webview_flutter
 publish_to: https://dart.cloudsmith.io/alkami/flutter/
-version: 5.11.0 # original version was 3.0.1 when this was forked
+version: 5.12.0 # original version was 3.0.1 when this was forked
 
 environment:
   sdk: ">=2.18.0 <3.0.0" # dart version
@@ -17,13 +17,9 @@ flutter:
         default_package: webview_flutter_wkwebview
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
-  # FOR TESTING ONLY. DO NOT MERGE.
+ 
   webview_flutter_android: 
     hosted: https://dart.cloudsmith.io/alkami/flutter/
     version: ^5.0.0
@@ -37,10 +33,6 @@ dependencies:
     version: ^5.0.0
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   build_runner: ^2.1.5
 
   flutter_driver:
diff --git a/packages/webview_flutter/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter/test/webview_flutter_test.dart
index 0839768d49fa..cf4f20d0e66d 100644
--- a/packages/webview_flutter/webview_flutter/test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter/test/webview_flutter_test.dart
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:typed_data';
-
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
-import 'package:flutter/src/foundation/basic_types.dart';
-import 'package:flutter/src/gestures/recognizer.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
diff --git a/packages/webview_flutter/webview_flutter/test/webview_flutter_test.mocks.dart b/packages/webview_flutter/webview_flutter/test/webview_flutter_test.mocks.dart
index f7e7eaa3d450..d949d1cfe38f 100644
--- a/packages/webview_flutter/webview_flutter/test/webview_flutter_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter/test/webview_flutter_test.mocks.dart
@@ -1,21 +1,16 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in webview_flutter/test/webview_flutter_test.dart.
 // Do not manually edit this file.
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i7;
+import 'dart:async' as _i6;
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' as _i2;
+import 'package:flutter/foundation.dart' as _i3;
+import 'package:flutter/gestures.dart' as _i5;
+import 'package:flutter/material.dart' as _i2;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:webview_flutter_platform_interface/src/platform_interface/javascript_channel_registry.dart'
-    as _i6;
-import 'package:webview_flutter_platform_interface/src/platform_interface/webview_platform.dart'
-    as _i3;
-import 'package:webview_flutter_platform_interface/src/platform_interface/webview_platform_callbacks_handler.dart'
-    as _i5;
-import 'package:webview_flutter_platform_interface/src/platform_interface/webview_platform_controller.dart'
-    as _i8;
-import 'package:webview_flutter_platform_interface/src/types/types.dart' as _i4;
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart'
+    as _i4;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -38,14 +33,14 @@ class _FakeWidget_0 extends _i1.SmartFake implements _i2.Widget {
         );
 
   @override
-  String toString({_i2.DiagnosticLevel? minLevel = _i2.DiagnosticLevel.info}) =>
+  String toString({_i3.DiagnosticLevel? minLevel = _i3.DiagnosticLevel.info}) =>
       super.toString();
 }
 
 /// A class which mocks [WebViewPlatform].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWebViewPlatform extends _i1.Mock implements _i3.WebViewPlatform {
+class MockWebViewPlatform extends _i1.Mock implements _i4.WebViewPlatform {
   MockWebViewPlatform() {
     _i1.throwOnMissingStub(this);
   }
@@ -54,11 +49,11 @@ class MockWebViewPlatform extends _i1.Mock implements _i3.WebViewPlatform {
   _i2.Widget build({
     required _i2.BuildContext? context,
     required _i4.CreationParams? creationParams,
-    required _i5.WebViewPlatformCallbacksHandler?
+    required _i4.WebViewPlatformCallbacksHandler?
         webViewPlatformCallbacksHandler,
-    required _i6.JavascriptChannelRegistry? javascriptChannelRegistry,
-    _i3.WebViewPlatformCreatedCallback? onWebViewPlatformCreated,
-    Set<_i2.Factory<_i2.OneSequenceGestureRecognizer>>? gestureRecognizers,
+    required _i4.JavascriptChannelRegistry? javascriptChannelRegistry,
+    _i4.WebViewPlatformCreatedCallback? onWebViewPlatformCreated,
+    Set<_i3.Factory<_i5.OneSequenceGestureRecognizer>>? gestureRecognizers,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -90,44 +85,44 @@ class MockWebViewPlatform extends _i1.Mock implements _i3.WebViewPlatform {
         ),
       ) as _i2.Widget);
   @override
-  _i7.Future<bool> clearCookies() => (super.noSuchMethod(
+  _i6.Future<bool> clearCookies() => (super.noSuchMethod(
         Invocation.method(
           #clearCookies,
           [],
         ),
-        returnValue: _i7.Future<bool>.value(false),
-      ) as _i7.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
 }
 
 /// A class which mocks [WebViewPlatformController].
 ///
 /// See the documentation for Mockito's code generation for more information.
 class MockWebViewPlatformController extends _i1.Mock
-    implements _i8.WebViewPlatformController {
+    implements _i4.WebViewPlatformController {
   MockWebViewPlatformController() {
     _i1.throwOnMissingStub(this);
   }
 
   @override
-  _i7.Future<void> loadFile(String? absoluteFilePath) => (super.noSuchMethod(
+  _i6.Future<void> loadFile(String? absoluteFilePath) => (super.noSuchMethod(
         Invocation.method(
           #loadFile,
           [absoluteFilePath],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> loadFlutterAsset(String? key) => (super.noSuchMethod(
+  _i6.Future<void> loadFlutterAsset(String? key) => (super.noSuchMethod(
         Invocation.method(
           #loadFlutterAsset,
           [key],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> loadHtmlString(
+  _i6.Future<void> loadHtmlString(
     String? html, {
     String? baseUrl,
   }) =>
@@ -137,11 +132,11 @@ class MockWebViewPlatformController extends _i1.Mock
           [html],
           {#baseUrl: baseUrl},
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> loadUrl(
+  _i6.Future<void> loadUrl(
     String? url,
     Map<String, String>? headers,
   ) =>
@@ -153,147 +148,147 @@ class MockWebViewPlatformController extends _i1.Mock
             headers,
           ],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> loadRequest(_i4.WebViewRequest? request) =>
+  _i6.Future<void> loadRequest(_i4.WebViewRequest? request) =>
       (super.noSuchMethod(
         Invocation.method(
           #loadRequest,
           [request],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> updateSettings(_i4.WebSettings? setting) =>
+  _i6.Future<void> updateSettings(_i4.WebSettings? setting) =>
       (super.noSuchMethod(
         Invocation.method(
           #updateSettings,
           [setting],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<String?> currentUrl() => (super.noSuchMethod(
+  _i6.Future<String?> currentUrl() => (super.noSuchMethod(
         Invocation.method(
           #currentUrl,
           [],
         ),
-        returnValue: _i7.Future<String?>.value(),
-      ) as _i7.Future<String?>);
+        returnValue: _i6.Future<String?>.value(),
+      ) as _i6.Future<String?>);
   @override
-  _i7.Future<bool> canGoBack() => (super.noSuchMethod(
+  _i6.Future<bool> canGoBack() => (super.noSuchMethod(
         Invocation.method(
           #canGoBack,
           [],
         ),
-        returnValue: _i7.Future<bool>.value(false),
-      ) as _i7.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
   @override
-  _i7.Future<bool> canGoForward() => (super.noSuchMethod(
+  _i6.Future<bool> canGoForward() => (super.noSuchMethod(
         Invocation.method(
           #canGoForward,
           [],
         ),
-        returnValue: _i7.Future<bool>.value(false),
-      ) as _i7.Future<bool>);
+        returnValue: _i6.Future<bool>.value(false),
+      ) as _i6.Future<bool>);
   @override
-  _i7.Future<void> goBack() => (super.noSuchMethod(
+  _i6.Future<void> goBack() => (super.noSuchMethod(
         Invocation.method(
           #goBack,
           [],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> goForward() => (super.noSuchMethod(
+  _i6.Future<void> goForward() => (super.noSuchMethod(
         Invocation.method(
           #goForward,
           [],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> reload() => (super.noSuchMethod(
+  _i6.Future<void> reload() => (super.noSuchMethod(
         Invocation.method(
           #reload,
           [],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> clearCache() => (super.noSuchMethod(
+  _i6.Future<void> clearCache() => (super.noSuchMethod(
         Invocation.method(
           #clearCache,
           [],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<String> evaluateJavascript(String? javascript) =>
+  _i6.Future<String> evaluateJavascript(String? javascript) =>
       (super.noSuchMethod(
         Invocation.method(
           #evaluateJavascript,
           [javascript],
         ),
-        returnValue: _i7.Future<String>.value(''),
-      ) as _i7.Future<String>);
+        returnValue: _i6.Future<String>.value(''),
+      ) as _i6.Future<String>);
   @override
-  _i7.Future<void> runJavascript(String? javascript) => (super.noSuchMethod(
+  _i6.Future<void> runJavascript(String? javascript) => (super.noSuchMethod(
         Invocation.method(
           #runJavascript,
           [javascript],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<String> runJavascriptReturningResult(String? javascript) =>
+  _i6.Future<String> runJavascriptReturningResult(String? javascript) =>
       (super.noSuchMethod(
         Invocation.method(
           #runJavascriptReturningResult,
           [javascript],
         ),
-        returnValue: _i7.Future<String>.value(''),
-      ) as _i7.Future<String>);
+        returnValue: _i6.Future<String>.value(''),
+      ) as _i6.Future<String>);
   @override
-  _i7.Future<void> addJavascriptChannels(Set<String>? javascriptChannelNames) =>
+  _i6.Future<void> addJavascriptChannels(Set<String>? javascriptChannelNames) =>
       (super.noSuchMethod(
         Invocation.method(
           #addJavascriptChannels,
           [javascriptChannelNames],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> removeJavascriptChannels(
+  _i6.Future<void> removeJavascriptChannels(
           Set<String>? javascriptChannelNames) =>
       (super.noSuchMethod(
         Invocation.method(
           #removeJavascriptChannels,
           [javascriptChannelNames],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<String?> getTitle() => (super.noSuchMethod(
+  _i6.Future<String?> getTitle() => (super.noSuchMethod(
         Invocation.method(
           #getTitle,
           [],
         ),
-        returnValue: _i7.Future<String?>.value(),
-      ) as _i7.Future<String?>);
+        returnValue: _i6.Future<String?>.value(),
+      ) as _i6.Future<String?>);
   @override
-  _i7.Future<void> scrollTo(
+  _i6.Future<void> scrollTo(
     int? x,
     int? y,
   ) =>
@@ -305,11 +300,11 @@ class MockWebViewPlatformController extends _i1.Mock
             y,
           ],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<void> scrollBy(
+  _i6.Future<void> scrollBy(
     int? x,
     int? y,
   ) =>
@@ -321,23 +316,23 @@ class MockWebViewPlatformController extends _i1.Mock
             y,
           ],
         ),
-        returnValue: _i7.Future<void>.value(),
-        returnValueForMissingStub: _i7.Future<void>.value(),
-      ) as _i7.Future<void>);
+        returnValue: _i6.Future<void>.value(),
+        returnValueForMissingStub: _i6.Future<void>.value(),
+      ) as _i6.Future<void>);
   @override
-  _i7.Future<int> getScrollX() => (super.noSuchMethod(
+  _i6.Future<int> getScrollX() => (super.noSuchMethod(
         Invocation.method(
           #getScrollX,
           [],
         ),
-        returnValue: _i7.Future<int>.value(0),
-      ) as _i7.Future<int>);
+        returnValue: _i6.Future<int>.value(0),
+      ) as _i6.Future<int>);
   @override
-  _i7.Future<int> getScrollY() => (super.noSuchMethod(
+  _i6.Future<int> getScrollY() => (super.noSuchMethod(
         Invocation.method(
           #getScrollY,
           [],
         ),
-        returnValue: _i7.Future<int>.value(0),
-      ) as _i7.Future<int>);
+        returnValue: _i6.Future<int>.value(0),
+      ) as _i6.Future<int>);
 }
diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
index f8dfde4502b4..3c00901e1f5a 100644
--- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.12.0
+
+- enh: DEV-156308 Convert flutter_platform out of a monorepo
+
 # 5.11.0
 
 - enh: DEV-148888 Drop Android 8 Support
diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java
index 33b52301722c..420dd8836852 100644
--- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java
+++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/GeneratedAndroidWebView.java
@@ -1,8 +1,11 @@
-// Autogenerated from Pigeon (v1.0.9), do not edit directly.
+// Autogenerated from Pigeon (v3.2.9), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package io.flutter.plugins.webviewflutter;
 
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import io.flutter.plugin.common.BasicMessageChannel;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MessageCodec;
@@ -21,31 +24,85 @@ public class GeneratedAndroidWebView {
 
   /** Generated class from Pigeon that represents data sent in messages. */
   public static class WebResourceRequestData {
-    private String url;
-    public String getUrl() { return url; }
-    public void setUrl(String setterArg) { this.url = setterArg; }
+    private @Nullable String url;
+    public @Nullable String getUrl() { return url; }
+    public void setUrl(@Nullable String setterArg) {
+      this.url = setterArg;
+    }
 
-    private Boolean isForMainFrame;
-    public Boolean getIsForMainFrame() { return isForMainFrame; }
-    public void setIsForMainFrame(Boolean setterArg) { this.isForMainFrame = setterArg; }
+    private @Nullable Boolean isForMainFrame;
+    public @Nullable Boolean getIsForMainFrame() { return isForMainFrame; }
+    public void setIsForMainFrame(@Nullable Boolean setterArg) {
+      this.isForMainFrame = setterArg;
+    }
 
-    private Boolean isRedirect;
-    public Boolean getIsRedirect() { return isRedirect; }
-    public void setIsRedirect(Boolean setterArg) { this.isRedirect = setterArg; }
+    private @Nullable Boolean isRedirect;
+    public @Nullable Boolean getIsRedirect() { return isRedirect; }
+    public void setIsRedirect(@Nullable Boolean setterArg) {
+      this.isRedirect = setterArg;
+    }
 
-    private Boolean hasGesture;
-    public Boolean getHasGesture() { return hasGesture; }
-    public void setHasGesture(Boolean setterArg) { this.hasGesture = setterArg; }
+    private @Nullable Boolean hasGesture;
+    public @Nullable Boolean getHasGesture() { return hasGesture; }
+    public void setHasGesture(@Nullable Boolean setterArg) {
+      this.hasGesture = setterArg;
+    }
 
-    private String method;
-    public String getMethod() { return method; }
-    public void setMethod(String setterArg) { this.method = setterArg; }
+    private @Nullable String method;
+    public @Nullable String getMethod() { return method; }
+    public void setMethod(@Nullable String setterArg) {
+      this.method = setterArg;
+    }
 
-    private Map<String, String> requestHeaders;
-    public Map<String, String> getRequestHeaders() { return requestHeaders; }
-    public void setRequestHeaders(Map<String, String> setterArg) { this.requestHeaders = setterArg; }
+    private @Nullable Map<String, String> requestHeaders;
+    public @Nullable Map<String, String> getRequestHeaders() { return requestHeaders; }
+    public void setRequestHeaders(@Nullable Map<String, String> setterArg) {
+      this.requestHeaders = setterArg;
+    }
 
-    Map<String, Object> toMap() {
+    public static final class Builder {
+      private @Nullable String url;
+      public @NonNull Builder setUrl(@Nullable String setterArg) {
+        this.url = setterArg;
+        return this;
+      }
+      private @Nullable Boolean isForMainFrame;
+      public @NonNull Builder setIsForMainFrame(@Nullable Boolean setterArg) {
+        this.isForMainFrame = setterArg;
+        return this;
+      }
+      private @Nullable Boolean isRedirect;
+      public @NonNull Builder setIsRedirect(@Nullable Boolean setterArg) {
+        this.isRedirect = setterArg;
+        return this;
+      }
+      private @Nullable Boolean hasGesture;
+      public @NonNull Builder setHasGesture(@Nullable Boolean setterArg) {
+        this.hasGesture = setterArg;
+        return this;
+      }
+      private @Nullable String method;
+      public @NonNull Builder setMethod(@Nullable String setterArg) {
+        this.method = setterArg;
+        return this;
+      }
+      private @Nullable Map<String, String> requestHeaders;
+      public @NonNull Builder setRequestHeaders(@Nullable Map<String, String> setterArg) {
+        this.requestHeaders = setterArg;
+        return this;
+      }
+      public @NonNull WebResourceRequestData build() {
+        WebResourceRequestData pigeonReturn = new WebResourceRequestData();
+        pigeonReturn.setUrl(url);
+        pigeonReturn.setIsForMainFrame(isForMainFrame);
+        pigeonReturn.setIsRedirect(isRedirect);
+        pigeonReturn.setHasGesture(hasGesture);
+        pigeonReturn.setMethod(method);
+        pigeonReturn.setRequestHeaders(requestHeaders);
+        return pigeonReturn;
+      }
+    }
+    @NonNull Map<String, Object> toMap() {
       Map<String, Object> toMapResult = new HashMap<>();
       toMapResult.put("url", url);
       toMapResult.put("isForMainFrame", isForMainFrame);
@@ -55,47 +112,69 @@ Map<String, Object> toMap() {
       toMapResult.put("requestHeaders", requestHeaders);
       return toMapResult;
     }
-    static WebResourceRequestData fromMap(Map<String, Object> map) {
-      WebResourceRequestData fromMapResult = new WebResourceRequestData();
+    static @NonNull WebResourceRequestData fromMap(@NonNull Map<String, Object> map) {
+      WebResourceRequestData pigeonResult = new WebResourceRequestData();
       Object url = map.get("url");
-      fromMapResult.url = (String)url;
+      pigeonResult.setUrl((String)url);
       Object isForMainFrame = map.get("isForMainFrame");
-      fromMapResult.isForMainFrame = (Boolean)isForMainFrame;
+      pigeonResult.setIsForMainFrame((Boolean)isForMainFrame);
       Object isRedirect = map.get("isRedirect");
-      fromMapResult.isRedirect = (Boolean)isRedirect;
+      pigeonResult.setIsRedirect((Boolean)isRedirect);
       Object hasGesture = map.get("hasGesture");
-      fromMapResult.hasGesture = (Boolean)hasGesture;
+      pigeonResult.setHasGesture((Boolean)hasGesture);
       Object method = map.get("method");
-      fromMapResult.method = (String)method;
+      pigeonResult.setMethod((String)method);
       Object requestHeaders = map.get("requestHeaders");
-      fromMapResult.requestHeaders = (Map<String, String>)requestHeaders;
-      return fromMapResult;
+      pigeonResult.setRequestHeaders((Map<String, String>)requestHeaders);
+      return pigeonResult;
     }
   }
 
   /** Generated class from Pigeon that represents data sent in messages. */
   public static class WebResourceErrorData {
-    private Long errorCode;
-    public Long getErrorCode() { return errorCode; }
-    public void setErrorCode(Long setterArg) { this.errorCode = setterArg; }
+    private @Nullable Long errorCode;
+    public @Nullable Long getErrorCode() { return errorCode; }
+    public void setErrorCode(@Nullable Long setterArg) {
+      this.errorCode = setterArg;
+    }
 
-    private String description;
-    public String getDescription() { return description; }
-    public void setDescription(String setterArg) { this.description = setterArg; }
+    private @Nullable String description;
+    public @Nullable String getDescription() { return description; }
+    public void setDescription(@Nullable String setterArg) {
+      this.description = setterArg;
+    }
 
-    Map<String, Object> toMap() {
+    public static final class Builder {
+      private @Nullable Long errorCode;
+      public @NonNull Builder setErrorCode(@Nullable Long setterArg) {
+        this.errorCode = setterArg;
+        return this;
+      }
+      private @Nullable String description;
+      public @NonNull Builder setDescription(@Nullable String setterArg) {
+        this.description = setterArg;
+        return this;
+      }
+      public @NonNull WebResourceErrorData build() {
+        WebResourceErrorData pigeonReturn = new WebResourceErrorData();
+        pigeonReturn.setErrorCode(errorCode);
+        pigeonReturn.setDescription(description);
+        return pigeonReturn;
+      }
+    }
+    @NonNull Map<String, Object> toMap() {
       Map<String, Object> toMapResult = new HashMap<>();
       toMapResult.put("errorCode", errorCode);
       toMapResult.put("description", description);
       return toMapResult;
     }
-    static WebResourceErrorData fromMap(Map<String, Object> map) {
-      WebResourceErrorData fromMapResult = new WebResourceErrorData();
+    static @NonNull WebResourceErrorData fromMap(@NonNull Map<String, Object> map) {
+      WebResourceErrorData pigeonResult = new WebResourceErrorData();
       Object errorCode = map.get("errorCode");
-      fromMapResult.errorCode = (errorCode == null) ? null : ((errorCode instanceof Integer) ? (Integer)errorCode : (Long)errorCode);
+      pigeonResult.setErrorCode((errorCode == null) ? null : ((errorCode instanceof Integer) ? (Integer)errorCode : (Long)errorCode));
       Object description = map.get("description");
-      fromMapResult.description = (String)description;
-      return fromMapResult;
+      pigeonResult.setDescription((String)description);
+      return pigeonResult;
     }
   }
 
@@ -111,7 +190,7 @@ private CookieManagerHostApiCodec() {}
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface CookieManagerHostApi {
     void clearCookies(Result<Boolean> result);
-    void setCookie(String url, String value);
+    void setCookie(@NonNull String url, @NonNull String value);
 
     /** The codec used by CookieManagerHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -186,32 +265,32 @@ private WebViewHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface WebViewHostApi {
-    void create(Long instanceId, Boolean useHybridComposition);
-    void dispose(Long instanceId);
-    void loadData(Long instanceId, String data, String mimeType, String encoding);
-    void loadDataWithBaseUrl(Long instanceId, String baseUrl, String data, String mimeType, String encoding, String historyUrl);
-    void loadUrl(Long instanceId, String url, Map<String, String> headers);
-    void postUrl(Long instanceId, String url, byte[] data);
-    String getUrl(Long instanceId);
-    Boolean canGoBack(Long instanceId);
-    Boolean canGoForward(Long instanceId);
-    void goBack(Long instanceId);
-    void goForward(Long instanceId);
-    void reload(Long instanceId);
-    void clearCache(Long instanceId, Boolean includeDiskFiles);
-    void evaluateJavascript(Long instanceId, String javascriptString, Result<String> result);
-    String getTitle(Long instanceId);
-    void scrollTo(Long instanceId, Long x, Long y);
-    void scrollBy(Long instanceId, Long x, Long y);
-    Long getScrollX(Long instanceId);
-    Long getScrollY(Long instanceId);
-    void setWebContentsDebuggingEnabled(Boolean enabled);
-    void setWebViewClient(Long instanceId, Long webViewClientInstanceId);
-    void addJavaScriptChannel(Long instanceId, Long javaScriptChannelInstanceId);
-    void removeJavaScriptChannel(Long instanceId, Long javaScriptChannelInstanceId);
-    void setDownloadListener(Long instanceId, Long listenerInstanceId);
-    void setWebChromeClient(Long instanceId, Long clientInstanceId);
-    void setBackgroundColor(Long instanceId, Long color);
+    void create(@NonNull Long instanceId, @NonNull Boolean useHybridComposition);
+    void dispose(@NonNull Long instanceId);
+    void loadData(@NonNull Long instanceId, @NonNull String data, @NonNull String mimeType, @NonNull String encoding);
+    void loadDataWithBaseUrl(@NonNull Long instanceId, @NonNull String baseUrl, @NonNull String data, @NonNull String mimeType, @NonNull String encoding, @NonNull String historyUrl);
+    void loadUrl(@NonNull Long instanceId, @NonNull String url, @NonNull Map<String, String> headers);
+    void postUrl(@NonNull Long instanceId, @NonNull String url, @NonNull byte[] data);
+    @NonNull String getUrl(@NonNull Long instanceId);
+    @NonNull Boolean canGoBack(@NonNull Long instanceId);
+    @NonNull Boolean canGoForward(@NonNull Long instanceId);
+    void goBack(@NonNull Long instanceId);
+    void goForward(@NonNull Long instanceId);
+    void reload(@NonNull Long instanceId);
+    void clearCache(@NonNull Long instanceId, @NonNull Boolean includeDiskFiles);
+    void evaluateJavascript(@NonNull Long instanceId, @NonNull String javascriptString, Result<String> result);
+    @NonNull String getTitle(@NonNull Long instanceId);
+    void scrollTo(@NonNull Long instanceId, @NonNull Long x, @NonNull Long y);
+    void scrollBy(@NonNull Long instanceId, @NonNull Long x, @NonNull Long y);
+    @NonNull Long getScrollX(@NonNull Long instanceId);
+    @NonNull Long getScrollY(@NonNull Long instanceId);
+    void setWebContentsDebuggingEnabled(@NonNull Boolean enabled);
+    void setWebViewClient(@NonNull Long instanceId, @NonNull Long webViewClientInstanceId);
+    void addJavaScriptChannel(@NonNull Long instanceId, @NonNull Long javaScriptChannelInstanceId);
+    void removeJavaScriptChannel(@NonNull Long instanceId, @NonNull Long javaScriptChannelInstanceId);
+    void setDownloadListener(@NonNull Long instanceId, @NonNull Long listenerInstanceId);
+    void setWebChromeClient(@NonNull Long instanceId, @NonNull Long clientInstanceId);
+    void setBackgroundColor(@NonNull Long instanceId, @NonNull Long color);
 
     /** The codec used by WebViewHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -236,7 +315,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (useHybridCompositionArg == null) {
                 throw new NullPointerException("useHybridCompositionArg unexpectedly null.");
               }
-              api.create(instanceIdArg.longValue(), useHybridCompositionArg);
+              api.create((instanceIdArg == null) ? null : instanceIdArg.longValue(), useHybridCompositionArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -260,7 +339,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              api.dispose(instanceIdArg.longValue());
+              api.dispose((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -296,7 +375,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (encodingArg == null) {
                 throw new NullPointerException("encodingArg unexpectedly null.");
               }
-              api.loadData(instanceIdArg.longValue(), dataArg, mimeTypeArg, encodingArg);
+              api.loadData((instanceIdArg == null) ? null : instanceIdArg.longValue(), dataArg, mimeTypeArg, encodingArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -340,7 +419,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (historyUrlArg == null) {
                 throw new NullPointerException("historyUrlArg unexpectedly null.");
               }
-              api.loadDataWithBaseUrl(instanceIdArg.longValue(), baseUrlArg, dataArg, mimeTypeArg, encodingArg, historyUrlArg);
+              api.loadDataWithBaseUrl((instanceIdArg == null) ? null : instanceIdArg.longValue(), baseUrlArg, dataArg, mimeTypeArg, encodingArg, historyUrlArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -372,7 +451,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (headersArg == null) {
                 throw new NullPointerException("headersArg unexpectedly null.");
               }
-              api.loadUrl(instanceIdArg.longValue(), urlArg, headersArg);
+              api.loadUrl((instanceIdArg == null) ? null : instanceIdArg.longValue(), urlArg, headersArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -404,7 +483,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (dataArg == null) {
                 throw new NullPointerException("dataArg unexpectedly null.");
               }
-              api.postUrl(instanceIdArg.longValue(), urlArg, dataArg);
+              api.postUrl((instanceIdArg == null) ? null : instanceIdArg.longValue(), urlArg, dataArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -428,7 +507,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              String output = api.getUrl(instanceIdArg.longValue());
+              String output = api.getUrl((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", output);
             }
             catch (Error | RuntimeException exception) {
@@ -452,7 +531,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              Boolean output = api.canGoBack(instanceIdArg.longValue());
+              Boolean output = api.canGoBack((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", output);
             }
             catch (Error | RuntimeException exception) {
@@ -476,7 +555,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              Boolean output = api.canGoForward(instanceIdArg.longValue());
+              Boolean output = api.canGoForward((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", output);
             }
             catch (Error | RuntimeException exception) {
@@ -500,7 +579,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              api.goBack(instanceIdArg.longValue());
+              api.goBack((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -524,7 +603,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              api.goForward(instanceIdArg.longValue());
+              api.goForward((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -548,7 +627,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              api.reload(instanceIdArg.longValue());
+              api.reload((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -576,7 +655,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewHostApi api) {
               if (includeDiskFilesArg == null) {
                 throw new NullPointerException("includeDiskFilesArg unexpectedly null.");
               }
-              api.clearCache(instanceIdArg.longValue(), includeDiskFilesArg);
+              api.clearCache((instanceIdArg == null) ? null : instanceIdArg.longValue(), includeDiskFilesArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -615,7 +694,7 @@ public void error(Throwable error) {
                 }
               };
 
-              api.evaluateJavascript(instanceIdArg.longValue(), javascriptStringArg, resultCallback);
+              api.evaluateJavascript((instanceIdArg == null) ? null : instanceIdArg.longValue(), javascriptStringArg, resultCallback);
             }
             catch (Error | RuntimeException exception) {
               wrapped.put("error", wrapError(exception));
@@ -638,7 +717,7 @@ public void error(Throwable error) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              String output = api.getTitle(instanceIdArg.longValue());
+              String output = api.getTitle((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", output);
             }
             catch (Error | RuntimeException exception) {
@@ -670,7 +749,7 @@ public void error(Throwable error) {
               if (yArg == null) {
                 throw new NullPointerException("yArg unexpectedly null.");
               }
-              api.scrollTo(instanceIdArg.longValue(), xArg.longValue(), yArg.longValue());
+              api.scrollTo((instanceIdArg == null) ? null : instanceIdArg.longValue(), (xArg == null) ? null : xArg.longValue(), (yArg == null) ? null : yArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -702,7 +781,7 @@ public void error(Throwable error) {
               if (yArg == null) {
                 throw new NullPointerException("yArg unexpectedly null.");
               }
-              api.scrollBy(instanceIdArg.longValue(), xArg.longValue(), yArg.longValue());
+              api.scrollBy((instanceIdArg == null) ? null : instanceIdArg.longValue(), (xArg == null) ? null : xArg.longValue(), (yArg == null) ? null : yArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -726,7 +805,7 @@ public void error(Throwable error) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              Long output = api.getScrollX(instanceIdArg.longValue());
+              Long output = api.getScrollX((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", output);
             }
             catch (Error | RuntimeException exception) {
@@ -750,7 +829,7 @@ public void error(Throwable error) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              Long output = api.getScrollY(instanceIdArg.longValue());
+              Long output = api.getScrollY((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", output);
             }
             catch (Error | RuntimeException exception) {
@@ -802,7 +881,7 @@ public void error(Throwable error) {
               if (webViewClientInstanceIdArg == null) {
                 throw new NullPointerException("webViewClientInstanceIdArg unexpectedly null.");
               }
-              api.setWebViewClient(instanceIdArg.longValue(), webViewClientInstanceIdArg.longValue());
+              api.setWebViewClient((instanceIdArg == null) ? null : instanceIdArg.longValue(), (webViewClientInstanceIdArg == null) ? null : webViewClientInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -830,7 +909,7 @@ public void error(Throwable error) {
               if (javaScriptChannelInstanceIdArg == null) {
                 throw new NullPointerException("javaScriptChannelInstanceIdArg unexpectedly null.");
               }
-              api.addJavaScriptChannel(instanceIdArg.longValue(), javaScriptChannelInstanceIdArg.longValue());
+              api.addJavaScriptChannel((instanceIdArg == null) ? null : instanceIdArg.longValue(), (javaScriptChannelInstanceIdArg == null) ? null : javaScriptChannelInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -858,7 +937,7 @@ public void error(Throwable error) {
               if (javaScriptChannelInstanceIdArg == null) {
                 throw new NullPointerException("javaScriptChannelInstanceIdArg unexpectedly null.");
               }
-              api.removeJavaScriptChannel(instanceIdArg.longValue(), javaScriptChannelInstanceIdArg.longValue());
+              api.removeJavaScriptChannel((instanceIdArg == null) ? null : instanceIdArg.longValue(), (javaScriptChannelInstanceIdArg == null) ? null : javaScriptChannelInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -886,7 +965,7 @@ public void error(Throwable error) {
               if (listenerInstanceIdArg == null) {
                 throw new NullPointerException("listenerInstanceIdArg unexpectedly null.");
               }
-              api.setDownloadListener(instanceIdArg.longValue(), listenerInstanceIdArg.longValue());
+              api.setDownloadListener((instanceIdArg == null) ? null : instanceIdArg.longValue(), (listenerInstanceIdArg == null) ? null : listenerInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -914,7 +993,7 @@ public void error(Throwable error) {
               if (clientInstanceIdArg == null) {
                 throw new NullPointerException("clientInstanceIdArg unexpectedly null.");
               }
-              api.setWebChromeClient(instanceIdArg.longValue(), clientInstanceIdArg.longValue());
+              api.setWebChromeClient((instanceIdArg == null) ? null : instanceIdArg.longValue(), (clientInstanceIdArg == null) ? null : clientInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -942,7 +1021,7 @@ public void error(Throwable error) {
               if (colorArg == null) {
                 throw new NullPointerException("colorArg unexpectedly null.");
               }
-              api.setBackgroundColor(instanceIdArg.longValue(), colorArg.longValue());
+              api.setBackgroundColor((instanceIdArg == null) ? null : instanceIdArg.longValue(), (colorArg == null) ? null : colorArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -963,21 +1042,21 @@ private WebSettingsHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface WebSettingsHostApi {
-    void create(Long instanceId, Long webViewInstanceId);
-    void dispose(Long instanceId);
-    void setDomStorageEnabled(Long instanceId, Boolean flag);
-    void setJavaScriptCanOpenWindowsAutomatically(Long instanceId, Boolean flag);
-    void setSupportMultipleWindows(Long instanceId, Boolean support);
-    void setJavaScriptEnabled(Long instanceId, Boolean flag);
-    void setUserAgentString(Long instanceId, String userAgentString);
-    void setMediaPlaybackRequiresUserGesture(Long instanceId, Boolean require);
-    void setSupportZoom(Long instanceId, Boolean support);
-    void setGeolocationEnabled(Long instanceId, Boolean enabled);
-    void setLoadWithOverviewMode(Long instanceId, Boolean overview);
-    void setUseWideViewPort(Long instanceId, Boolean use);
-    void setDisplayZoomControls(Long instanceId, Boolean enabled);
-    void setBuiltInZoomControls(Long instanceId, Boolean enabled);
-    void setAllowFileAccess(Long instanceId, Boolean enabled);
+    void create(@NonNull Long instanceId, @NonNull Long webViewInstanceId);
+    void dispose(@NonNull Long instanceId);
+    void setDomStorageEnabled(@NonNull Long instanceId, @NonNull Boolean flag);
+    void setJavaScriptCanOpenWindowsAutomatically(@NonNull Long instanceId, @NonNull Boolean flag);
+    void setSupportMultipleWindows(@NonNull Long instanceId, @NonNull Boolean support);
+    void setJavaScriptEnabled(@NonNull Long instanceId, @NonNull Boolean flag);
+    void setUserAgentString(@NonNull Long instanceId, @NonNull String userAgentString);
+    void setMediaPlaybackRequiresUserGesture(@NonNull Long instanceId, @NonNull Boolean require);
+    void setSupportZoom(@NonNull Long instanceId, @NonNull Boolean support);
+    void setGeolocationEnabled(@NonNull Long instanceId, @NonNull Boolean enabled);
+    void setLoadWithOverviewMode(@NonNull Long instanceId, @NonNull Boolean overview);
+    void setUseWideViewPort(@NonNull Long instanceId, @NonNull Boolean use);
+    void setDisplayZoomControls(@NonNull Long instanceId, @NonNull Boolean enabled);
+    void setBuiltInZoomControls(@NonNull Long instanceId, @NonNull Boolean enabled);
+    void setAllowFileAccess(@NonNull Long instanceId, @NonNull Boolean enabled);
 
     /** The codec used by WebSettingsHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -1002,7 +1081,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (webViewInstanceIdArg == null) {
                 throw new NullPointerException("webViewInstanceIdArg unexpectedly null.");
               }
-              api.create(instanceIdArg.longValue(), webViewInstanceIdArg.longValue());
+              api.create((instanceIdArg == null) ? null : instanceIdArg.longValue(), (webViewInstanceIdArg == null) ? null : webViewInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1026,7 +1105,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              api.dispose(instanceIdArg.longValue());
+              api.dispose((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1054,7 +1133,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (flagArg == null) {
                 throw new NullPointerException("flagArg unexpectedly null.");
               }
-              api.setDomStorageEnabled(instanceIdArg.longValue(), flagArg);
+              api.setDomStorageEnabled((instanceIdArg == null) ? null : instanceIdArg.longValue(), flagArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1082,7 +1161,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (flagArg == null) {
                 throw new NullPointerException("flagArg unexpectedly null.");
               }
-              api.setJavaScriptCanOpenWindowsAutomatically(instanceIdArg.longValue(), flagArg);
+              api.setJavaScriptCanOpenWindowsAutomatically((instanceIdArg == null) ? null : instanceIdArg.longValue(), flagArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1110,7 +1189,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (supportArg == null) {
                 throw new NullPointerException("supportArg unexpectedly null.");
               }
-              api.setSupportMultipleWindows(instanceIdArg.longValue(), supportArg);
+              api.setSupportMultipleWindows((instanceIdArg == null) ? null : instanceIdArg.longValue(), supportArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1138,7 +1217,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (flagArg == null) {
                 throw new NullPointerException("flagArg unexpectedly null.");
               }
-              api.setJavaScriptEnabled(instanceIdArg.longValue(), flagArg);
+              api.setJavaScriptEnabled((instanceIdArg == null) ? null : instanceIdArg.longValue(), flagArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1166,7 +1245,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (userAgentStringArg == null) {
                 throw new NullPointerException("userAgentStringArg unexpectedly null.");
               }
-              api.setUserAgentString(instanceIdArg.longValue(), userAgentStringArg);
+              api.setUserAgentString((instanceIdArg == null) ? null : instanceIdArg.longValue(), userAgentStringArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1194,7 +1273,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (requireArg == null) {
                 throw new NullPointerException("requireArg unexpectedly null.");
               }
-              api.setMediaPlaybackRequiresUserGesture(instanceIdArg.longValue(), requireArg);
+              api.setMediaPlaybackRequiresUserGesture((instanceIdArg == null) ? null : instanceIdArg.longValue(), requireArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1222,7 +1301,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (supportArg == null) {
                 throw new NullPointerException("supportArg unexpectedly null.");
               }
-              api.setSupportZoom(instanceIdArg.longValue(), supportArg);
+              api.setSupportZoom((instanceIdArg == null) ? null : instanceIdArg.longValue(), supportArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1250,7 +1329,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (enabledArg == null) {
                 throw new NullPointerException("enabledArg unexpectedly null.");
               }
-              api.setGeolocationEnabled(instanceIdArg.longValue(), enabledArg);
+              api.setGeolocationEnabled((instanceIdArg == null) ? null : instanceIdArg.longValue(), enabledArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1278,7 +1357,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (overviewArg == null) {
                 throw new NullPointerException("overviewArg unexpectedly null.");
               }
-              api.setLoadWithOverviewMode(instanceIdArg.longValue(), overviewArg);
+              api.setLoadWithOverviewMode((instanceIdArg == null) ? null : instanceIdArg.longValue(), overviewArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1306,7 +1385,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (useArg == null) {
                 throw new NullPointerException("useArg unexpectedly null.");
               }
-              api.setUseWideViewPort(instanceIdArg.longValue(), useArg);
+              api.setUseWideViewPort((instanceIdArg == null) ? null : instanceIdArg.longValue(), useArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1334,7 +1413,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (enabledArg == null) {
                 throw new NullPointerException("enabledArg unexpectedly null.");
               }
-              api.setDisplayZoomControls(instanceIdArg.longValue(), enabledArg);
+              api.setDisplayZoomControls((instanceIdArg == null) ? null : instanceIdArg.longValue(), enabledArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1362,7 +1441,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (enabledArg == null) {
                 throw new NullPointerException("enabledArg unexpectedly null.");
               }
-              api.setBuiltInZoomControls(instanceIdArg.longValue(), enabledArg);
+              api.setBuiltInZoomControls((instanceIdArg == null) ? null : instanceIdArg.longValue(), enabledArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1390,7 +1469,7 @@ static void setup(BinaryMessenger binaryMessenger, WebSettingsHostApi api) {
               if (enabledArg == null) {
                 throw new NullPointerException("enabledArg unexpectedly null.");
               }
-              api.setAllowFileAccess(instanceIdArg.longValue(), enabledArg);
+              api.setAllowFileAccess((instanceIdArg == null) ? null : instanceIdArg.longValue(), enabledArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1411,7 +1490,7 @@ private JavaScriptChannelHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface JavaScriptChannelHostApi {
-    void create(Long instanceId, String channelName);
+    void create(@NonNull Long instanceId, @NonNull String channelName);
 
     /** The codec used by JavaScriptChannelHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -1436,7 +1515,7 @@ static void setup(BinaryMessenger binaryMessenger, JavaScriptChannelHostApi api)
               if (channelNameArg == null) {
                 throw new NullPointerException("channelNameArg unexpectedly null.");
               }
-              api.create(instanceIdArg.longValue(), channelNameArg);
+              api.create((instanceIdArg == null) ? null : instanceIdArg.longValue(), channelNameArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1468,14 +1547,14 @@ static MessageCodec<Object> getCodec() {
       return JavaScriptChannelFlutterApiCodec.INSTANCE;
     }
 
-    public void dispose(Long instanceIdArg, Reply<Void> callback) {
+    public void dispose(@NonNull Long instanceIdArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void postMessage(Long instanceIdArg, String messageArg, Reply<Void> callback) {
+    public void postMessage(@NonNull Long instanceIdArg, @NonNull String messageArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, messageArg)), channelReply -> {
@@ -1490,7 +1569,7 @@ private WebViewClientHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface WebViewClientHostApi {
-    void create(Long instanceId, Boolean shouldOverrideUrlLoading);
+    void create(@NonNull Long instanceId, @NonNull Boolean shouldOverrideUrlLoading);
 
     /** The codec used by WebViewClientHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -1515,7 +1594,7 @@ static void setup(BinaryMessenger binaryMessenger, WebViewClientHostApi api) {
               if (shouldOverrideUrlLoadingArg == null) {
                 throw new NullPointerException("shouldOverrideUrlLoadingArg unexpectedly null.");
               }
-              api.create(instanceIdArg.longValue(), shouldOverrideUrlLoadingArg);
+              api.create((instanceIdArg == null) ? null : instanceIdArg.longValue(), shouldOverrideUrlLoadingArg);
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1575,49 +1654,49 @@ static MessageCodec<Object> getCodec() {
       return WebViewClientFlutterApiCodec.INSTANCE;
     }
 
-    public void dispose(Long instanceIdArg, Reply<Void> callback) {
+    public void dispose(@NonNull Long instanceIdArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.dispose", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void onPageStarted(Long instanceIdArg, Long webViewInstanceIdArg, String urlArg, Reply<Void> callback) {
+    public void onPageStarted(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull String urlArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void onPageFinished(Long instanceIdArg, Long webViewInstanceIdArg, String urlArg, Reply<Void> callback) {
+    public void onPageFinished(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull String urlArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void onReceivedRequestError(Long instanceIdArg, Long webViewInstanceIdArg, WebResourceRequestData requestArg, WebResourceErrorData errorArg, Reply<Void> callback) {
+    public void onReceivedRequestError(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull WebResourceRequestData requestArg, @NonNull WebResourceErrorData errorArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, requestArg, errorArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void onReceivedError(Long instanceIdArg, Long webViewInstanceIdArg, Long errorCodeArg, String descriptionArg, String failingUrlArg, Reply<Void> callback) {
+    public void onReceivedError(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull Long errorCodeArg, @NonNull String descriptionArg, @NonNull String failingUrlArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, errorCodeArg, descriptionArg, failingUrlArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void requestLoading(Long instanceIdArg, Long webViewInstanceIdArg, WebResourceRequestData requestArg, Reply<Void> callback) {
+    public void requestLoading(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull WebResourceRequestData requestArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, requestArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void urlLoading(Long instanceIdArg, Long webViewInstanceIdArg, String urlArg, Reply<Void> callback) {
+    public void urlLoading(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull String urlArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, urlArg)), channelReply -> {
@@ -1632,7 +1711,7 @@ private DownloadListenerHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface DownloadListenerHostApi {
-    void create(Long instanceId);
+    void create(@NonNull Long instanceId);
 
     /** The codec used by DownloadListenerHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -1653,7 +1732,7 @@ static void setup(BinaryMessenger binaryMessenger, DownloadListenerHostApi api)
               if (instanceIdArg == null) {
                 throw new NullPointerException("instanceIdArg unexpectedly null.");
               }
-              api.create(instanceIdArg.longValue());
+              api.create((instanceIdArg == null) ? null : instanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1685,14 +1764,14 @@ static MessageCodec<Object> getCodec() {
       return DownloadListenerFlutterApiCodec.INSTANCE;
     }
 
-    public void dispose(Long instanceIdArg, Reply<Void> callback) {
+    public void dispose(@NonNull Long instanceIdArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.DownloadListenerFlutterApi.dispose", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void onDownloadStart(Long instanceIdArg, String urlArg, String userAgentArg, String contentDispositionArg, String mimetypeArg, Long contentLengthArg, Reply<Void> callback) {
+    public void onDownloadStart(@NonNull Long instanceIdArg, @NonNull String urlArg, @NonNull String userAgentArg, @NonNull String contentDispositionArg, @NonNull String mimetypeArg, @NonNull Long contentLengthArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, urlArg, userAgentArg, contentDispositionArg, mimetypeArg, contentLengthArg)), channelReply -> {
@@ -1707,7 +1786,7 @@ private WebChromeClientHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface WebChromeClientHostApi {
-    void create(Long instanceId, Long webViewClientInstanceId);
+    void create(@NonNull Long instanceId, @NonNull Long webViewClientInstanceId);
 
     /** The codec used by WebChromeClientHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -1732,7 +1811,7 @@ static void setup(BinaryMessenger binaryMessenger, WebChromeClientHostApi api) {
               if (webViewClientInstanceIdArg == null) {
                 throw new NullPointerException("webViewClientInstanceIdArg unexpectedly null.");
               }
-              api.create(instanceIdArg.longValue(), webViewClientInstanceIdArg.longValue());
+              api.create((instanceIdArg == null) ? null : instanceIdArg.longValue(), (webViewClientInstanceIdArg == null) ? null : webViewClientInstanceIdArg.longValue());
               wrapped.put("result", null);
             }
             catch (Error | RuntimeException exception) {
@@ -1753,8 +1832,8 @@ private FlutterAssetManagerHostApiCodec() {}
 
   /** Generated interface from Pigeon that represents a handler of messages from Flutter.*/
   public interface FlutterAssetManagerHostApi {
-    List<String> list(String path);
-    String getAssetFilePathByName(String name);
+    @NonNull List<String> list(@NonNull String path);
+    @NonNull String getAssetFilePathByName(@NonNull String name);
 
     /** The codec used by FlutterAssetManagerHostApi. */
     static MessageCodec<Object> getCodec() {
@@ -1831,14 +1910,14 @@ static MessageCodec<Object> getCodec() {
       return WebChromeClientFlutterApiCodec.INSTANCE;
     }
 
-    public void dispose(Long instanceIdArg, Reply<Void> callback) {
+    public void dispose(@NonNull Long instanceIdArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebChromeClientFlutterApi.dispose", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg)), channelReply -> {
         callback.reply(null);
       });
     }
-    public void onProgressChanged(Long instanceIdArg, Long webViewInstanceIdArg, Long progressArg, Reply<Void> callback) {
+    public void onProgressChanged(@NonNull Long instanceIdArg, @NonNull Long webViewInstanceIdArg, @NonNull Long progressArg, Reply<Void> callback) {
       BasicMessageChannel<Object> channel =
           new BasicMessageChannel<>(binaryMessenger, "dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged", getCodec());
       channel.send(new ArrayList<Object>(Arrays.asList(instanceIdArg, webViewInstanceIdArg, progressArg)), channelReply -> {
@@ -1850,7 +1929,7 @@ private static Map<String, Object> wrapError(Throwable exception) {
     Map<String, Object> errorMap = new HashMap<>();
     errorMap.put("message", exception.toString());
     errorMap.put("code", exception.getClass().getSimpleName());
-    errorMap.put("details", null);
+    errorMap.put("details", "Cause: " + exception.getCause() + ", Stacktrace: " + Log.getStackTraceString(exception));
     return errorMap;
   }
 }
diff --git a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
index 8588bf92e63e..8fd347306ab2 100644
--- a/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
@@ -5,10 +5,12 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:webview_flutter_android/webview_android.dart';
 import 'package:webview_flutter_android/webview_surface_android.dart';
 import 'package:webview_flutter_android_example/navigation_decision.dart';
@@ -42,8 +44,7 @@ Future<void> main() async {
   final String headersUrl = '$prefixUrl/headers';
 
   testWidgets('initialUrl', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     await tester.pumpWidget(
       MaterialApp(
         home: Directionality(
@@ -65,8 +66,7 @@ Future<void> main() async {
 
   // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757
   testWidgets('loadUrl', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
@@ -86,8 +86,7 @@ Future<void> main() async {
   }, skip: _skipDueToIssue86757);
 
   testWidgets('evaluateJavascript', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
@@ -108,8 +107,7 @@ Future<void> main() async {
 
   // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757
   testWidgets('loadUrl with headers', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     final StreamController<String> pageStarts = StreamController<String>();
     final StreamController<String> pageLoads = StreamController<String>();
     await tester.pumpWidget(
@@ -132,9 +130,7 @@ Future<void> main() async {
       ),
     );
     final WebViewController controller = await controllerCompleter.future;
-    final Map<String, String> headers = <String, String>{
-      'test_header': 'flutter_test_header'
-    };
+    final Map<String, String> headers = <String, String>{'test_header': 'flutter_test_header'};
     await controller.loadUrl(headersUrl, headers: headers);
     final String? currentUrl = await controller.currentUrl();
     expect(currentUrl, headersUrl);
@@ -142,15 +138,13 @@ Future<void> main() async {
     await pageStarts.stream.firstWhere((String url) => url == currentUrl);
     await pageLoads.stream.firstWhere((String url) => url == currentUrl);
 
-    final String content = await controller
-        .runJavascriptReturningResult('document.documentElement.innerText');
+    final String content = await controller.runJavascriptReturningResult('document.documentElement.innerText');
     expect(content.contains('flutter_test_header'), isTrue);
   }, skip: _skipDueToIssue86757);
 
   // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757
   testWidgets('JavascriptChannel', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     final Completer<void> pageStarted = Completer<void>();
     final Completer<void> pageLoaded = Completer<void>();
     final List<String> messagesReceived = <String>[];
@@ -160,8 +154,7 @@ Future<void> main() async {
         child: WebView(
           key: GlobalKey(),
           // This is the data URL for: '<!DOCTYPE html>'
-          initialUrl:
-              'data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+',
+          initialUrl: 'data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+',
           onWebViewCreated: (WebViewController controller) {
             controllerCompleter.complete(controller);
           },
@@ -222,8 +215,7 @@ Future<void> main() async {
   });
 
   testWidgets('set custom userAgent', (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter1 =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter1 = Completer<WebViewController>();
     final GlobalKey _globalKey = GlobalKey();
     await tester.pumpWidget(
       Directionality(
@@ -260,10 +252,8 @@ Future<void> main() async {
   });
 
   // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757
-  testWidgets('use default platform userAgent after webView is rebuilt',
-      (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+  testWidgets('use default platform userAgent after webView is rebuilt', (WidgetTester tester) async {
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     final GlobalKey _globalKey = GlobalKey();
     // Build the webView with no user agent to get the default platform user agent.
     await tester.pumpWidget(
@@ -314,10 +304,8 @@ Future<void> main() async {
   group('Video playback policy', () {
     late String videoTestBase64;
     setUpAll(() async {
-      final ByteData videoData =
-          await rootBundle.load('assets/sample_video.mp4');
-      final String base64VideoData =
-          base64Encode(Uint8List.view(videoData.buffer));
+      final ByteData videoData = await rootBundle.load('assets/sample_video.mp4');
+      final String base64VideoData = base64Encode(Uint8List.view(videoData.buffer));
       final String videoTest = '''
         <!DOCTYPE html><html>
         <head><title>Video auto play</title>
@@ -352,8 +340,7 @@ Future<void> main() async {
     });
 
     testWidgets('Auto media playback', (WidgetTester tester) async {
-      Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       Completer<void> pageLoaded = Completer<void>();
 
       await tester.pumpWidget(
@@ -376,8 +363,7 @@ Future<void> main() async {
       WebViewController controller = await controllerCompleter.future;
       await pageLoaded.future;
 
-      String isPaused =
-          await controller.runJavascriptReturningResult('isPaused();');
+      String isPaused = await controller.runJavascriptReturningResult('isPaused();');
       expect(isPaused, _webviewBool(false));
 
       controllerCompleter = Completer<WebViewController>();
@@ -397,8 +383,7 @@ Future<void> main() async {
             onPageFinished: (String url) {
               pageLoaded.complete(null);
             },
-            initialMediaPlaybackPolicy:
-                AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
+            initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
           ),
         ),
       );
@@ -410,10 +395,8 @@ Future<void> main() async {
       expect(isPaused, _webviewBool(true));
     });
 
-    testWidgets('Changes to initialMediaPlaybackPolicy are ignored',
-        (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+    testWidgets('Changes to initialMediaPlaybackPolicy are ignored', (WidgetTester tester) async {
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       Completer<void> pageLoaded = Completer<void>();
 
       final GlobalKey key = GlobalKey();
@@ -437,8 +420,7 @@ Future<void> main() async {
       final WebViewController controller = await controllerCompleter.future;
       await pageLoaded.future;
 
-      String isPaused =
-          await controller.runJavascriptReturningResult('isPaused();');
+      String isPaused = await controller.runJavascriptReturningResult('isPaused();');
       expect(isPaused, _webviewBool(false));
 
       pageLoaded = Completer<void>();
@@ -456,8 +438,7 @@ Future<void> main() async {
             onPageFinished: (String url) {
               pageLoaded.complete(null);
             },
-            initialMediaPlaybackPolicy:
-                AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
+            initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
           ),
         ),
       );
@@ -470,10 +451,8 @@ Future<void> main() async {
       expect(isPaused, _webviewBool(false));
     });
 
-    testWidgets('Video plays inline when allowsInlineMediaPlayback is true',
-        (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+    testWidgets('Video plays inline when allowsInlineMediaPlayback is true', (WidgetTester tester) async {
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       final Completer<void> pageLoaded = Completer<void>();
       final Completer<void> videoPlaying = Completer<void>();
 
@@ -515,8 +494,7 @@ Future<void> main() async {
       // Makes sure we get the correct event that indicates the video is actually playing.
       await videoPlaying.future;
 
-      final String fullScreen =
-          await controller.runJavascriptReturningResult('isFullScreen();');
+      final String fullScreen = await controller.runJavascriptReturningResult('isFullScreen();');
       expect(fullScreen, _webviewBool(false));
     });
   });
@@ -524,10 +502,8 @@ Future<void> main() async {
   group('Audio playback policy', () {
     late String audioTestBase64;
     setUpAll(() async {
-      final ByteData audioData =
-          await rootBundle.load('assets/sample_audio.ogg');
-      final String base64AudioData =
-          base64Encode(Uint8List.view(audioData.buffer));
+      final ByteData audioData = await rootBundle.load('assets/sample_audio.ogg');
+      final String base64AudioData = base64Encode(Uint8List.view(audioData.buffer));
       final String audioTest = '''
         <!DOCTYPE html><html>
         <head><title>Audio auto play</title>
@@ -553,8 +529,7 @@ Future<void> main() async {
     });
 
     testWidgets('Auto media playback', (WidgetTester tester) async {
-      Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       Completer<void> pageStarted = Completer<void>();
       Completer<void> pageLoaded = Completer<void>();
 
@@ -582,8 +557,7 @@ Future<void> main() async {
       await pageStarted.future;
       await pageLoaded.future;
 
-      String isPaused =
-          await controller.runJavascriptReturningResult('isPaused();');
+      String isPaused = await controller.runJavascriptReturningResult('isPaused();');
       expect(isPaused, _webviewBool(false));
 
       controllerCompleter = Completer<WebViewController>();
@@ -607,8 +581,7 @@ Future<void> main() async {
             onPageFinished: (String url) {
               pageLoaded.complete(null);
             },
-            initialMediaPlaybackPolicy:
-                AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
+            initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
           ),
         ),
       );
@@ -621,10 +594,8 @@ Future<void> main() async {
       expect(isPaused, _webviewBool(true));
     });
 
-    testWidgets('Changes to initialMediaPlaybackPolocy are ignored',
-        (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+    testWidgets('Changes to initialMediaPlaybackPolocy are ignored', (WidgetTester tester) async {
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       Completer<void> pageStarted = Completer<void>();
       Completer<void> pageLoaded = Completer<void>();
 
@@ -653,8 +624,7 @@ Future<void> main() async {
       await pageStarted.future;
       await pageLoaded.future;
 
-      String isPaused =
-          await controller.runJavascriptReturningResult('isPaused();');
+      String isPaused = await controller.runJavascriptReturningResult('isPaused();');
       expect(isPaused, _webviewBool(false));
 
       pageStarted = Completer<void>();
@@ -676,8 +646,7 @@ Future<void> main() async {
             onPageFinished: (String url) {
               pageLoaded.complete(null);
             },
-            initialMediaPlaybackPolicy:
-                AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
+            initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
           ),
         ),
       );
@@ -701,12 +670,10 @@ Future<void> main() async {
         </body>
         </html>
       ''';
-    final String getTitleTestBase64 =
-        base64Encode(const Utf8Encoder().convert(getTitleTest));
+    final String getTitleTestBase64 = base64Encode(const Utf8Encoder().convert(getTitleTest));
     final Completer<void> pageStarted = Completer<void>();
     final Completer<void> pageLoaded = Completer<void>();
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
 
     await tester.pumpWidget(
       Directionality(
@@ -758,19 +725,16 @@ Future<void> main() async {
         </html>
       ''';
 
-      final String scrollTestPageBase64 =
-          base64Encode(const Utf8Encoder().convert(scrollTestPage));
+      final String scrollTestPageBase64 = base64Encode(const Utf8Encoder().convert(scrollTestPage));
 
       final Completer<void> pageLoaded = Completer<void>();
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
 
       await tester.pumpWidget(
         Directionality(
           textDirection: TextDirection.ltr,
           child: WebView(
-            initialUrl:
-                'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
+            initialUrl: 'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
             onWebViewCreated: (WebViewController controller) {
               controllerCompleter.complete(controller);
             },
@@ -845,19 +809,16 @@ Future<void> main() async {
         </html>
       ''';
 
-      final String scrollTestPageBase64 =
-          base64Encode(const Utf8Encoder().convert(scrollTestPage));
+      final String scrollTestPageBase64 = base64Encode(const Utf8Encoder().convert(scrollTestPage));
 
       final Completer<void> pageLoaded = Completer<void>();
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
 
       await tester.pumpWidget(
         Directionality(
           textDirection: TextDirection.ltr,
           child: WebView(
-            initialUrl:
-                'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
+            initialUrl: 'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
             onWebViewCreated: (WebViewController controller) {
               controllerCompleter.complete(controller);
             },
@@ -892,8 +853,7 @@ Future<void> main() async {
     }, skip: _skipDueToIssue86757);
 
     // TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757
-    testWidgets('inputs are scrolled into view when focused',
-        (WidgetTester tester) async {
+    testWidgets('inputs are scrolled into view when focused', (WidgetTester tester) async {
       const String scrollTestPage = '''
         <!DOCTYPE html>
         <html>
@@ -918,12 +878,10 @@ Future<void> main() async {
         </html>
       ''';
 
-      final String scrollTestPageBase64 =
-          base64Encode(const Utf8Encoder().convert(scrollTestPage));
+      final String scrollTestPageBase64 = base64Encode(const Utf8Encoder().convert(scrollTestPage));
 
       final Completer<void> pageLoaded = Completer<void>();
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
 
       await tester.runAsync(() async {
         await tester.pumpWidget(
@@ -933,8 +891,7 @@ Future<void> main() async {
               width: 200,
               height: 200,
               child: WebView(
-                initialUrl:
-                    'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
+                initialUrl: 'data:text/html;charset=utf-8;base64,$scrollTestPageBase64',
                 onWebViewCreated: (WebViewController controller) {
                   controllerCompleter.complete(controller);
                 },
@@ -952,64 +909,44 @@ Future<void> main() async {
 
       final WebViewController controller = await controllerCompleter.future;
       await pageLoaded.future;
-      final String viewportRectJSON = await _runJavaScriptReturningResult(
-          controller, 'JSON.stringify(viewport.getBoundingClientRect())');
-      final Map<String, dynamic> viewportRectRelativeToViewport =
-          jsonDecode(viewportRectJSON) as Map<String, dynamic>;
+      final String viewportRectJSON =
+          await _runJavaScriptReturningResult(controller, 'JSON.stringify(viewport.getBoundingClientRect())');
+      final Map<String, dynamic> viewportRectRelativeToViewport = jsonDecode(viewportRectJSON) as Map<String, dynamic>;
 
       // Check that the input is originally outside of the viewport.
 
       final String initialInputClientRectJSON =
-          await _runJavaScriptReturningResult(
-              controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
+          await _runJavaScriptReturningResult(controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
       final Map<String, dynamic> initialInputClientRectRelativeToViewport =
           jsonDecode(initialInputClientRectJSON) as Map<String, dynamic>;
 
-      expect(
-          initialInputClientRectRelativeToViewport['bottom'] <=
-              viewportRectRelativeToViewport['bottom'],
-          isFalse);
+      expect(initialInputClientRectRelativeToViewport['bottom'] <= viewportRectRelativeToViewport['bottom'], isFalse);
 
       await controller.runJavascript('inputEl.focus()');
 
       // Check that focusing the input brought it into view.
 
       final String lastInputClientRectJSON =
-          await _runJavaScriptReturningResult(
-              controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
+          await _runJavaScriptReturningResult(controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
       final Map<String, dynamic> lastInputClientRectRelativeToViewport =
           jsonDecode(lastInputClientRectJSON) as Map<String, dynamic>;
 
-      expect(
-          lastInputClientRectRelativeToViewport['top'] >=
-              viewportRectRelativeToViewport['top'],
-          isTrue);
-      expect(
-          lastInputClientRectRelativeToViewport['bottom'] <=
-              viewportRectRelativeToViewport['bottom'],
-          isTrue);
+      expect(lastInputClientRectRelativeToViewport['top'] >= viewportRectRelativeToViewport['top'], isTrue);
+      expect(lastInputClientRectRelativeToViewport['bottom'] <= viewportRectRelativeToViewport['bottom'], isTrue);
 
-      expect(
-          lastInputClientRectRelativeToViewport['left'] >=
-              viewportRectRelativeToViewport['left'],
-          isTrue);
-      expect(
-          lastInputClientRectRelativeToViewport['right'] <=
-              viewportRectRelativeToViewport['right'],
-          isTrue);
+      expect(lastInputClientRectRelativeToViewport['left'] >= viewportRectRelativeToViewport['left'], isTrue);
+      expect(lastInputClientRectRelativeToViewport['right'] <= viewportRectRelativeToViewport['right'], isTrue);
     }, skip: _skipDueToIssue86757);
   });
 
   group('NavigationDelegate', () {
     const String blankPage = '<!DOCTYPE html><head></head><body></body></html>';
-    final String blankPageEncoded = 'data:text/html;charset=utf-8;base64,' +
-        base64Encode(const Utf8Encoder().convert(blankPage));
+    final String blankPageEncoded =
+        'data:text/html;charset=utf-8;base64,' + base64Encode(const Utf8Encoder().convert(blankPage));
 
     testWidgets('can allow requests', (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
-      final StreamController<String> pageLoads =
-          StreamController<String>.broadcast();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
+      final StreamController<String> pageLoads = StreamController<String>.broadcast();
       await tester.pumpWidget(
         Directionality(
           textDirection: TextDirection.ltr,
@@ -1021,9 +958,7 @@ Future<void> main() async {
             },
             javascriptMode: JavascriptMode.unrestricted,
             navigationDelegate: (NavigationRequest request) {
-              return (request.url.contains('youtube.com'))
-                  ? NavigationDecision.prevent
-                  : NavigationDecision.navigate;
+              return (request.url.contains('youtube.com')) ? NavigationDecision.prevent : NavigationDecision.navigate;
             },
             onPageFinished: (String url) => pageLoads.add(url),
           ),
@@ -1040,8 +975,7 @@ Future<void> main() async {
     });
 
     testWidgets('onWebResourceError', (WidgetTester tester) async {
-      final Completer<WebResourceError> errorCompleter =
-          Completer<WebResourceError>();
+      final Completer<WebResourceError> errorCompleter = Completer<WebResourceError>();
 
       await tester.pumpWidget(
         Directionality(
@@ -1060,14 +994,11 @@ Future<void> main() async {
       expect(error, isNotNull);
 
       expect(error.errorType, isNotNull);
-      expect(
-          error.failingUrl?.startsWith('https://www.notawebsite..com'), isTrue);
+      expect(error.failingUrl?.startsWith('https://www.notawebsite..com'), isTrue);
     });
 
-    testWidgets('onWebResourceError is not called with valid url',
-        (WidgetTester tester) async {
-      final Completer<WebResourceError> errorCompleter =
-          Completer<WebResourceError>();
+    testWidgets('onWebResourceError is not called with valid url', (WidgetTester tester) async {
+      final Completer<WebResourceError> errorCompleter = Completer<WebResourceError>();
       final Completer<void> pageFinishCompleter = Completer<void>();
 
       await tester.pumpWidget(
@@ -1075,8 +1006,7 @@ Future<void> main() async {
           textDirection: TextDirection.ltr,
           child: WebView(
             key: GlobalKey(),
-            initialUrl:
-                'data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+',
+            initialUrl: 'data:text/html;charset=utf-8;base64,PCFET0NUWVBFIGh0bWw+',
             onWebResourceError: (WebResourceError error) {
               errorCompleter.complete(error);
             },
@@ -1103,11 +1033,9 @@ Future<void> main() async {
         </body>
         </html>
        ''';
-        final String iframeTestBase64 =
-            base64Encode(const Utf8Encoder().convert(iframeTest));
+        final String iframeTestBase64 = base64Encode(const Utf8Encoder().convert(iframeTest));
 
-        final Completer<WebResourceError> errorCompleter =
-            Completer<WebResourceError>();
+        final Completer<WebResourceError> errorCompleter = Completer<WebResourceError>();
         final Completer<void> pageFinishCompleter = Completer<void>();
 
         await tester.pumpWidget(
@@ -1115,8 +1043,7 @@ Future<void> main() async {
             textDirection: TextDirection.ltr,
             child: WebView(
               key: GlobalKey(),
-              initialUrl:
-                  'data:text/html;charset=utf-8;base64,$iframeTestBase64',
+              initialUrl: 'data:text/html;charset=utf-8;base64,$iframeTestBase64',
               onWebResourceError: (WebResourceError error) {
                 errorCompleter.complete(error);
               },
@@ -1131,10 +1058,8 @@ Future<void> main() async {
     );
 
     testWidgets('can block requests', (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
-      final StreamController<String> pageLoads =
-          StreamController<String>.broadcast();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
+      final StreamController<String> pageLoads = StreamController<String>.broadcast();
       await tester.pumpWidget(
         Directionality(
           textDirection: TextDirection.ltr,
@@ -1146,9 +1071,7 @@ Future<void> main() async {
             },
             javascriptMode: JavascriptMode.unrestricted,
             navigationDelegate: (NavigationRequest request) {
-              return (request.url.contains('youtube.com'))
-                  ? NavigationDecision.prevent
-                  : NavigationDecision.navigate;
+              return (request.url.contains('youtube.com')) ? NavigationDecision.prevent : NavigationDecision.navigate;
             },
             onPageFinished: (String url) => pageLoads.add(url),
           ),
@@ -1157,23 +1080,19 @@ Future<void> main() async {
 
       await pageLoads.stream.first; // Wait for initial page load.
       final WebViewController controller = await controllerCompleter.future;
-      await controller
-          .runJavascript('location.href = "https://www.youtube.com/"');
+      await controller.runJavascript('location.href = "https://www.youtube.com/"');
 
       // There should never be any second page load, since our new URL is
       // blocked. Still wait for a potential page change for some time in order
       // to give the test a chance to fail.
-      await pageLoads.stream.first
-          .timeout(const Duration(milliseconds: 500), onTimeout: () => '');
+      await pageLoads.stream.first.timeout(const Duration(milliseconds: 500), onTimeout: () => '');
       final String? currentUrl = await controller.currentUrl();
       expect(currentUrl, isNot(contains('youtube.com')));
     });
 
     testWidgets('supports asynchronous decisions', (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
-      final StreamController<String> pageLoads =
-          StreamController<String>.broadcast();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
+      final StreamController<String> pageLoads = StreamController<String>.broadcast();
       await tester.pumpWidget(
         Directionality(
           textDirection: TextDirection.ltr,
@@ -1187,8 +1106,7 @@ Future<void> main() async {
             navigationDelegate: (NavigationRequest request) async {
               NavigationDecision decision = NavigationDecision.prevent;
               decision = await Future<NavigationDecision>.delayed(
-                  const Duration(milliseconds: 10),
-                  () => NavigationDecision.navigate);
+                  const Duration(milliseconds: 10), () => NavigationDecision.navigate);
               return decision;
             },
             onPageFinished: (String url) => pageLoads.add(url),
@@ -1206,10 +1124,8 @@ Future<void> main() async {
     });
   });
 
-  testWidgets('launches with gestureNavigationEnabled on iOS',
-      (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+  testWidgets('launches with gestureNavigationEnabled on iOS', (WidgetTester tester) async {
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     await tester.pumpWidget(
       Directionality(
         textDirection: TextDirection.ltr,
@@ -1232,10 +1148,8 @@ Future<void> main() async {
     expect(currentUrl, primaryUrl);
   });
 
-  testWidgets('target _blank opens in same window',
-      (WidgetTester tester) async {
-    final Completer<WebViewController> controllerCompleter =
-        Completer<WebViewController>();
+  testWidgets('target _blank opens in same window', (WidgetTester tester) async {
+    final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
     final Completer<void> pageLoaded = Completer<void>();
     await tester.pumpWidget(
       Directionality(
@@ -1265,8 +1179,7 @@ Future<void> main() async {
   testWidgets(
     'can open new window and go back',
     (WidgetTester tester) async {
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       Completer<void> pageLoaded = Completer<void>();
       await tester.pumpWidget(
         Directionality(
@@ -1317,8 +1230,7 @@ Future<void> main() async {
           };
         </script>
       ''';
-      final String iframeTestBase64 =
-          base64Encode(const Utf8Encoder().convert(iframe));
+      final String iframeTestBase64 = base64Encode(const Utf8Encoder().convert(iframe));
 
       final String openWindowTest = '''
         <!DOCTYPE html>
@@ -1333,10 +1245,8 @@ Future<void> main() async {
         </body>
         </html>
       ''';
-      final String openWindowTestBase64 =
-          base64Encode(const Utf8Encoder().convert(openWindowTest));
-      final Completer<WebViewController> controllerCompleter =
-          Completer<WebViewController>();
+      final String openWindowTestBase64 = base64Encode(const Utf8Encoder().convert(openWindowTest));
+      final Completer<WebViewController> controllerCompleter = Completer<WebViewController>();
       final Completer<void> pageLoadCompleter = Completer<void>();
 
       await tester.pumpWidget(
@@ -1348,8 +1258,7 @@ Future<void> main() async {
               controllerCompleter.complete(controller);
             },
             javascriptMode: JavascriptMode.unrestricted,
-            initialUrl:
-                'data:text/html;charset=utf-8;base64,$openWindowTestBase64',
+            initialUrl: 'data:text/html;charset=utf-8;base64,$openWindowTestBase64',
             onPageFinished: (String url) {
               pageLoadCompleter.complete();
             },
@@ -1360,11 +1269,10 @@ Future<void> main() async {
       final WebViewController controller = await controllerCompleter.future;
       await pageLoadCompleter.future;
 
-      expect(controller.runJavascriptReturningResult('iframeLoaded'),
-          completion('true'));
+      expect(controller.runJavascriptReturningResult('iframeLoaded'), completion('true'));
       expect(
-        controller.runJavascriptReturningResult(
-            'document.querySelector("p") && document.querySelector("p").textContent'),
+        controller
+            .runJavascriptReturningResult('document.querySelector("p") && document.querySelector("p").textContent'),
         completion('null'),
       );
     },
@@ -1389,8 +1297,7 @@ Future<String> _runJavaScriptReturningResult(
   WebViewController controller,
   String js,
 ) async {
-  return jsonDecode(await controller.runJavascriptReturningResult(js))
-      as String;
+  return jsonDecode(await controller.runJavascriptReturningResult(js)) as String;
 }
 
 class ResizableWebView extends StatefulWidget {
@@ -1429,8 +1336,7 @@ class ResizableWebViewState extends State<ResizableWebView> {
 
   @override
   Widget build(BuildContext context) {
-    final String resizeTestBase64 =
-        base64Encode(const Utf8Encoder().convert(resizePage));
+    final String resizeTestBase64 = base64Encode(const Utf8Encoder().convert(resizePage));
     return Directionality(
       textDirection: TextDirection.ltr,
       child: Column(
@@ -1439,8 +1345,7 @@ class ResizableWebViewState extends State<ResizableWebView> {
             width: webViewWidth,
             height: webViewHeight,
             child: WebView(
-              initialUrl:
-                  'data:text/html;charset=utf-8;base64,$resizeTestBase64',
+              initialUrl: 'data:text/html;charset=utf-8;base64,$resizeTestBase64',
               javascriptChannels: <JavascriptChannel>{
                 JavascriptChannel(
                   name: 'Resize',
diff --git a/packages/webview_flutter/webview_flutter_android/example/lib/main.dart b/packages/webview_flutter/webview_flutter_android/example/lib/main.dart
index 1de3cd8d1645..9a6ea1633c5a 100644
--- a/packages/webview_flutter/webview_flutter_android/example/lib/main.dart
+++ b/packages/webview_flutter/webview_flutter_android/example/lib/main.dart
@@ -5,8 +5,10 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_driver/driver_extension.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:webview_flutter_android/webview_surface_android.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_android/example/lib/web_view.dart b/packages/webview_flutter/webview_flutter_android/example/lib/web_view.dart
index 5e3156818009..1c415a49ffaa 100644
--- a/packages/webview_flutter/webview_flutter_android/example/lib/web_view.dart
+++ b/packages/webview_flutter/webview_flutter_android/example/lib/web_view.dart
@@ -5,7 +5,9 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
 import 'package:webview_flutter_android/webview_android.dart';
 import 'package:webview_flutter_android/webview_android_cookie_manager.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
index f3ed95a55939..f946f08e676d 100644
--- a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
@@ -7,10 +7,6 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
   
@@ -25,10 +21,6 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   espresso: ^0.1.0+2
   flutter_driver:
     sdk: flutter
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart
index 96738d19e5fc..7e54001e4032 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart
@@ -3,10 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:typed_data';
-import 'dart:ui';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-import 'package:flutter/widgets.dart' show AndroidViewSurface;
+import 'package:flutter/material.dart';
 
 import 'android_webview.pigeon.dart';
 import 'android_webview_api_impls.dart';
@@ -856,6 +854,5 @@ class FlutterAssetManager {
   Future<List<String?>> list(String path) => api.list(path);
 
   /// Gets the relative file path to the Flutter asset with the given name.
-  Future<String> getAssetFilePathByName(String name) =>
-      api.getAssetFilePathByName(name);
+  Future<String> getAssetFilePathByName(String name) => api.getAssetFilePathByName(name);
 }
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.pigeon.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.pigeon.dart
index 913dfcf9a708..d6c3d96f5adb 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.pigeon.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview.pigeon.dart
@@ -1,14 +1,22 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-// Autogenerated from Pigeon (v1.0.9), do not edit directly.
+// Autogenerated from Pigeon (v3.2.9), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name
-// @dart = 2.12
+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import
 import 'dart:async';
 import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List;
 
 import 'package:flutter/foundation.dart' show WriteBuffer, ReadBuffer;
+import 'package:flutter/services.dart';
 
 class WebResourceRequestData {
+  WebResourceRequestData({
+    this.url,
+    this.isForMainFrame,
+    this.isRedirect,
+    this.hasGesture,
+    this.method,
+    this.requestHeaders,
+  });
+
   String? url;
   bool? isForMainFrame;
   bool? isRedirect;
@@ -29,18 +37,23 @@ class WebResourceRequestData {
 
   static WebResourceRequestData decode(Object message) {
     final Map<Object?, Object?> pigeonMap = message as Map<Object?, Object?>;
-    return WebResourceRequestData()
-      ..url = pigeonMap['url'] as String?
-      ..isForMainFrame = pigeonMap['isForMainFrame'] as bool?
-      ..isRedirect = pigeonMap['isRedirect'] as bool?
-      ..hasGesture = pigeonMap['hasGesture'] as bool?
-      ..method = pigeonMap['method'] as String?
-      ..requestHeaders = (pigeonMap['requestHeaders'] as Map<Object?, Object?>?)
-          ?.cast<String?, String?>();
+    return WebResourceRequestData(
+      url: pigeonMap['url'] as String?,
+      isForMainFrame: pigeonMap['isForMainFrame'] as bool?,
+      isRedirect: pigeonMap['isRedirect'] as bool?,
+      hasGesture: pigeonMap['hasGesture'] as bool?,
+      method: pigeonMap['method'] as String?,
+      requestHeaders: (pigeonMap['requestHeaders'] as Map<Object?, Object?>?)?.cast<String?, String?>(),
+    );
   }
 }
 
 class WebResourceErrorData {
+  WebResourceErrorData({
+    this.errorCode,
+    this.description,
+  });
+
   int? errorCode;
   String? description;
 
@@ -53,9 +66,10 @@ class WebResourceErrorData {
 
   static WebResourceErrorData decode(Object message) {
     final Map<Object?, Object?> pigeonMap = message as Map<Object?, Object?>;
-    return WebResourceErrorData()
-      ..errorCode = pigeonMap['errorCode'] as int?
-      ..description = pigeonMap['description'] as String?;
+    return WebResourceErrorData(
+      errorCode: pigeonMap['errorCode'] as int?,
+      description: pigeonMap['description'] as String?,
+    );
   }
 }
 
@@ -67,8 +81,7 @@ class CookieManagerHostApi {
   /// Constructor for [CookieManagerHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  CookieManagerHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  CookieManagerHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
@@ -76,24 +89,26 @@ class CookieManagerHostApi {
 
   Future<bool> clearCookies() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.CookieManagerHostApi.clearCookies', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.CookieManagerHostApi.clearCookies', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
         await channel.send(null) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as bool?)!;
     }
@@ -101,19 +116,16 @@ class CookieManagerHostApi {
 
   Future<void> setCookie(String arg_url, String arg_value) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.CookieManagerHostApi.setCookie', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_url, arg_value]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.CookieManagerHostApi.setCookie', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_url, arg_value]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -133,8 +145,7 @@ class WebViewHostApi {
   /// Constructor for [WebViewHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  WebViewHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  WebViewHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
@@ -142,20 +153,16 @@ class WebViewHostApi {
 
   Future<void> create(int arg_instanceId, bool arg_useHybridComposition) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.create', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.create', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_useHybridComposition])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_useHybridComposition]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -168,19 +175,16 @@ class WebViewHostApi {
 
   Future<void> dispose(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.dispose', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.dispose', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -191,23 +195,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> loadData(int arg_instanceId, String arg_data,
-      String arg_mimeType, String arg_encoding) async {
+  Future<void> loadData(int arg_instanceId, String arg_data, String arg_mimeType, String arg_encoding) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.loadData', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel.send(
-            <Object>[arg_instanceId, arg_data, arg_mimeType, arg_encoding])
-        as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.loadData', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_data, arg_mimeType, arg_encoding]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -218,33 +217,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> loadDataWithBaseUrl(
-      int arg_instanceId,
-      String arg_baseUrl,
-      String arg_data,
-      String arg_mimeType,
-      String arg_encoding,
-      String arg_historyUrl) async {
+  Future<void> loadDataWithBaseUrl(int arg_instanceId, String arg_baseUrl, String arg_data, String arg_mimeType, String arg_encoding, String arg_historyUrl) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel.send(<Object>[
-      arg_instanceId,
-      arg_baseUrl,
-      arg_data,
-      arg_mimeType,
-      arg_encoding,
-      arg_historyUrl
-    ]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_baseUrl, arg_data, arg_mimeType, arg_encoding, arg_historyUrl]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -255,23 +239,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> loadUrl(int arg_instanceId, String arg_url,
-      Map<String?, String?> arg_headers) async {
+  Future<void> loadUrl(int arg_instanceId, String arg_url, Map<String?, String?> arg_headers) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.loadUrl', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.loadUrl', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_url, arg_headers])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_url, arg_headers]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -282,23 +261,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> postUrl(
-      int arg_instanceId, String arg_url, Uint8List arg_data) async {
+  Future<void> postUrl(int arg_instanceId, String arg_url, Uint8List arg_data) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.postUrl', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.postUrl', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_url, arg_data])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_url, arg_data]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -311,24 +285,26 @@ class WebViewHostApi {
 
   Future<String> getUrl(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.getUrl', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.getUrl', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as String?)!;
     }
@@ -336,24 +312,26 @@ class WebViewHostApi {
 
   Future<bool> canGoBack(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.canGoBack', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.canGoBack', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as bool?)!;
     }
@@ -361,24 +339,26 @@ class WebViewHostApi {
 
   Future<bool> canGoForward(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.canGoForward', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.canGoForward', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as bool?)!;
     }
@@ -386,19 +366,16 @@ class WebViewHostApi {
 
   Future<void> goBack(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.goBack', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.goBack', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -411,19 +388,16 @@ class WebViewHostApi {
 
   Future<void> goForward(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.goForward', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.goForward', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -436,19 +410,16 @@ class WebViewHostApi {
 
   Future<void> reload(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.reload', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.reload', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -461,20 +432,16 @@ class WebViewHostApi {
 
   Future<void> clearCache(int arg_instanceId, bool arg_includeDiskFiles) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.clearCache', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.clearCache', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_includeDiskFiles])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_includeDiskFiles]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -485,28 +452,28 @@ class WebViewHostApi {
     }
   }
 
-  Future<String> evaluateJavascript(
-      int arg_instanceId, String arg_javascriptString) async {
+  Future<String> evaluateJavascript(int arg_instanceId, String arg_javascriptString) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.evaluateJavascript', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.evaluateJavascript', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_javascriptString])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_javascriptString]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as String?)!;
     }
@@ -514,24 +481,26 @@ class WebViewHostApi {
 
   Future<String> getTitle(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.getTitle', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.getTitle', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as String?)!;
     }
@@ -539,19 +508,16 @@ class WebViewHostApi {
 
   Future<void> scrollTo(int arg_instanceId, int arg_x, int arg_y) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.scrollTo', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_x, arg_y]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.scrollTo', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_x, arg_y]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -564,19 +530,16 @@ class WebViewHostApi {
 
   Future<void> scrollBy(int arg_instanceId, int arg_x, int arg_y) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.scrollBy', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_x, arg_y]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.scrollBy', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_x, arg_y]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -589,24 +552,26 @@ class WebViewHostApi {
 
   Future<int> getScrollX(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.getScrollX', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.getScrollX', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as int?)!;
     }
@@ -614,24 +579,26 @@ class WebViewHostApi {
 
   Future<int> getScrollY(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.getScrollY', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.getScrollY', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as int?)!;
     }
@@ -639,20 +606,16 @@ class WebViewHostApi {
 
   Future<void> setWebContentsDebuggingEnabled(bool arg_enabled) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled',
-        codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_enabled]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_enabled]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -663,23 +626,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> setWebViewClient(
-      int arg_instanceId, int arg_webViewClientInstanceId) async {
+  Future<void> setWebViewClient(int arg_instanceId, int arg_webViewClientInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.setWebViewClient', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-            .send(<Object>[arg_instanceId, arg_webViewClientInstanceId])
-        as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.setWebViewClient', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_webViewClientInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -690,23 +648,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> addJavaScriptChannel(
-      int arg_instanceId, int arg_javaScriptChannelInstanceId) async {
+  Future<void> addJavaScriptChannel(int arg_instanceId, int arg_javaScriptChannelInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-            .send(<Object>[arg_instanceId, arg_javaScriptChannelInstanceId])
-        as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_javaScriptChannelInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -717,23 +670,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> removeJavaScriptChannel(
-      int arg_instanceId, int arg_javaScriptChannelInstanceId) async {
+  Future<void> removeJavaScriptChannel(int arg_instanceId, int arg_javaScriptChannelInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-            .send(<Object>[arg_instanceId, arg_javaScriptChannelInstanceId])
-        as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_javaScriptChannelInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -744,23 +692,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> setDownloadListener(
-      int arg_instanceId, int arg_listenerInstanceId) async {
+  Future<void> setDownloadListener(int arg_instanceId, int arg_listenerInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.setDownloadListener', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.setDownloadListener', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_listenerInstanceId])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_listenerInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -771,23 +714,18 @@ class WebViewHostApi {
     }
   }
 
-  Future<void> setWebChromeClient(
-      int arg_instanceId, int arg_clientInstanceId) async {
+  Future<void> setWebChromeClient(int arg_instanceId, int arg_clientInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.setWebChromeClient', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebViewHostApi.setWebChromeClient', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_clientInstanceId])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_clientInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -800,19 +738,16 @@ class WebViewHostApi {
 
   Future<void> setBackgroundColor(int arg_instanceId, int arg_color) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewHostApi.setBackgroundColor', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_color]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewHostApi.setBackgroundColor', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_color]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -832,8 +767,7 @@ class WebSettingsHostApi {
   /// Constructor for [WebSettingsHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  WebSettingsHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  WebSettingsHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
@@ -841,20 +775,16 @@ class WebSettingsHostApi {
 
   Future<void> create(int arg_instanceId, int arg_webViewInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.create', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebSettingsHostApi.create', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_webViewInstanceId])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_webViewInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -867,19 +797,16 @@ class WebSettingsHostApi {
 
   Future<void> dispose(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.dispose', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebSettingsHostApi.dispose', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -892,19 +819,16 @@ class WebSettingsHostApi {
 
   Future<void> setDomStorageEnabled(int arg_instanceId, bool arg_flag) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_flag]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_flag]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -915,23 +839,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setJavaScriptCanOpenWindowsAutomatically(
-      int arg_instanceId, bool arg_flag) async {
+  Future<void> setJavaScriptCanOpenWindowsAutomatically(int arg_instanceId, bool arg_flag) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically',
-        codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_flag]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_flag]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -942,23 +861,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setSupportMultipleWindows(
-      int arg_instanceId, bool arg_support) async {
+  Future<void> setSupportMultipleWindows(int arg_instanceId, bool arg_support) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows',
-        codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_support]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_support]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -971,19 +885,16 @@ class WebSettingsHostApi {
 
   Future<void> setJavaScriptEnabled(int arg_instanceId, bool arg_flag) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_flag]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_flag]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -994,23 +905,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setUserAgentString(
-      int arg_instanceId, String arg_userAgentString) async {
+  Future<void> setUserAgentString(int arg_instanceId, String arg_userAgentString) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_userAgentString])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_userAgentString]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1021,23 +927,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setMediaPlaybackRequiresUserGesture(
-      int arg_instanceId, bool arg_require) async {
+  Future<void> setMediaPlaybackRequiresUserGesture(int arg_instanceId, bool arg_require) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture',
-        codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_require]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_require]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1050,19 +951,16 @@ class WebSettingsHostApi {
 
   Future<void> setSupportZoom(int arg_instanceId, bool arg_support) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_support]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_support]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1073,22 +971,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setGeolocationEnabled(
-      int arg_instanceId, bool arg_enabled) async {
+  Future<void> setGeolocationEnabled(int arg_instanceId, bool arg_enabled) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1099,22 +993,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setLoadWithOverviewMode(
-      int arg_instanceId, bool arg_overview) async {
+  Future<void> setLoadWithOverviewMode(int arg_instanceId, bool arg_overview) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_overview]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_overview]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1127,19 +1017,16 @@ class WebSettingsHostApi {
 
   Future<void> setUseWideViewPort(int arg_instanceId, bool arg_use) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_use]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_use]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1150,22 +1037,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setDisplayZoomControls(
-      int arg_instanceId, bool arg_enabled) async {
+  Future<void> setDisplayZoomControls(int arg_instanceId, bool arg_enabled) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1176,22 +1059,18 @@ class WebSettingsHostApi {
     }
   }
 
-  Future<void> setBuiltInZoomControls(
-      int arg_instanceId, bool arg_enabled) async {
+  Future<void> setBuiltInZoomControls(int arg_instanceId, bool arg_enabled) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1204,19 +1083,16 @@ class WebSettingsHostApi {
 
   Future<void> setAllowFileAccess(int arg_instanceId, bool arg_enabled) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-        .send(<Object>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_enabled]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1236,8 +1112,7 @@ class JavaScriptChannelHostApi {
   /// Constructor for [JavaScriptChannelHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  JavaScriptChannelHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  JavaScriptChannelHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
@@ -1245,20 +1120,16 @@ class JavaScriptChannelHostApi {
 
   Future<void> create(int arg_instanceId, String arg_channelName) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.JavaScriptChannelHostApi.create', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.JavaScriptChannelHostApi.create', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId, arg_channelName])
-            as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId, arg_channelName]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1273,29 +1144,23 @@ class JavaScriptChannelHostApi {
 class _JavaScriptChannelFlutterApiCodec extends StandardMessageCodec {
   const _JavaScriptChannelFlutterApiCodec();
 }
-
 abstract class JavaScriptChannelFlutterApi {
-  static const MessageCodec<Object?> codec =
-      _JavaScriptChannelFlutterApiCodec();
+  static const MessageCodec<Object?> codec = _JavaScriptChannelFlutterApiCodec();
 
   void dispose(int instanceId);
   void postMessage(int instanceId, String message);
-  static void setup(JavaScriptChannelFlutterApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(JavaScriptChannelFlutterApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.dispose was null, expected non-null int.');
           api.dispose(arg_instanceId!);
           return;
         });
@@ -1303,21 +1168,17 @@ abstract class JavaScriptChannelFlutterApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage was null, expected non-null int.');
           final String? arg_message = (args[1] as String?);
-          assert(arg_message != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage was null, expected non-null String.');
+          assert(arg_message != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelFlutterApi.postMessage was null, expected non-null String.');
           api.postMessage(arg_instanceId!, arg_message!);
           return;
         });
@@ -1334,30 +1195,24 @@ class WebViewClientHostApi {
   /// Constructor for [WebViewClientHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  WebViewClientHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  WebViewClientHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
   static const MessageCodec<Object?> codec = _WebViewClientHostApiCodec();
 
-  Future<void> create(
-      int arg_instanceId, bool arg_shouldOverrideUrlLoading) async {
+  Future<void> create(int arg_instanceId, bool arg_shouldOverrideUrlLoading) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebViewClientHostApi.create', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-            .send(<Object>[arg_instanceId, arg_shouldOverrideUrlLoading])
-        as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebViewClientHostApi.create', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_shouldOverrideUrlLoading]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1376,58 +1231,52 @@ class _WebViewClientFlutterApiCodec extends StandardMessageCodec {
     if (value is WebResourceErrorData) {
       buffer.putUint8(128);
       writeValue(buffer, value.encode());
-    } else if (value is WebResourceRequestData) {
+    } else 
+    if (value is WebResourceRequestData) {
       buffer.putUint8(129);
       writeValue(buffer, value.encode());
-    } else {
+    } else 
+{
       super.writeValue(buffer, value);
     }
   }
-
   @override
   Object? readValueOfType(int type, ReadBuffer buffer) {
     switch (type) {
-      case 128:
+      case 128:       
         return WebResourceErrorData.decode(readValue(buffer)!);
-
-      case 129:
+      
+      case 129:       
         return WebResourceRequestData.decode(readValue(buffer)!);
-
-      default:
+      
+      default:      
         return super.readValueOfType(type, buffer);
+      
     }
   }
 }
-
 abstract class WebViewClientFlutterApi {
   static const MessageCodec<Object?> codec = _WebViewClientFlutterApiCodec();
 
   void dispose(int instanceId);
   void onPageStarted(int instanceId, int webViewInstanceId, String url);
   void onPageFinished(int instanceId, int webViewInstanceId, String url);
-  void onReceivedRequestError(int instanceId, int webViewInstanceId,
-      WebResourceRequestData request, WebResourceErrorData error);
-  void onReceivedError(int instanceId, int webViewInstanceId, int errorCode,
-      String description, String failingUrl);
-  void requestLoading(
-      int instanceId, int webViewInstanceId, WebResourceRequestData request);
+  void onReceivedRequestError(int instanceId, int webViewInstanceId, WebResourceRequestData request, WebResourceErrorData error);
+  void onReceivedError(int instanceId, int webViewInstanceId, int errorCode, String description, String failingUrl);
+  void requestLoading(int instanceId, int webViewInstanceId, WebResourceRequestData request);
   void urlLoading(int instanceId, int webViewInstanceId, String url);
-  static void setup(WebViewClientFlutterApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(WebViewClientFlutterApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.dispose', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.dispose was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.dispose was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.dispose was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.dispose was null, expected non-null int.');
           api.dispose(arg_instanceId!);
           return;
         });
@@ -1435,24 +1284,19 @@ abstract class WebViewClientFlutterApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null, expected non-null int.');
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null, expected non-null int.');
           final String? arg_url = (args[2] as String?);
-          assert(arg_url != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null, expected non-null String.');
+          assert(arg_url != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageStarted was null, expected non-null String.');
           api.onPageStarted(arg_instanceId!, arg_webViewInstanceId!, arg_url!);
           return;
         });
@@ -1460,24 +1304,19 @@ abstract class WebViewClientFlutterApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null, expected non-null int.');
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null, expected non-null int.');
           final String? arg_url = (args[2] as String?);
-          assert(arg_url != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null, expected non-null String.');
+          assert(arg_url != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onPageFinished was null, expected non-null String.');
           api.onPageFinished(arg_instanceId!, arg_webViewInstanceId!, arg_url!);
           return;
         });
@@ -1485,115 +1324,85 @@ abstract class WebViewClientFlutterApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null int.');
-          final WebResourceRequestData? arg_request =
-              (args[2] as WebResourceRequestData?);
-          assert(arg_request != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null WebResourceRequestData.');
-          final WebResourceErrorData? arg_error =
-              (args[3] as WebResourceErrorData?);
-          assert(arg_error != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null WebResourceErrorData.');
-          api.onReceivedRequestError(arg_instanceId!, arg_webViewInstanceId!,
-              arg_request!, arg_error!);
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null int.');
+          final WebResourceRequestData? arg_request = (args[2] as WebResourceRequestData?);
+          assert(arg_request != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null WebResourceRequestData.');
+          final WebResourceErrorData? arg_error = (args[3] as WebResourceErrorData?);
+          assert(arg_error != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedRequestError was null, expected non-null WebResourceErrorData.');
+          api.onReceivedRequestError(arg_instanceId!, arg_webViewInstanceId!, arg_request!, arg_error!);
           return;
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null int.');
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null int.');
           final int? arg_errorCode = (args[2] as int?);
-          assert(arg_errorCode != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null int.');
+          assert(arg_errorCode != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null int.');
           final String? arg_description = (args[3] as String?);
-          assert(arg_description != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null String.');
+          assert(arg_description != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null String.');
           final String? arg_failingUrl = (args[4] as String?);
-          assert(arg_failingUrl != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null String.');
-          api.onReceivedError(arg_instanceId!, arg_webViewInstanceId!,
-              arg_errorCode!, arg_description!, arg_failingUrl!);
+          assert(arg_failingUrl != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.onReceivedError was null, expected non-null String.');
+          api.onReceivedError(arg_instanceId!, arg_webViewInstanceId!, arg_errorCode!, arg_description!, arg_failingUrl!);
           return;
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null, expected non-null int.');
-          final WebResourceRequestData? arg_request =
-              (args[2] as WebResourceRequestData?);
-          assert(arg_request != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null, expected non-null WebResourceRequestData.');
-          api.requestLoading(
-              arg_instanceId!, arg_webViewInstanceId!, arg_request!);
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null, expected non-null int.');
+          final WebResourceRequestData? arg_request = (args[2] as WebResourceRequestData?);
+          assert(arg_request != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.requestLoading was null, expected non-null WebResourceRequestData.');
+          api.requestLoading(arg_instanceId!, arg_webViewInstanceId!, arg_request!);
           return;
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null, expected non-null int.');
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null, expected non-null int.');
           final String? arg_url = (args[2] as String?);
-          assert(arg_url != null,
-              'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null, expected non-null String.');
+          assert(arg_url != null, 'Argument for dev.flutter.pigeon.WebViewClientFlutterApi.urlLoading was null, expected non-null String.');
           api.urlLoading(arg_instanceId!, arg_webViewInstanceId!, arg_url!);
           return;
         });
@@ -1610,8 +1419,7 @@ class DownloadListenerHostApi {
   /// Constructor for [DownloadListenerHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  DownloadListenerHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  DownloadListenerHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
@@ -1619,19 +1427,16 @@ class DownloadListenerHostApi {
 
   Future<void> create(int arg_instanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.DownloadListenerHostApi.create', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.DownloadListenerHostApi.create', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_instanceId]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_instanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1646,29 +1451,23 @@ class DownloadListenerHostApi {
 class _DownloadListenerFlutterApiCodec extends StandardMessageCodec {
   const _DownloadListenerFlutterApiCodec();
 }
-
 abstract class DownloadListenerFlutterApi {
   static const MessageCodec<Object?> codec = _DownloadListenerFlutterApiCodec();
 
   void dispose(int instanceId);
-  void onDownloadStart(int instanceId, String url, String userAgent,
-      String contentDisposition, String mimetype, int contentLength);
-  static void setup(DownloadListenerFlutterApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  void onDownloadStart(int instanceId, String url, String userAgent, String contentDisposition, String mimetype, int contentLength);
+  static void setup(DownloadListenerFlutterApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.DownloadListenerFlutterApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.DownloadListenerFlutterApi.dispose', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.dispose was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.dispose was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.dispose was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.dispose was null, expected non-null int.');
           api.dispose(arg_instanceId!);
           return;
         });
@@ -1676,36 +1475,26 @@ abstract class DownloadListenerFlutterApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null int.');
           final String? arg_url = (args[1] as String?);
-          assert(arg_url != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
+          assert(arg_url != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
           final String? arg_userAgent = (args[2] as String?);
-          assert(arg_userAgent != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
+          assert(arg_userAgent != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
           final String? arg_contentDisposition = (args[3] as String?);
-          assert(arg_contentDisposition != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
+          assert(arg_contentDisposition != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
           final String? arg_mimetype = (args[4] as String?);
-          assert(arg_mimetype != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
+          assert(arg_mimetype != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null String.');
           final int? arg_contentLength = (args[5] as int?);
-          assert(arg_contentLength != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null int.');
-          api.onDownloadStart(arg_instanceId!, arg_url!, arg_userAgent!,
-              arg_contentDisposition!, arg_mimetype!, arg_contentLength!);
+          assert(arg_contentLength != null, 'Argument for dev.flutter.pigeon.DownloadListenerFlutterApi.onDownloadStart was null, expected non-null int.');
+          api.onDownloadStart(arg_instanceId!, arg_url!, arg_userAgent!, arg_contentDisposition!, arg_mimetype!, arg_contentLength!);
           return;
         });
       }
@@ -1721,30 +1510,24 @@ class WebChromeClientHostApi {
   /// Constructor for [WebChromeClientHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  WebChromeClientHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  WebChromeClientHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
   static const MessageCodec<Object?> codec = _WebChromeClientHostApiCodec();
 
-  Future<void> create(
-      int arg_instanceId, int arg_webViewClientInstanceId) async {
+  Future<void> create(int arg_instanceId, int arg_webViewClientInstanceId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.WebChromeClientHostApi.create', codec,
-        binaryMessenger: _binaryMessenger);
-    final Map<Object?, Object?>? replyMap = await channel
-            .send(<Object>[arg_instanceId, arg_webViewClientInstanceId])
-        as Map<Object?, Object?>?;
+        'dev.flutter.pigeon.WebChromeClientHostApi.create', codec, binaryMessenger: _binaryMessenger);
+    final Map<Object?, Object?>? replyMap =
+        await channel.send(<Object?>[arg_instanceId, arg_webViewClientInstanceId]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
@@ -1764,8 +1547,7 @@ class FlutterAssetManagerHostApi {
   /// Constructor for [FlutterAssetManagerHostApi].  The [binaryMessenger] named argument is
   /// available for dependency injection.  If it is left null, the default
   /// BinaryMessenger will be used which routes to the host platform.
-  FlutterAssetManagerHostApi({BinaryMessenger? binaryMessenger})
-      : _binaryMessenger = binaryMessenger;
+  FlutterAssetManagerHostApi({BinaryMessenger? binaryMessenger}) : _binaryMessenger = binaryMessenger;
 
   final BinaryMessenger? _binaryMessenger;
 
@@ -1773,24 +1555,26 @@ class FlutterAssetManagerHostApi {
 
   Future<List<String?>> list(String arg_path) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.FlutterAssetManagerHostApi.list', codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.FlutterAssetManagerHostApi.list', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_path]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_path]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as List<Object?>?)!.cast<String?>();
     }
@@ -1798,25 +1582,26 @@ class FlutterAssetManagerHostApi {
 
   Future<String> getAssetFilePathByName(String arg_name) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName',
-        codec,
-        binaryMessenger: _binaryMessenger);
+        'dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName', codec, binaryMessenger: _binaryMessenger);
     final Map<Object?, Object?>? replyMap =
-        await channel.send(<Object>[arg_name]) as Map<Object?, Object?>?;
+        await channel.send(<Object?>[arg_name]) as Map<Object?, Object?>?;
     if (replyMap == null) {
       throw PlatformException(
         code: 'channel-error',
         message: 'Unable to establish connection on channel.',
-        details: null,
       );
     } else if (replyMap['error'] != null) {
-      final Map<Object?, Object?> error =
-          (replyMap['error'] as Map<Object?, Object?>?)!;
+      final Map<Object?, Object?> error = (replyMap['error'] as Map<Object?, Object?>?)!;
       throw PlatformException(
         code: (error['code'] as String?)!,
         message: error['message'] as String?,
         details: error['details'],
       );
+    } else if (replyMap['result'] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
     } else {
       return (replyMap['result'] as String?)!;
     }
@@ -1826,28 +1611,23 @@ class FlutterAssetManagerHostApi {
 class _WebChromeClientFlutterApiCodec extends StandardMessageCodec {
   const _WebChromeClientFlutterApiCodec();
 }
-
 abstract class WebChromeClientFlutterApi {
   static const MessageCodec<Object?> codec = _WebChromeClientFlutterApiCodec();
 
   void dispose(int instanceId);
   void onProgressChanged(int instanceId, int webViewInstanceId, int progress);
-  static void setup(WebChromeClientFlutterApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(WebChromeClientFlutterApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebChromeClientFlutterApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebChromeClientFlutterApi.dispose', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.dispose was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.dispose was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.dispose was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.dispose was null, expected non-null int.');
           api.dispose(arg_instanceId!);
           return;
         });
@@ -1855,27 +1635,20 @@ abstract class WebChromeClientFlutterApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null, expected non-null int.');
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null, expected non-null int.');
           final int? arg_progress = (args[2] as int?);
-          assert(arg_progress != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null, expected non-null int.');
-          api.onProgressChanged(
-              arg_instanceId!, arg_webViewInstanceId!, arg_progress!);
+          assert(arg_progress != null, 'Argument for dev.flutter.pigeon.WebChromeClientFlutterApi.onProgressChanged was null, expected non-null int.');
+          api.onProgressChanged(arg_instanceId!, arg_webViewInstanceId!, arg_progress!);
           return;
         });
       }
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_api_impls.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_api_impls.dart
index 2cb8049a8084..0a83f1190d02 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_api_impls.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_api_impls.dart
@@ -4,7 +4,7 @@
 
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/services.dart';
 
 import 'android_webview.dart';
 import 'android_webview.pigeon.dart';
@@ -18,8 +18,7 @@ WebResourceRequest _toWebResourceRequest(WebResourceRequestData data) {
     isRedirect: data.isRedirect,
     hasGesture: data.hasGesture!,
     method: data.method!,
-    requestHeaders:
-        data.requestHeaders?.cast<String, String>() ?? <String, String>{},
+    requestHeaders: data.requestHeaders?.cast<String, String>() ?? <String, String>{},
   );
 }
 
@@ -40,14 +39,10 @@ class AndroidWebViewFlutterApis {
     WebChromeClientFlutterApiImpl? webChromeClientFlutterApi,
     JavaScriptChannelFlutterApiImpl? javaScriptChannelFlutterApi,
   }) {
-    this.downloadListenerFlutterApi =
-        downloadListenerFlutterApi ?? DownloadListenerFlutterApiImpl();
-    this.webViewClientFlutterApi =
-        webViewClientFlutterApi ?? WebViewClientFlutterApiImpl();
-    this.webChromeClientFlutterApi =
-        webChromeClientFlutterApi ?? WebChromeClientFlutterApiImpl();
-    this.javaScriptChannelFlutterApi =
-        javaScriptChannelFlutterApi ?? JavaScriptChannelFlutterApiImpl();
+    this.downloadListenerFlutterApi = downloadListenerFlutterApi ?? DownloadListenerFlutterApiImpl();
+    this.webViewClientFlutterApi = webViewClientFlutterApi ?? WebViewClientFlutterApiImpl();
+    this.webChromeClientFlutterApi = webChromeClientFlutterApi ?? WebChromeClientFlutterApiImpl();
+    this.javaScriptChannelFlutterApi = javaScriptChannelFlutterApi ?? JavaScriptChannelFlutterApiImpl();
   }
 
   static bool _haveBeenSetUp = false;
@@ -206,8 +201,7 @@ class WebViewHostApiImpl extends WebViewHostApi {
     WebView instance,
     String javascriptString,
   ) {
-    return evaluateJavascript(
-        instanceManager.getInstanceId(instance)!, javascriptString);
+    return evaluateJavascript(instanceManager.getInstanceId(instance)!, javascriptString);
   }
 
   /// Helper method to convert instances ids to objects.
@@ -352,8 +346,7 @@ class WebSettingsHostApiImpl extends WebSettingsHostApi {
     WebSettings instance,
     bool support,
   ) {
-    return setSupportMultipleWindows(
-        instanceManager.getInstanceId(instance)!, support);
+    return setSupportMultipleWindows(instanceManager.getInstanceId(instance)!, support);
   }
 
   /// Helper method to convert instances ids to objects.
@@ -497,8 +490,7 @@ class JavaScriptChannelFlutterApiImpl extends JavaScriptChannelFlutterApi {
 
   @override
   void postMessage(int instanceId, String message) {
-    final JavaScriptChannel? instance =
-        instanceManager.getInstance(instanceId) as JavaScriptChannel?;
+    final JavaScriptChannel? instance = instanceManager.getInstance(instanceId) as JavaScriptChannel?;
     assert(
       instance != null,
       'InstanceManager does not contain an JavaScriptChannel with instanceId: $instanceId',
@@ -546,10 +538,8 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
 
   @override
   void onPageFinished(int instanceId, int webViewInstanceId, String url) {
-    final WebViewClient? instance =
-        instanceManager.getInstance(instanceId) as WebViewClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebViewClient? instance = instanceManager.getInstance(instanceId) as WebViewClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebViewClient with instanceId: $instanceId',
@@ -563,10 +553,8 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
 
   @override
   void onPageStarted(int instanceId, int webViewInstanceId, String url) {
-    final WebViewClient? instance =
-        instanceManager.getInstance(instanceId) as WebViewClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebViewClient? instance = instanceManager.getInstance(instanceId) as WebViewClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebViewClient with instanceId: $instanceId',
@@ -586,10 +574,8 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
     String description,
     String failingUrl,
   ) {
-    final WebViewClient? instance =
-        instanceManager.getInstance(instanceId) as WebViewClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebViewClient? instance = instanceManager.getInstance(instanceId) as WebViewClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebViewClient with instanceId: $instanceId',
@@ -614,10 +600,8 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
     WebResourceRequestData request,
     WebResourceErrorData error,
   ) {
-    final WebViewClient? instance =
-        instanceManager.getInstance(instanceId) as WebViewClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebViewClient? instance = instanceManager.getInstance(instanceId) as WebViewClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebViewClient with instanceId: $instanceId',
@@ -639,10 +623,8 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
     int webViewInstanceId,
     WebResourceRequestData request,
   ) {
-    final WebViewClient? instance =
-        instanceManager.getInstance(instanceId) as WebViewClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebViewClient? instance = instanceManager.getInstance(instanceId) as WebViewClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebViewClient with instanceId: $instanceId',
@@ -660,10 +642,8 @@ class WebViewClientFlutterApiImpl extends WebViewClientFlutterApi {
     int webViewInstanceId,
     String url,
   ) {
-    final WebViewClient? instance =
-        instanceManager.getInstance(instanceId) as WebViewClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebViewClient? instance = instanceManager.getInstance(instanceId) as WebViewClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebViewClient with instanceId: $instanceId',
@@ -722,8 +702,7 @@ class DownloadListenerFlutterApiImpl extends DownloadListenerFlutterApi {
     String mimetype,
     int contentLength,
   ) {
-    final DownloadListener? instance =
-        instanceManager.getInstance(instanceId) as DownloadListener?;
+    final DownloadListener? instance = instanceManager.getInstance(instanceId) as DownloadListener?;
     assert(
       instance != null,
       'InstanceManager does not contain an DownloadListener with instanceId: $instanceId',
@@ -780,10 +759,8 @@ class WebChromeClientFlutterApiImpl extends WebChromeClientFlutterApi {
 
   @override
   void onProgressChanged(int instanceId, int webViewInstanceId, int progress) {
-    final WebChromeClient? instance =
-        instanceManager.getInstance(instanceId) as WebChromeClient?;
-    final WebView? webViewInstance =
-        instanceManager.getInstance(webViewInstanceId) as WebView?;
+    final WebChromeClient? instance = instanceManager.getInstance(instanceId) as WebChromeClient?;
+    final WebView? webViewInstance = instanceManager.getInstance(webViewInstanceId) as WebView?;
     assert(
       instance != null,
       'InstanceManager does not contain an WebChromeClient with instanceId: $instanceId',
diff --git a/packages/webview_flutter/webview_flutter_android/lib/webview_android.dart b/packages/webview_flutter/webview_flutter_android/lib/webview_android.dart
index 12305444d098..2b4367f8f81e 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/webview_android.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/webview_android.dart
@@ -4,10 +4,12 @@
 
 import 'dart:async';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
-import 'src/android_webview.dart';
 import 'src/instance_manager.dart';
 import 'webview_android_widget.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_android/lib/webview_android_widget.dart b/packages/webview_flutter/webview_flutter_android/lib/webview_android_widget.dart
index 8c7c12de5e25..4748747e9615 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/webview_android_widget.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/webview_android_widget.dart
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'dart:async';
-import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:webview_flutter_android/webview_android_cookie_manager.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_android/lib/webview_surface_android.dart b/packages/webview_flutter/webview_flutter_android/lib/webview_surface_android.dart
index 3121ef329c3d..d0c729db3aa8 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/webview_surface_android.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/webview_surface_android.dart
@@ -1,14 +1,17 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
+
+import 'package:webview_flutter_android/webview_android.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
-import 'src/android_webview.dart';
 import 'src/instance_manager.dart';
-import 'webview_android.dart';
 import 'webview_android_widget.dart';
 
 /// Android [WebViewPlatform] that uses [AndroidViewSurface] to build the [WebView] widget.
diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml
index 27e9e661f32d..45f780ff9fc2 100644
--- a/packages/webview_flutter/webview_flutter_android/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_android/pubspec.yaml
@@ -2,7 +2,7 @@ name: webview_flutter_android
 description: A Flutter plugin that provides a WebView widget on Android.
 repository: https://github.com/Alkami/plugins/tree/main/packages/webview_flutter
 publish_to: https://dart.cloudsmith.io/alkami/flutter/
-version: 5.11.0 # original version was 2.8.3 when this was forked
+version: 5.12.0 # original version was 2.8.3 when this was forked
 
 environment:
   sdk: ">=2.18.0 <3.0.0" # dart version
@@ -17,21 +17,14 @@ flutter:
         pluginClass: WebViewFlutterPlugin
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
-  # FOR TESTING ONLY. DO NOT MERGE.
+  
   webview_flutter_platform_interface: 
     hosted: https://dart.cloudsmith.io/alkami/flutter/
     version: ^5.0.0
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
   build_runner: ^2.1.4
   flutter_driver:
     sdk: flutter
diff --git a/packages/webview_flutter/webview_flutter_android/test/android_webview.pigeon.dart b/packages/webview_flutter/webview_flutter_android/test/android_webview.pigeon.dart
index a0a5d1bf6be3..94dc0c17672e 100644
--- a/packages/webview_flutter/webview_flutter_android/test/android_webview.pigeon.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/android_webview.pigeon.dart
@@ -1,27 +1,25 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-// Autogenerated from Pigeon (v1.0.9), do not edit directly.
+// Autogenerated from Pigeon (v3.2.9), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
-// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import
-// @dart = 2.12
+// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, unnecessary_import
+// ignore_for_file: avoid_relative_lib_imports
 import 'dart:async';
 import 'dart:typed_data' show Uint8List, Int32List, Int64List, Float64List;
 import 'package:flutter/foundation.dart' show WriteBuffer, ReadBuffer;
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
 
-import '../lib/src/android_webview.pigeon.dart';
+import 'package:webview_flutter_android/src/android_webview.pigeon.dart';
 
 class _TestWebViewHostApiCodec extends StandardMessageCodec {
   const _TestWebViewHostApiCodec();
 }
-
 abstract class TestWebViewHostApi {
   static const MessageCodec<Object?> codec = _TestWebViewHostApiCodec();
 
   void create(int instanceId, bool useHybridComposition);
   void dispose(int instanceId);
   void loadData(int instanceId, String data, String mimeType, String encoding);
-  void loadDataWithBaseUrl(int instanceId, String baseUrl, String data,
-      String mimeType, String encoding, String historyUrl);
+  void loadDataWithBaseUrl(int instanceId, String baseUrl, String data, String mimeType, String encoding, String historyUrl);
   void loadUrl(int instanceId, String url, Map<String?, String?> headers);
   void postUrl(int instanceId, String url, Uint8List data);
   String getUrl(int instanceId);
@@ -44,25 +42,20 @@ abstract class TestWebViewHostApi {
   void setDownloadListener(int instanceId, int listenerInstanceId);
   void setWebChromeClient(int instanceId, int clientInstanceId);
   void setBackgroundColor(int instanceId, int color);
-  static void setup(TestWebViewHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestWebViewHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.create', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.create', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.create was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.create was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.create was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.create was null, expected non-null int.');
           final bool? arg_useHybridComposition = (args[1] as bool?);
-          assert(arg_useHybridComposition != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.create was null, expected non-null bool.');
+          assert(arg_useHybridComposition != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.create was null, expected non-null bool.');
           api.create(arg_instanceId!, arg_useHybridComposition!);
           return <Object?, Object?>{};
         });
@@ -70,18 +63,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.dispose', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.dispose was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.dispose was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.dispose was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.dispose was null, expected non-null int.');
           api.dispose(arg_instanceId!);
           return <Object?, Object?>{};
         });
@@ -89,89 +79,67 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.loadData', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.loadData', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null int.');
           final String? arg_data = (args[1] as String?);
-          assert(arg_data != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null String.');
+          assert(arg_data != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null String.');
           final String? arg_mimeType = (args[2] as String?);
-          assert(arg_mimeType != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null String.');
+          assert(arg_mimeType != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null String.');
           final String? arg_encoding = (args[3] as String?);
-          assert(arg_encoding != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null String.');
-          api.loadData(
-              arg_instanceId!, arg_data!, arg_mimeType!, arg_encoding!);
+          assert(arg_encoding != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadData was null, expected non-null String.');
+          api.loadData(arg_instanceId!, arg_data!, arg_mimeType!, arg_encoding!);
           return <Object?, Object?>{};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null int.');
           final String? arg_baseUrl = (args[1] as String?);
-          assert(arg_baseUrl != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
+          assert(arg_baseUrl != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
           final String? arg_data = (args[2] as String?);
-          assert(arg_data != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
+          assert(arg_data != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
           final String? arg_mimeType = (args[3] as String?);
-          assert(arg_mimeType != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
+          assert(arg_mimeType != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
           final String? arg_encoding = (args[4] as String?);
-          assert(arg_encoding != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
+          assert(arg_encoding != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
           final String? arg_historyUrl = (args[5] as String?);
-          assert(arg_historyUrl != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
-          api.loadDataWithBaseUrl(arg_instanceId!, arg_baseUrl!, arg_data!,
-              arg_mimeType!, arg_encoding!, arg_historyUrl!);
+          assert(arg_historyUrl != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadDataWithBaseUrl was null, expected non-null String.');
+          api.loadDataWithBaseUrl(arg_instanceId!, arg_baseUrl!, arg_data!, arg_mimeType!, arg_encoding!, arg_historyUrl!);
           return <Object?, Object?>{};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.loadUrl', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.loadUrl', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null, expected non-null int.');
           final String? arg_url = (args[1] as String?);
-          assert(arg_url != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null, expected non-null String.');
-          final Map<String?, String?>? arg_headers =
-              (args[2] as Map<Object?, Object?>?)?.cast<String?, String?>();
-          assert(arg_headers != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null, expected non-null Map<String?, String?>.');
+          assert(arg_url != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null, expected non-null String.');
+          final Map<String?, String?>? arg_headers = (args[2] as Map<Object?, Object?>?)?.cast<String?, String?>();
+          assert(arg_headers != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.loadUrl was null, expected non-null Map<String?, String?>.');
           api.loadUrl(arg_instanceId!, arg_url!, arg_headers!);
           return <Object?, Object?>{};
         });
@@ -179,24 +147,19 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.postUrl', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.postUrl', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null, expected non-null int.');
           final String? arg_url = (args[1] as String?);
-          assert(arg_url != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null, expected non-null String.');
+          assert(arg_url != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null, expected non-null String.');
           final Uint8List? arg_data = (args[2] as Uint8List?);
-          assert(arg_data != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null, expected non-null Uint8List.');
+          assert(arg_data != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.postUrl was null, expected non-null Uint8List.');
           api.postUrl(arg_instanceId!, arg_url!, arg_data!);
           return <Object?, Object?>{};
         });
@@ -204,18 +167,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.getUrl', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.getUrl', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getUrl was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getUrl was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getUrl was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getUrl was null, expected non-null int.');
           final String output = api.getUrl(arg_instanceId!);
           return <Object?, Object?>{'result': output};
         });
@@ -223,18 +183,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.canGoBack', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.canGoBack', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.canGoBack was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.canGoBack was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.canGoBack was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.canGoBack was null, expected non-null int.');
           final bool output = api.canGoBack(arg_instanceId!);
           return <Object?, Object?>{'result': output};
         });
@@ -242,18 +199,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.canGoForward', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.canGoForward', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.canGoForward was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.canGoForward was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.canGoForward was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.canGoForward was null, expected non-null int.');
           final bool output = api.canGoForward(arg_instanceId!);
           return <Object?, Object?>{'result': output};
         });
@@ -261,18 +215,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.goBack', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.goBack', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.goBack was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.goBack was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.goBack was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.goBack was null, expected non-null int.');
           api.goBack(arg_instanceId!);
           return <Object?, Object?>{};
         });
@@ -280,18 +231,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.goForward', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.goForward', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.goForward was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.goForward was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.goForward was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.goForward was null, expected non-null int.');
           api.goForward(arg_instanceId!);
           return <Object?, Object?>{};
         });
@@ -299,18 +247,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.reload', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.reload', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.reload was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.reload was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.reload was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.reload was null, expected non-null int.');
           api.reload(arg_instanceId!);
           return <Object?, Object?>{};
         });
@@ -318,21 +263,17 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.clearCache', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.clearCache', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.clearCache was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.clearCache was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.clearCache was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.clearCache was null, expected non-null int.');
           final bool? arg_includeDiskFiles = (args[1] as bool?);
-          assert(arg_includeDiskFiles != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.clearCache was null, expected non-null bool.');
+          assert(arg_includeDiskFiles != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.clearCache was null, expected non-null bool.');
           api.clearCache(arg_instanceId!, arg_includeDiskFiles!);
           return <Object?, Object?>{};
         });
@@ -340,41 +281,33 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.evaluateJavascript', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.evaluateJavascript', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.evaluateJavascript was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.evaluateJavascript was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.evaluateJavascript was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.evaluateJavascript was null, expected non-null int.');
           final String? arg_javascriptString = (args[1] as String?);
-          assert(arg_javascriptString != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.evaluateJavascript was null, expected non-null String.');
-          final String output = await api.evaluateJavascript(
-              arg_instanceId!, arg_javascriptString!);
+          assert(arg_javascriptString != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.evaluateJavascript was null, expected non-null String.');
+          final String output = await api.evaluateJavascript(arg_instanceId!, arg_javascriptString!);
           return <Object?, Object?>{'result': output};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.getTitle', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.getTitle', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getTitle was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getTitle was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getTitle was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getTitle was null, expected non-null int.');
           final String output = api.getTitle(arg_instanceId!);
           return <Object?, Object?>{'result': output};
         });
@@ -382,24 +315,19 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.scrollTo', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.scrollTo', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null, expected non-null int.');
           final int? arg_x = (args[1] as int?);
-          assert(arg_x != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null, expected non-null int.');
+          assert(arg_x != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null, expected non-null int.');
           final int? arg_y = (args[2] as int?);
-          assert(arg_y != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null, expected non-null int.');
+          assert(arg_y != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollTo was null, expected non-null int.');
           api.scrollTo(arg_instanceId!, arg_x!, arg_y!);
           return <Object?, Object?>{};
         });
@@ -407,24 +335,19 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.scrollBy', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.scrollBy', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null, expected non-null int.');
           final int? arg_x = (args[1] as int?);
-          assert(arg_x != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null, expected non-null int.');
+          assert(arg_x != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null, expected non-null int.');
           final int? arg_y = (args[2] as int?);
-          assert(arg_y != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null, expected non-null int.');
+          assert(arg_y != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.scrollBy was null, expected non-null int.');
           api.scrollBy(arg_instanceId!, arg_x!, arg_y!);
           return <Object?, Object?>{};
         });
@@ -432,18 +355,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.getScrollX', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.getScrollX', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollX was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollX was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollX was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollX was null, expected non-null int.');
           final int output = api.getScrollX(arg_instanceId!);
           return <Object?, Object?>{'result': output};
         });
@@ -451,18 +371,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.getScrollY', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.getScrollY', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollY was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollY was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollY was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.getScrollY was null, expected non-null int.');
           final int output = api.getScrollY(arg_instanceId!);
           return <Object?, Object?>{'result': output};
         });
@@ -470,19 +387,15 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final bool? arg_enabled = (args[0] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled was null, expected non-null bool.');
+          assert(arg_enabled != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebContentsDebuggingEnabled was null, expected non-null bool.');
           api.setWebContentsDebuggingEnabled(arg_enabled!);
           return <Object?, Object?>{};
         });
@@ -490,21 +403,17 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.setWebViewClient', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.setWebViewClient', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebViewClient was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebViewClient was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebViewClient was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebViewClient was null, expected non-null int.');
           final int? arg_webViewClientInstanceId = (args[1] as int?);
-          assert(arg_webViewClientInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebViewClient was null, expected non-null int.');
+          assert(arg_webViewClientInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebViewClient was null, expected non-null int.');
           api.setWebViewClient(arg_instanceId!, arg_webViewClientInstanceId!);
           return <Object?, Object?>{};
         });
@@ -512,67 +421,53 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel was null, expected non-null int.');
           final int? arg_javaScriptChannelInstanceId = (args[1] as int?);
-          assert(arg_javaScriptChannelInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel was null, expected non-null int.');
-          api.addJavaScriptChannel(
-              arg_instanceId!, arg_javaScriptChannelInstanceId!);
+          assert(arg_javaScriptChannelInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.addJavaScriptChannel was null, expected non-null int.');
+          api.addJavaScriptChannel(arg_instanceId!, arg_javaScriptChannelInstanceId!);
           return <Object?, Object?>{};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel was null, expected non-null int.');
           final int? arg_javaScriptChannelInstanceId = (args[1] as int?);
-          assert(arg_javaScriptChannelInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel was null, expected non-null int.');
-          api.removeJavaScriptChannel(
-              arg_instanceId!, arg_javaScriptChannelInstanceId!);
+          assert(arg_javaScriptChannelInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.removeJavaScriptChannel was null, expected non-null int.');
+          api.removeJavaScriptChannel(arg_instanceId!, arg_javaScriptChannelInstanceId!);
           return <Object?, Object?>{};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.setDownloadListener', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.setDownloadListener', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setDownloadListener was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setDownloadListener was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setDownloadListener was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setDownloadListener was null, expected non-null int.');
           final int? arg_listenerInstanceId = (args[1] as int?);
-          assert(arg_listenerInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setDownloadListener was null, expected non-null int.');
+          assert(arg_listenerInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setDownloadListener was null, expected non-null int.');
           api.setDownloadListener(arg_instanceId!, arg_listenerInstanceId!);
           return <Object?, Object?>{};
         });
@@ -580,21 +475,17 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.setWebChromeClient', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.setWebChromeClient', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebChromeClient was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebChromeClient was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebChromeClient was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebChromeClient was null, expected non-null int.');
           final int? arg_clientInstanceId = (args[1] as int?);
-          assert(arg_clientInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setWebChromeClient was null, expected non-null int.');
+          assert(arg_clientInstanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setWebChromeClient was null, expected non-null int.');
           api.setWebChromeClient(arg_instanceId!, arg_clientInstanceId!);
           return <Object?, Object?>{};
         });
@@ -602,21 +493,17 @@ abstract class TestWebViewHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewHostApi.setBackgroundColor', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewHostApi.setBackgroundColor', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setBackgroundColor was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setBackgroundColor was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setBackgroundColor was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setBackgroundColor was null, expected non-null int.');
           final int? arg_color = (args[1] as int?);
-          assert(arg_color != null,
-              'Argument for dev.flutter.pigeon.WebViewHostApi.setBackgroundColor was null, expected non-null int.');
+          assert(arg_color != null, 'Argument for dev.flutter.pigeon.WebViewHostApi.setBackgroundColor was null, expected non-null int.');
           api.setBackgroundColor(arg_instanceId!, arg_color!);
           return <Object?, Object?>{};
         });
@@ -628,7 +515,6 @@ abstract class TestWebViewHostApi {
 class _TestWebSettingsHostApiCodec extends StandardMessageCodec {
   const _TestWebSettingsHostApiCodec();
 }
-
 abstract class TestWebSettingsHostApi {
   static const MessageCodec<Object?> codec = _TestWebSettingsHostApiCodec();
 
@@ -647,25 +533,20 @@ abstract class TestWebSettingsHostApi {
   void setDisplayZoomControls(int instanceId, bool enabled);
   void setBuiltInZoomControls(int instanceId, bool enabled);
   void setAllowFileAccess(int instanceId, bool enabled);
-  static void setup(TestWebSettingsHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestWebSettingsHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.create', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.create', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.create was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.create was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.create was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.create was null, expected non-null int.');
           final int? arg_webViewInstanceId = (args[1] as int?);
-          assert(arg_webViewInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.create was null, expected non-null int.');
+          assert(arg_webViewInstanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.create was null, expected non-null int.');
           api.create(arg_instanceId!, arg_webViewInstanceId!);
           return <Object?, Object?>{};
         });
@@ -673,18 +554,15 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.dispose', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.dispose', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.dispose was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.dispose was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.dispose was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.dispose was null, expected non-null int.');
           api.dispose(arg_instanceId!);
           return <Object?, Object?>{};
         });
@@ -692,21 +570,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled was null, expected non-null int.');
           final bool? arg_flag = (args[1] as bool?);
-          assert(arg_flag != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled was null, expected non-null bool.');
+          assert(arg_flag != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDomStorageEnabled was null, expected non-null bool.');
           api.setDomStorageEnabled(arg_instanceId!, arg_flag!);
           return <Object?, Object?>{};
         });
@@ -714,46 +588,35 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically was null, expected non-null int.');
           final bool? arg_flag = (args[1] as bool?);
-          assert(arg_flag != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically was null, expected non-null bool.');
-          api.setJavaScriptCanOpenWindowsAutomatically(
-              arg_instanceId!, arg_flag!);
+          assert(arg_flag != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptCanOpenWindowsAutomatically was null, expected non-null bool.');
+          api.setJavaScriptCanOpenWindowsAutomatically(arg_instanceId!, arg_flag!);
           return <Object?, Object?>{};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows was null, expected non-null int.');
           final bool? arg_support = (args[1] as bool?);
-          assert(arg_support != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows was null, expected non-null bool.');
+          assert(arg_support != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportMultipleWindows was null, expected non-null bool.');
           api.setSupportMultipleWindows(arg_instanceId!, arg_support!);
           return <Object?, Object?>{};
         });
@@ -761,21 +624,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled was null, expected non-null int.');
           final bool? arg_flag = (args[1] as bool?);
-          assert(arg_flag != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled was null, expected non-null bool.');
+          assert(arg_flag != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setJavaScriptEnabled was null, expected non-null bool.');
           api.setJavaScriptEnabled(arg_instanceId!, arg_flag!);
           return <Object?, Object?>{};
         });
@@ -783,21 +642,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString was null, expected non-null int.');
           final String? arg_userAgentString = (args[1] as String?);
-          assert(arg_userAgentString != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString was null, expected non-null String.');
+          assert(arg_userAgentString != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUserAgentString was null, expected non-null String.');
           api.setUserAgentString(arg_instanceId!, arg_userAgentString!);
           return <Object?, Object?>{};
         });
@@ -805,45 +660,35 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture was null, expected non-null int.');
           final bool? arg_require = (args[1] as bool?);
-          assert(arg_require != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture was null, expected non-null bool.');
-          api.setMediaPlaybackRequiresUserGesture(
-              arg_instanceId!, arg_require!);
+          assert(arg_require != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setMediaPlaybackRequiresUserGesture was null, expected non-null bool.');
+          api.setMediaPlaybackRequiresUserGesture(arg_instanceId!, arg_require!);
           return <Object?, Object?>{};
         });
       }
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom was null, expected non-null int.');
           final bool? arg_support = (args[1] as bool?);
-          assert(arg_support != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom was null, expected non-null bool.');
+          assert(arg_support != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setSupportZoom was null, expected non-null bool.');
           api.setSupportZoom(arg_instanceId!, arg_support!);
           return <Object?, Object?>{};
         });
@@ -851,21 +696,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled was null, expected non-null int.');
           final bool? arg_enabled = (args[1] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled was null, expected non-null bool.');
+          assert(arg_enabled != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setGeolocationEnabled was null, expected non-null bool.');
           api.setGeolocationEnabled(arg_instanceId!, arg_enabled!);
           return <Object?, Object?>{};
         });
@@ -873,22 +714,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode was null, expected non-null int.');
           final bool? arg_overview = (args[1] as bool?);
-          assert(arg_overview != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode was null, expected non-null bool.');
+          assert(arg_overview != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setLoadWithOverviewMode was null, expected non-null bool.');
           api.setLoadWithOverviewMode(arg_instanceId!, arg_overview!);
           return <Object?, Object?>{};
         });
@@ -896,21 +732,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort was null, expected non-null int.');
           final bool? arg_use = (args[1] as bool?);
-          assert(arg_use != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort was null, expected non-null bool.');
+          assert(arg_use != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setUseWideViewPort was null, expected non-null bool.');
           api.setUseWideViewPort(arg_instanceId!, arg_use!);
           return <Object?, Object?>{};
         });
@@ -918,21 +750,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls was null, expected non-null int.');
           final bool? arg_enabled = (args[1] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls was null, expected non-null bool.');
+          assert(arg_enabled != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setDisplayZoomControls was null, expected non-null bool.');
           api.setDisplayZoomControls(arg_instanceId!, arg_enabled!);
           return <Object?, Object?>{};
         });
@@ -940,21 +768,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls was null, expected non-null int.');
           final bool? arg_enabled = (args[1] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls was null, expected non-null bool.');
+          assert(arg_enabled != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setBuiltInZoomControls was null, expected non-null bool.');
           api.setBuiltInZoomControls(arg_instanceId!, arg_enabled!);
           return <Object?, Object?>{};
         });
@@ -962,21 +786,17 @@ abstract class TestWebSettingsHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess was null, expected non-null int.');
           final bool? arg_enabled = (args[1] as bool?);
-          assert(arg_enabled != null,
-              'Argument for dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess was null, expected non-null bool.');
+          assert(arg_enabled != null, 'Argument for dev.flutter.pigeon.WebSettingsHostApi.setAllowFileAccess was null, expected non-null bool.');
           api.setAllowFileAccess(arg_instanceId!, arg_enabled!);
           return <Object?, Object?>{};
         });
@@ -988,31 +808,24 @@ abstract class TestWebSettingsHostApi {
 class _TestJavaScriptChannelHostApiCodec extends StandardMessageCodec {
   const _TestJavaScriptChannelHostApiCodec();
 }
-
 abstract class TestJavaScriptChannelHostApi {
-  static const MessageCodec<Object?> codec =
-      _TestJavaScriptChannelHostApiCodec();
+  static const MessageCodec<Object?> codec = _TestJavaScriptChannelHostApiCodec();
 
   void create(int instanceId, String channelName);
-  static void setup(TestJavaScriptChannelHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestJavaScriptChannelHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.JavaScriptChannelHostApi.create', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.JavaScriptChannelHostApi.create', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelHostApi.create was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelHostApi.create was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelHostApi.create was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelHostApi.create was null, expected non-null int.');
           final String? arg_channelName = (args[1] as String?);
-          assert(arg_channelName != null,
-              'Argument for dev.flutter.pigeon.JavaScriptChannelHostApi.create was null, expected non-null String.');
+          assert(arg_channelName != null, 'Argument for dev.flutter.pigeon.JavaScriptChannelHostApi.create was null, expected non-null String.');
           api.create(arg_instanceId!, arg_channelName!);
           return <Object?, Object?>{};
         });
@@ -1024,30 +837,24 @@ abstract class TestJavaScriptChannelHostApi {
 class _TestWebViewClientHostApiCodec extends StandardMessageCodec {
   const _TestWebViewClientHostApiCodec();
 }
-
 abstract class TestWebViewClientHostApi {
   static const MessageCodec<Object?> codec = _TestWebViewClientHostApiCodec();
 
   void create(int instanceId, bool shouldOverrideUrlLoading);
-  static void setup(TestWebViewClientHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestWebViewClientHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebViewClientHostApi.create', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebViewClientHostApi.create', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebViewClientHostApi.create was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebViewClientHostApi.create was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebViewClientHostApi.create was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebViewClientHostApi.create was null, expected non-null int.');
           final bool? arg_shouldOverrideUrlLoading = (args[1] as bool?);
-          assert(arg_shouldOverrideUrlLoading != null,
-              'Argument for dev.flutter.pigeon.WebViewClientHostApi.create was null, expected non-null bool.');
+          assert(arg_shouldOverrideUrlLoading != null, 'Argument for dev.flutter.pigeon.WebViewClientHostApi.create was null, expected non-null bool.');
           api.create(arg_instanceId!, arg_shouldOverrideUrlLoading!);
           return <Object?, Object?>{};
         });
@@ -1059,28 +866,22 @@ abstract class TestWebViewClientHostApi {
 class _TestDownloadListenerHostApiCodec extends StandardMessageCodec {
   const _TestDownloadListenerHostApiCodec();
 }
-
 abstract class TestDownloadListenerHostApi {
-  static const MessageCodec<Object?> codec =
-      _TestDownloadListenerHostApiCodec();
+  static const MessageCodec<Object?> codec = _TestDownloadListenerHostApiCodec();
 
   void create(int instanceId);
-  static void setup(TestDownloadListenerHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestDownloadListenerHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.DownloadListenerHostApi.create', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.DownloadListenerHostApi.create', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerHostApi.create was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.DownloadListenerHostApi.create was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.DownloadListenerHostApi.create was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.DownloadListenerHostApi.create was null, expected non-null int.');
           api.create(arg_instanceId!);
           return <Object?, Object?>{};
         });
@@ -1092,30 +893,24 @@ abstract class TestDownloadListenerHostApi {
 class _TestWebChromeClientHostApiCodec extends StandardMessageCodec {
   const _TestWebChromeClientHostApiCodec();
 }
-
 abstract class TestWebChromeClientHostApi {
   static const MessageCodec<Object?> codec = _TestWebChromeClientHostApiCodec();
 
   void create(int instanceId, int webViewClientInstanceId);
-  static void setup(TestWebChromeClientHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestWebChromeClientHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.WebChromeClientHostApi.create', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.WebChromeClientHostApi.create', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientHostApi.create was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.WebChromeClientHostApi.create was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final int? arg_instanceId = (args[0] as int?);
-          assert(arg_instanceId != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientHostApi.create was null, expected non-null int.');
+          assert(arg_instanceId != null, 'Argument for dev.flutter.pigeon.WebChromeClientHostApi.create was null, expected non-null int.');
           final int? arg_webViewClientInstanceId = (args[1] as int?);
-          assert(arg_webViewClientInstanceId != null,
-              'Argument for dev.flutter.pigeon.WebChromeClientHostApi.create was null, expected non-null int.');
+          assert(arg_webViewClientInstanceId != null, 'Argument for dev.flutter.pigeon.WebChromeClientHostApi.create was null, expected non-null int.');
           api.create(arg_instanceId!, arg_webViewClientInstanceId!);
           return <Object?, Object?>{};
         });
@@ -1127,28 +922,23 @@ abstract class TestWebChromeClientHostApi {
 class _TestAssetManagerHostApiCodec extends StandardMessageCodec {
   const _TestAssetManagerHostApiCodec();
 }
-
 abstract class TestAssetManagerHostApi {
   static const MessageCodec<Object?> codec = _TestAssetManagerHostApiCodec();
 
   List<String?> list(String path);
   String getAssetFilePathByName(String name);
-  static void setup(TestAssetManagerHostApi? api,
-      {BinaryMessenger? binaryMessenger}) {
+  static void setup(TestAssetManagerHostApi? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FlutterAssetManagerHostApi.list', codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.FlutterAssetManagerHostApi.list', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.list was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.list was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_path = (args[0] as String?);
-          assert(arg_path != null,
-              'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.list was null, expected non-null String.');
+          assert(arg_path != null, 'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.list was null, expected non-null String.');
           final List<String?> output = api.list(arg_path!);
           return <Object?, Object?>{'result': output};
         });
@@ -1156,19 +946,15 @@ abstract class TestAssetManagerHostApi {
     }
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName',
-          codec,
-          binaryMessenger: binaryMessenger);
+          'dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName', codec, binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMockMessageHandler(null);
       } else {
         channel.setMockMessageHandler((Object? message) async {
-          assert(message != null,
-              'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName was null.');
+          assert(message != null, 'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_name = (args[0] as String?);
-          assert(arg_name != null,
-              'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName was null, expected non-null String.');
+          assert(arg_name != null, 'Argument for dev.flutter.pigeon.FlutterAssetManagerHostApi.getAssetFilePathByName was null, expected non-null String.');
           final String output = api.getAssetFilePathByName(arg_name!);
           return <Object?, Object?>{'result': output};
         });
diff --git a/packages/webview_flutter/webview_flutter_android/test/android_webview_test.dart b/packages/webview_flutter/webview_flutter_android/test/android_webview_test.dart
index c6ed4079207b..91385ff2d364 100644
--- a/packages/webview_flutter/webview_flutter_android/test/android_webview_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/android_webview_test.dart
@@ -1,8 +1,10 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter_android/src/android_webview.dart';
 import 'package:webview_flutter_android/src/android_webview.pigeon.dart';
 import 'package:webview_flutter_android/src/android_webview_api_impls.dart';
diff --git a/packages/webview_flutter/webview_flutter_android/test/android_webview_test.mocks.dart b/packages/webview_flutter/webview_flutter_android/test/android_webview_test.mocks.dart
index d4ecc15e994d..6a31fd86fe3c 100644
--- a/packages/webview_flutter/webview_flutter_android/test/android_webview_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/android_webview_test.mocks.dart
@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in webview_flutter_android/test/android_webview_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:typed_data' as _i6;
 import 'dart:ui' as _i7;
@@ -21,8 +22,17 @@ import 'android_webview.pigeon.dart' as _i5;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWebSettings_0 extends _i1.Fake implements _i2.WebSettings {}
+class _FakeWebSettings_0 extends _i1.SmartFake implements _i2.WebSettings {
+  _FakeWebSettings_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [CookieManagerHostApi].
 ///
@@ -34,14 +44,29 @@ class MockCookieManagerHostApi extends _i1.Mock
   }
 
   @override
-  _i4.Future<bool> clearCookies() =>
-      (super.noSuchMethod(Invocation.method(#clearCookies, []),
-          returnValue: Future<bool>.value(false)) as _i4.Future<bool>);
-  @override
-  _i4.Future<void> setCookie(String? arg_url, String? arg_value) =>
-      (super.noSuchMethod(Invocation.method(#setCookie, [arg_url, arg_value]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+  _i4.Future<bool> clearCookies() => (super.noSuchMethod(
+        Invocation.method(
+          #clearCookies,
+          [],
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<void> setCookie(
+    String? arg_url,
+    String? arg_value,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #setCookie,
+          [
+            arg_url,
+            arg_value,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [DownloadListener].
@@ -53,12 +78,26 @@ class MockDownloadListener extends _i1.Mock implements _i2.DownloadListener {
   }
 
   @override
-  void onDownloadStart(String? url, String? userAgent,
-          String? contentDisposition, String? mimetype, int? contentLength) =>
+  void onDownloadStart(
+    String? url,
+    String? userAgent,
+    String? contentDisposition,
+    String? mimetype,
+    int? contentLength,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#onDownloadStart,
-              [url, userAgent, contentDisposition, mimetype, contentLength]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #onDownloadStart,
+          [
+            url,
+            userAgent,
+            contentDisposition,
+            mimetype,
+            contentLength,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [JavaScriptChannel].
@@ -70,13 +109,18 @@ class MockJavaScriptChannel extends _i1.Mock implements _i2.JavaScriptChannel {
   }
 
   @override
-  String get channelName =>
-      (super.noSuchMethod(Invocation.getter(#channelName), returnValue: '')
-          as String);
-  @override
-  void postMessage(String? message) =>
-      super.noSuchMethod(Invocation.method(#postMessage, [message]),
-          returnValueForMissingStub: null);
+  String get channelName => (super.noSuchMethod(
+        Invocation.getter(#channelName),
+        returnValue: '',
+      ) as String);
+  @override
+  void postMessage(String? message) => super.noSuchMethod(
+        Invocation.method(
+          #postMessage,
+          [message],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestDownloadListenerHostApi].
@@ -89,9 +133,13 @@ class MockTestDownloadListenerHostApi extends _i1.Mock
   }
 
   @override
-  void create(int? instanceId) =>
-      super.noSuchMethod(Invocation.method(#create, [instanceId]),
-          returnValueForMissingStub: null);
+  void create(int? instanceId) => super.noSuchMethod(
+        Invocation.method(
+          #create,
+          [instanceId],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestJavaScriptChannelHostApi].
@@ -104,9 +152,20 @@ class MockTestJavaScriptChannelHostApi extends _i1.Mock
   }
 
   @override
-  void create(int? instanceId, String? channelName) =>
-      super.noSuchMethod(Invocation.method(#create, [instanceId, channelName]),
-          returnValueForMissingStub: null);
+  void create(
+    int? instanceId,
+    String? channelName,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #create,
+          [
+            instanceId,
+            channelName,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestWebChromeClientHostApi].
@@ -119,10 +178,20 @@ class MockTestWebChromeClientHostApi extends _i1.Mock
   }
 
   @override
-  void create(int? instanceId, int? webViewClientInstanceId) =>
+  void create(
+    int? instanceId,
+    int? webViewClientInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#create, [instanceId, webViewClientInstanceId]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #create,
+          [
+            instanceId,
+            webViewClientInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestWebSettingsHostApi].
@@ -135,75 +204,223 @@ class MockTestWebSettingsHostApi extends _i1.Mock
   }
 
   @override
-  void create(int? instanceId, int? webViewInstanceId) => super.noSuchMethod(
-      Invocation.method(#create, [instanceId, webViewInstanceId]),
-      returnValueForMissingStub: null);
-  @override
-  void dispose(int? instanceId) =>
-      super.noSuchMethod(Invocation.method(#dispose, [instanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void setDomStorageEnabled(int? instanceId, bool? flag) => super.noSuchMethod(
-      Invocation.method(#setDomStorageEnabled, [instanceId, flag]),
-      returnValueForMissingStub: null);
-  @override
-  void setJavaScriptCanOpenWindowsAutomatically(int? instanceId, bool? flag) =>
+  void create(
+    int? instanceId,
+    int? webViewInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #setJavaScriptCanOpenWindowsAutomatically, [instanceId, flag]),
-          returnValueForMissingStub: null);
-  @override
-  void setSupportMultipleWindows(int? instanceId, bool? support) =>
+        Invocation.method(
+          #create,
+          [
+            instanceId,
+            webViewInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void dispose(int? instanceId) => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [instanceId],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setDomStorageEnabled(
+    int? instanceId,
+    bool? flag,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#setSupportMultipleWindows, [instanceId, support]),
-          returnValueForMissingStub: null);
-  @override
-  void setJavaScriptEnabled(int? instanceId, bool? flag) => super.noSuchMethod(
-      Invocation.method(#setJavaScriptEnabled, [instanceId, flag]),
-      returnValueForMissingStub: null);
-  @override
-  void setUserAgentString(int? instanceId, String? userAgentString) =>
+        Invocation.method(
+          #setDomStorageEnabled,
+          [
+            instanceId,
+            flag,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setJavaScriptCanOpenWindowsAutomatically(
+    int? instanceId,
+    bool? flag,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#setUserAgentString, [instanceId, userAgentString]),
-          returnValueForMissingStub: null);
-  @override
-  void setMediaPlaybackRequiresUserGesture(int? instanceId, bool? require) =>
+        Invocation.method(
+          #setJavaScriptCanOpenWindowsAutomatically,
+          [
+            instanceId,
+            flag,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setSupportMultipleWindows(
+    int? instanceId,
+    bool? support,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #setMediaPlaybackRequiresUserGesture, [instanceId, require]),
-          returnValueForMissingStub: null);
-  @override
-  void setSupportZoom(int? instanceId, bool? support) => super.noSuchMethod(
-      Invocation.method(#setSupportZoom, [instanceId, support]),
-      returnValueForMissingStub: null);
-  @override
-  void setGeolocationEnabled(int? instanceId, bool? enabled) =>
+        Invocation.method(
+          #setSupportMultipleWindows,
+          [
+            instanceId,
+            support,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setJavaScriptEnabled(
+    int? instanceId,
+    bool? flag,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#setGeolocationEnabled, [instanceId, enabled]),
-          returnValueForMissingStub: null);
-  @override
-  void setLoadWithOverviewMode(int? instanceId, bool? overview) =>
+        Invocation.method(
+          #setJavaScriptEnabled,
+          [
+            instanceId,
+            flag,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setUserAgentString(
+    int? instanceId,
+    String? userAgentString,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#setLoadWithOverviewMode, [instanceId, overview]),
-          returnValueForMissingStub: null);
-  @override
-  void setUseWideViewPort(int? instanceId, bool? use) => super.noSuchMethod(
-      Invocation.method(#setUseWideViewPort, [instanceId, use]),
-      returnValueForMissingStub: null);
-  @override
-  void setDisplayZoomControls(int? instanceId, bool? enabled) =>
+        Invocation.method(
+          #setUserAgentString,
+          [
+            instanceId,
+            userAgentString,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setMediaPlaybackRequiresUserGesture(
+    int? instanceId,
+    bool? require,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#setDisplayZoomControls, [instanceId, enabled]),
-          returnValueForMissingStub: null);
-  @override
-  void setBuiltInZoomControls(int? instanceId, bool? enabled) =>
+        Invocation.method(
+          #setMediaPlaybackRequiresUserGesture,
+          [
+            instanceId,
+            require,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setSupportZoom(
+    int? instanceId,
+    bool? support,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#setBuiltInZoomControls, [instanceId, enabled]),
-          returnValueForMissingStub: null);
-  @override
-  void setAllowFileAccess(int? instanceId, bool? enabled) => super.noSuchMethod(
-      Invocation.method(#setAllowFileAccess, [instanceId, enabled]),
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #setSupportZoom,
+          [
+            instanceId,
+            support,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setGeolocationEnabled(
+    int? instanceId,
+    bool? enabled,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setGeolocationEnabled,
+          [
+            instanceId,
+            enabled,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setLoadWithOverviewMode(
+    int? instanceId,
+    bool? overview,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setLoadWithOverviewMode,
+          [
+            instanceId,
+            overview,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setUseWideViewPort(
+    int? instanceId,
+    bool? use,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setUseWideViewPort,
+          [
+            instanceId,
+            use,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setDisplayZoomControls(
+    int? instanceId,
+    bool? enabled,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setDisplayZoomControls,
+          [
+            instanceId,
+            enabled,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setBuiltInZoomControls(
+    int? instanceId,
+    bool? enabled,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setBuiltInZoomControls,
+          [
+            instanceId,
+            enabled,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setAllowFileAccess(
+    int? instanceId,
+    bool? enabled,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setAllowFileAccess,
+          [
+            instanceId,
+            enabled,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestWebViewClientHostApi].
@@ -216,10 +433,20 @@ class MockTestWebViewClientHostApi extends _i1.Mock
   }
 
   @override
-  void create(int? instanceId, bool? shouldOverrideUrlLoading) =>
+  void create(
+    int? instanceId,
+    bool? shouldOverrideUrlLoading,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#create, [instanceId, shouldOverrideUrlLoading]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #create,
+          [
+            instanceId,
+            shouldOverrideUrlLoading,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestWebViewHostApi].
@@ -232,132 +459,338 @@ class MockTestWebViewHostApi extends _i1.Mock
   }
 
   @override
-  void create(int? instanceId, bool? useHybridComposition) =>
+  void create(
+    int? instanceId,
+    bool? useHybridComposition,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#create, [instanceId, useHybridComposition]),
-          returnValueForMissingStub: null);
-  @override
-  void dispose(int? instanceId) =>
-      super.noSuchMethod(Invocation.method(#dispose, [instanceId]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #create,
+          [
+            instanceId,
+            useHybridComposition,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void dispose(int? instanceId) => super.noSuchMethod(
+        Invocation.method(
+          #dispose,
+          [instanceId],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   void loadData(
-          int? instanceId, String? data, String? mimeType, String? encoding) =>
+    int? instanceId,
+    String? data,
+    String? mimeType,
+    String? encoding,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#loadData, [instanceId, data, mimeType, encoding]),
-          returnValueForMissingStub: null);
-  @override
-  void loadDataWithBaseUrl(int? instanceId, String? baseUrl, String? data,
-          String? mimeType, String? encoding, String? historyUrl) =>
+        Invocation.method(
+          #loadData,
+          [
+            instanceId,
+            data,
+            mimeType,
+            encoding,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void loadDataWithBaseUrl(
+    int? instanceId,
+    String? baseUrl,
+    String? data,
+    String? mimeType,
+    String? encoding,
+    String? historyUrl,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#loadDataWithBaseUrl,
-              [instanceId, baseUrl, data, mimeType, encoding, historyUrl]),
-          returnValueForMissingStub: null);
-  @override
-  void loadUrl(int? instanceId, String? url, Map<String?, String?>? headers) =>
+        Invocation.method(
+          #loadDataWithBaseUrl,
+          [
+            instanceId,
+            baseUrl,
+            data,
+            mimeType,
+            encoding,
+            historyUrl,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void loadUrl(
+    int? instanceId,
+    String? url,
+    Map<String?, String?>? headers,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#loadUrl, [instanceId, url, headers]),
-          returnValueForMissingStub: null);
-  @override
-  void postUrl(int? instanceId, String? url, _i6.Uint8List? data) =>
-      super.noSuchMethod(Invocation.method(#postUrl, [instanceId, url, data]),
-          returnValueForMissingStub: null);
-  @override
-  String getUrl(int? instanceId) =>
-      (super.noSuchMethod(Invocation.method(#getUrl, [instanceId]),
-          returnValue: '') as String);
-  @override
-  bool canGoBack(int? instanceId) =>
-      (super.noSuchMethod(Invocation.method(#canGoBack, [instanceId]),
-          returnValue: false) as bool);
-  @override
-  bool canGoForward(int? instanceId) =>
-      (super.noSuchMethod(Invocation.method(#canGoForward, [instanceId]),
-          returnValue: false) as bool);
-  @override
-  void goBack(int? instanceId) =>
-      super.noSuchMethod(Invocation.method(#goBack, [instanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void goForward(int? instanceId) =>
-      super.noSuchMethod(Invocation.method(#goForward, [instanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void reload(int? instanceId) =>
-      super.noSuchMethod(Invocation.method(#reload, [instanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void clearCache(int? instanceId, bool? includeDiskFiles) =>
+        Invocation.method(
+          #loadUrl,
+          [
+            instanceId,
+            url,
+            headers,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void postUrl(
+    int? instanceId,
+    String? url,
+    _i6.Uint8List? data,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #postUrl,
+          [
+            instanceId,
+            url,
+            data,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  String getUrl(int? instanceId) => (super.noSuchMethod(
+        Invocation.method(
+          #getUrl,
+          [instanceId],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  bool canGoBack(int? instanceId) => (super.noSuchMethod(
+        Invocation.method(
+          #canGoBack,
+          [instanceId],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  bool canGoForward(int? instanceId) => (super.noSuchMethod(
+        Invocation.method(
+          #canGoForward,
+          [instanceId],
+        ),
+        returnValue: false,
+      ) as bool);
+  @override
+  void goBack(int? instanceId) => super.noSuchMethod(
+        Invocation.method(
+          #goBack,
+          [instanceId],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void goForward(int? instanceId) => super.noSuchMethod(
+        Invocation.method(
+          #goForward,
+          [instanceId],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void reload(int? instanceId) => super.noSuchMethod(
+        Invocation.method(
+          #reload,
+          [instanceId],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void clearCache(
+    int? instanceId,
+    bool? includeDiskFiles,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#clearCache, [instanceId, includeDiskFiles]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #clearCache,
+          [
+            instanceId,
+            includeDiskFiles,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   _i4.Future<String> evaluateJavascript(
-          int? instanceId, String? javascriptString) =>
+    int? instanceId,
+    String? javascriptString,
+  ) =>
       (super.noSuchMethod(
-          Invocation.method(
-              #evaluateJavascript, [instanceId, javascriptString]),
-          returnValue: Future<String>.value('')) as _i4.Future<String>);
-  @override
-  String getTitle(int? instanceId) =>
-      (super.noSuchMethod(Invocation.method(#getTitle, [instanceId]),
-          returnValue: '') as String);
-  @override
-  void scrollTo(int? instanceId, int? x, int? y) =>
-      super.noSuchMethod(Invocation.method(#scrollTo, [instanceId, x, y]),
-          returnValueForMissingStub: null);
-  @override
-  void scrollBy(int? instanceId, int? x, int? y) =>
-      super.noSuchMethod(Invocation.method(#scrollBy, [instanceId, x, y]),
-          returnValueForMissingStub: null);
-  @override
-  int getScrollX(int? instanceId) =>
-      (super.noSuchMethod(Invocation.method(#getScrollX, [instanceId]),
-          returnValue: 0) as int);
-  @override
-  int getScrollY(int? instanceId) =>
-      (super.noSuchMethod(Invocation.method(#getScrollY, [instanceId]),
-          returnValue: 0) as int);
+        Invocation.method(
+          #evaluateJavascript,
+          [
+            instanceId,
+            javascriptString,
+          ],
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
+  @override
+  String getTitle(int? instanceId) => (super.noSuchMethod(
+        Invocation.method(
+          #getTitle,
+          [instanceId],
+        ),
+        returnValue: '',
+      ) as String);
+  @override
+  void scrollTo(
+    int? instanceId,
+    int? x,
+    int? y,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #scrollTo,
+          [
+            instanceId,
+            x,
+            y,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void scrollBy(
+    int? instanceId,
+    int? x,
+    int? y,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #scrollBy,
+          [
+            instanceId,
+            x,
+            y,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  int getScrollX(int? instanceId) => (super.noSuchMethod(
+        Invocation.method(
+          #getScrollX,
+          [instanceId],
+        ),
+        returnValue: 0,
+      ) as int);
+  @override
+  int getScrollY(int? instanceId) => (super.noSuchMethod(
+        Invocation.method(
+          #getScrollY,
+          [instanceId],
+        ),
+        returnValue: 0,
+      ) as int);
   @override
   void setWebContentsDebuggingEnabled(bool? enabled) => super.noSuchMethod(
-      Invocation.method(#setWebContentsDebuggingEnabled, [enabled]),
-      returnValueForMissingStub: null);
-  @override
-  void setWebViewClient(int? instanceId, int? webViewClientInstanceId) =>
+        Invocation.method(
+          #setWebContentsDebuggingEnabled,
+          [enabled],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setWebViewClient(
+    int? instanceId,
+    int? webViewClientInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #setWebViewClient, [instanceId, webViewClientInstanceId]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #setWebViewClient,
+          [
+            instanceId,
+            webViewClientInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   void addJavaScriptChannel(
-          int? instanceId, int? javaScriptChannelInstanceId) =>
+    int? instanceId,
+    int? javaScriptChannelInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #addJavaScriptChannel, [instanceId, javaScriptChannelInstanceId]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #addJavaScriptChannel,
+          [
+            instanceId,
+            javaScriptChannelInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   void removeJavaScriptChannel(
-          int? instanceId, int? javaScriptChannelInstanceId) =>
+    int? instanceId,
+    int? javaScriptChannelInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#removeJavaScriptChannel,
-              [instanceId, javaScriptChannelInstanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void setDownloadListener(int? instanceId, int? listenerInstanceId) =>
+        Invocation.method(
+          #removeJavaScriptChannel,
+          [
+            instanceId,
+            javaScriptChannelInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setDownloadListener(
+    int? instanceId,
+    int? listenerInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #setDownloadListener, [instanceId, listenerInstanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void setWebChromeClient(int? instanceId, int? clientInstanceId) =>
+        Invocation.method(
+          #setDownloadListener,
+          [
+            instanceId,
+            listenerInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setWebChromeClient(
+    int? instanceId,
+    int? clientInstanceId,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #setWebChromeClient, [instanceId, clientInstanceId]),
-          returnValueForMissingStub: null);
-  @override
-  void setBackgroundColor(int? instanceId, int? color) => super.noSuchMethod(
-      Invocation.method(#setBackgroundColor, [instanceId, color]),
-      returnValueForMissingStub: null);
+        Invocation.method(
+          #setWebChromeClient,
+          [
+            instanceId,
+            clientInstanceId,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void setBackgroundColor(
+    int? instanceId,
+    int? color,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #setBackgroundColor,
+          [
+            instanceId,
+            color,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [TestAssetManagerHostApi].
@@ -370,13 +803,21 @@ class MockTestAssetManagerHostApi extends _i1.Mock
   }
 
   @override
-  List<String?> list(String? path) =>
-      (super.noSuchMethod(Invocation.method(#list, [path]),
-          returnValue: <String?>[]) as List<String?>);
-  @override
-  String getAssetFilePathByName(String? name) =>
-      (super.noSuchMethod(Invocation.method(#getAssetFilePathByName, [name]),
-          returnValue: '') as String);
+  List<String?> list(String? path) => (super.noSuchMethod(
+        Invocation.method(
+          #list,
+          [path],
+        ),
+        returnValue: <String?>[],
+      ) as List<String?>);
+  @override
+  String getAssetFilePathByName(String? name) => (super.noSuchMethod(
+        Invocation.method(
+          #getAssetFilePathByName,
+          [name],
+        ),
+        returnValue: '',
+      ) as String);
 }
 
 /// A class which mocks [WebChromeClient].
@@ -388,9 +829,20 @@ class MockWebChromeClient extends _i1.Mock implements _i2.WebChromeClient {
   }
 
   @override
-  void onProgressChanged(_i2.WebView? webView, int? progress) => super
-      .noSuchMethod(Invocation.method(#onProgressChanged, [webView, progress]),
-          returnValueForMissingStub: null);
+  void onProgressChanged(
+    _i2.WebView? webView,
+    int? progress,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #onProgressChanged,
+          [
+            webView,
+            progress,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebView].
@@ -402,145 +854,287 @@ class MockWebView extends _i1.Mock implements _i2.WebView {
   }
 
   @override
-  bool get useHybridComposition =>
-      (super.noSuchMethod(Invocation.getter(#useHybridComposition),
-          returnValue: false) as bool);
-  @override
-  _i2.WebSettings get settings =>
-      (super.noSuchMethod(Invocation.getter(#settings),
-          returnValue: _FakeWebSettings_0()) as _i2.WebSettings);
-  @override
-  _i4.Future<void> loadData(
-          {String? data, String? mimeType, String? encoding}) =>
+  bool get useHybridComposition => (super.noSuchMethod(
+        Invocation.getter(#useHybridComposition),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i2.WebSettings get settings => (super.noSuchMethod(
+        Invocation.getter(#settings),
+        returnValue: _FakeWebSettings_0(
+          this,
+          Invocation.getter(#settings),
+        ),
+      ) as _i2.WebSettings);
+  @override
+  _i4.Future<void> loadData({
+    required String? data,
+    String? mimeType,
+    String? encoding,
+  }) =>
       (super.noSuchMethod(
-          Invocation.method(#loadData, [],
-              {#data: data, #mimeType: mimeType, #encoding: encoding}),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> loadDataWithBaseUrl(
-          {String? baseUrl,
-          String? data,
-          String? mimeType,
-          String? encoding,
-          String? historyUrl}) =>
+        Invocation.method(
+          #loadData,
+          [],
+          {
+            #data: data,
+            #mimeType: mimeType,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> loadDataWithBaseUrl({
+    String? baseUrl,
+    required String? data,
+    String? mimeType,
+    String? encoding,
+    String? historyUrl,
+  }) =>
       (super.noSuchMethod(
-          Invocation.method(#loadDataWithBaseUrl, [], {
+        Invocation.method(
+          #loadDataWithBaseUrl,
+          [],
+          {
             #baseUrl: baseUrl,
             #data: data,
             #mimeType: mimeType,
             #encoding: encoding,
-            #historyUrl: historyUrl
-          }),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> loadUrl(String? url, Map<String, String>? headers) =>
-      (super.noSuchMethod(Invocation.method(#loadUrl, [url, headers]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> postUrl(String? url, _i6.Uint8List? data) =>
-      (super.noSuchMethod(Invocation.method(#postUrl, [url, data]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<String?> getUrl() =>
-      (super.noSuchMethod(Invocation.method(#getUrl, []),
-          returnValue: Future<String?>.value()) as _i4.Future<String?>);
-  @override
-  _i4.Future<bool> canGoBack() =>
-      (super.noSuchMethod(Invocation.method(#canGoBack, []),
-          returnValue: Future<bool>.value(false)) as _i4.Future<bool>);
-  @override
-  _i4.Future<bool> canGoForward() =>
-      (super.noSuchMethod(Invocation.method(#canGoForward, []),
-          returnValue: Future<bool>.value(false)) as _i4.Future<bool>);
-  @override
-  _i4.Future<void> goBack() =>
-      (super.noSuchMethod(Invocation.method(#goBack, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> goForward() =>
-      (super.noSuchMethod(Invocation.method(#goForward, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> reload() =>
-      (super.noSuchMethod(Invocation.method(#reload, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> clearCache(bool? includeDiskFiles) =>
-      (super.noSuchMethod(Invocation.method(#clearCache, [includeDiskFiles]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<String?> evaluateJavascript(String? javascriptString) => (super
-      .noSuchMethod(Invocation.method(#evaluateJavascript, [javascriptString]),
-          returnValue: Future<String?>.value()) as _i4.Future<String?>);
-  @override
-  _i4.Future<String?> getTitle() =>
-      (super.noSuchMethod(Invocation.method(#getTitle, []),
-          returnValue: Future<String?>.value()) as _i4.Future<String?>);
-  @override
-  _i4.Future<void> scrollTo(int? x, int? y) =>
-      (super.noSuchMethod(Invocation.method(#scrollTo, [x, y]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> scrollBy(int? x, int? y) =>
-      (super.noSuchMethod(Invocation.method(#scrollBy, [x, y]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<int> getScrollX() =>
-      (super.noSuchMethod(Invocation.method(#getScrollX, []),
-          returnValue: Future<int>.value(0)) as _i4.Future<int>);
-  @override
-  _i4.Future<int> getScrollY() =>
-      (super.noSuchMethod(Invocation.method(#getScrollY, []),
-          returnValue: Future<int>.value(0)) as _i4.Future<int>);
+            #historyUrl: historyUrl,
+          },
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> loadUrl(
+    String? url,
+    Map<String, String>? headers,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #loadUrl,
+          [
+            url,
+            headers,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> postUrl(
+    String? url,
+    _i6.Uint8List? data,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #postUrl,
+          [
+            url,
+            data,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<String?> getUrl() => (super.noSuchMethod(
+        Invocation.method(
+          #getUrl,
+          [],
+        ),
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);
+  @override
+  _i4.Future<bool> canGoBack() => (super.noSuchMethod(
+        Invocation.method(
+          #canGoBack,
+          [],
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<bool> canGoForward() => (super.noSuchMethod(
+        Invocation.method(
+          #canGoForward,
+          [],
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<void> goBack() => (super.noSuchMethod(
+        Invocation.method(
+          #goBack,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> goForward() => (super.noSuchMethod(
+        Invocation.method(
+          #goForward,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> reload() => (super.noSuchMethod(
+        Invocation.method(
+          #reload,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> clearCache(bool? includeDiskFiles) => (super.noSuchMethod(
+        Invocation.method(
+          #clearCache,
+          [includeDiskFiles],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<String?> evaluateJavascript(String? javascriptString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #evaluateJavascript,
+          [javascriptString],
+        ),
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);
+  @override
+  _i4.Future<String?> getTitle() => (super.noSuchMethod(
+        Invocation.method(
+          #getTitle,
+          [],
+        ),
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);
+  @override
+  _i4.Future<void> scrollTo(
+    int? x,
+    int? y,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #scrollTo,
+          [
+            x,
+            y,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> scrollBy(
+    int? x,
+    int? y,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #scrollBy,
+          [
+            x,
+            y,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<int> getScrollX() => (super.noSuchMethod(
+        Invocation.method(
+          #getScrollX,
+          [],
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<int> getScrollY() => (super.noSuchMethod(
+        Invocation.method(
+          #getScrollY,
+          [],
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
   @override
   _i4.Future<void> setWebViewClient(_i2.WebViewClient? webViewClient) =>
-      (super.noSuchMethod(Invocation.method(#setWebViewClient, [webViewClient]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #setWebViewClient,
+          [webViewClient],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> addJavaScriptChannel(
           _i2.JavaScriptChannel? javaScriptChannel) =>
       (super.noSuchMethod(
-          Invocation.method(#addJavaScriptChannel, [javaScriptChannel]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #addJavaScriptChannel,
+          [javaScriptChannel],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> removeJavaScriptChannel(
           _i2.JavaScriptChannel? javaScriptChannel) =>
       (super.noSuchMethod(
-          Invocation.method(#removeJavaScriptChannel, [javaScriptChannel]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #removeJavaScriptChannel,
+          [javaScriptChannel],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> setDownloadListener(_i2.DownloadListener? listener) =>
-      (super.noSuchMethod(Invocation.method(#setDownloadListener, [listener]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #setDownloadListener,
+          [listener],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> setWebChromeClient(_i2.WebChromeClient? client) =>
-      (super.noSuchMethod(Invocation.method(#setWebChromeClient, [client]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setBackgroundColor(_i7.Color? color) =>
-      (super.noSuchMethod(Invocation.method(#setBackgroundColor, [color]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> release() =>
-      (super.noSuchMethod(Invocation.method(#release, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #setWebChromeClient,
+          [client],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setBackgroundColor(_i7.Color? color) => (super.noSuchMethod(
+        Invocation.method(
+          #setBackgroundColor,
+          [color],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> release() => (super.noSuchMethod(
+        Invocation.method(
+          #release,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [WebViewClient].
@@ -552,36 +1146,104 @@ class MockWebViewClient extends _i1.Mock implements _i2.WebViewClient {
   }
 
   @override
-  bool get shouldOverrideUrlLoading =>
-      (super.noSuchMethod(Invocation.getter(#shouldOverrideUrlLoading),
-          returnValue: false) as bool);
+  bool get shouldOverrideUrlLoading => (super.noSuchMethod(
+        Invocation.getter(#shouldOverrideUrlLoading),
+        returnValue: false,
+      ) as bool);
   @override
-  void onPageStarted(_i2.WebView? webView, String? url) =>
-      super.noSuchMethod(Invocation.method(#onPageStarted, [webView, url]),
-          returnValueForMissingStub: null);
-  @override
-  void onPageFinished(_i2.WebView? webView, String? url) =>
-      super.noSuchMethod(Invocation.method(#onPageFinished, [webView, url]),
-          returnValueForMissingStub: null);
-  @override
-  void onReceivedRequestError(_i2.WebView? webView,
-          _i2.WebResourceRequest? request, _i2.WebResourceError? error) =>
+  void onPageStarted(
+    _i2.WebView? webView,
+    String? url,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#onReceivedRequestError, [webView, request, error]),
-          returnValueForMissingStub: null);
-  @override
-  void onReceivedError(_i2.WebView? webView, int? errorCode,
-          String? description, String? failingUrl) =>
+        Invocation.method(
+          #onPageStarted,
+          [
+            webView,
+            url,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onPageFinished(
+    _i2.WebView? webView,
+    String? url,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #onReceivedError, [webView, errorCode, description, failingUrl]),
-          returnValueForMissingStub: null);
-  @override
-  void requestLoading(_i2.WebView? webView, _i2.WebResourceRequest? request) =>
-      super.noSuchMethod(Invocation.method(#requestLoading, [webView, request]),
-          returnValueForMissingStub: null);
-  @override
-  void urlLoading(_i2.WebView? webView, String? url) =>
-      super.noSuchMethod(Invocation.method(#urlLoading, [webView, url]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #onPageFinished,
+          [
+            webView,
+            url,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onReceivedRequestError(
+    _i2.WebView? webView,
+    _i2.WebResourceRequest? request,
+    _i2.WebResourceError? error,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #onReceivedRequestError,
+          [
+            webView,
+            request,
+            error,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onReceivedError(
+    _i2.WebView? webView,
+    int? errorCode,
+    String? description,
+    String? failingUrl,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #onReceivedError,
+          [
+            webView,
+            errorCode,
+            description,
+            failingUrl,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void requestLoading(
+    _i2.WebView? webView,
+    _i2.WebResourceRequest? request,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #requestLoading,
+          [
+            webView,
+            request,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void urlLoading(
+    _i2.WebView? webView,
+    String? url,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #urlLoading,
+          [
+            webView,
+            url,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
diff --git a/packages/webview_flutter/webview_flutter_android/test/instance_manager_test.dart b/packages/webview_flutter/webview_flutter_android/test/instance_manager_test.dart
index 421ef5451375..ff13e9e14e9c 100644
--- a/packages/webview_flutter/webview_flutter_android/test/instance_manager_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/instance_manager_test.dart
@@ -1,4 +1,4 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter_test/flutter_test.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
diff --git a/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.dart b/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.dart
index acf2a62a62c5..4f274ff4499f 100644
--- a/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.dart
@@ -1,8 +1,10 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter_android/src/android_webview.dart'
     as android_webview;
 import 'package:webview_flutter_android/webview_android_cookie_manager.dart';
diff --git a/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.mocks.dart b/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.mocks.dart
index 308aba4fa1b0..725e63a67110 100644
--- a/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/webview_android_cookie_manager_test.mocks.dart
@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in webview_flutter_android/test/webview_android_cookie_manager_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i3;
 
 import 'package:mockito/mockito.dart' as _i1;
@@ -16,6 +17,7 @@ import 'package:webview_flutter_android/src/android_webview.dart' as _i2;
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
 /// A class which mocks [CookieManager].
 ///
@@ -26,12 +28,27 @@ class MockCookieManager extends _i1.Mock implements _i2.CookieManager {
   }
 
   @override
-  _i3.Future<void> setCookie(String? url, String? value) =>
-      (super.noSuchMethod(Invocation.method(#setCookie, [url, value]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i3.Future<void>);
+  _i3.Future<void> setCookie(
+    String? url,
+    String? value,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #setCookie,
+          [
+            url,
+            value,
+          ],
+        ),
+        returnValue: _i3.Future<void>.value(),
+        returnValueForMissingStub: _i3.Future<void>.value(),
+      ) as _i3.Future<void>);
   @override
-  _i3.Future<bool> clearCookies() =>
-      (super.noSuchMethod(Invocation.method(#clearCookies, []),
-          returnValue: Future<bool>.value(false)) as _i3.Future<bool>);
+  _i3.Future<bool> clearCookies() => (super.noSuchMethod(
+        Invocation.method(
+          #clearCookies,
+          [],
+        ),
+        returnValue: _i3.Future<bool>.value(false),
+      ) as _i3.Future<bool>);
 }
diff --git a/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.dart b/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.dart
index db2b7fc0da01..476e76c77deb 100644
--- a/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.dart
@@ -2,11 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter_android/src/android_webview.dart' as android_webview;
 import 'package:webview_flutter_android/src/android_webview_api_impls.dart';
 import 'package:webview_flutter_android/src/instance_manager.dart';
diff --git a/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.mocks.dart b/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.mocks.dart
index 3fe1203cb44a..7f9057ffa5d9 100644
--- a/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/webview_android_widget_test.mocks.dart
@@ -1,7 +1,8 @@
-// Mocks generated by Mockito 5.2.0 from annotations
+// Mocks generated by Mockito 5.3.2 from annotations
 // in webview_flutter_android/test/webview_android_widget_test.dart.
 // Do not manually edit this file.
 
+// ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i4;
 import 'dart:typed_data' as _i5;
 import 'dart:ui' as _i6;
@@ -21,13 +22,38 @@ import 'package:webview_flutter_platform_interface/webview_flutter_platform_inte
 // ignore_for_file: prefer_const_constructors
 // ignore_for_file: unnecessary_parenthesis
 // ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
 
-class _FakeWebSettings_0 extends _i1.Fake implements _i2.WebSettings {}
+class _FakeWebSettings_0 extends _i1.SmartFake implements _i2.WebSettings {
+  _FakeWebSettings_0(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeJavascriptChannelRegistry_1 extends _i1.Fake
-    implements _i3.JavascriptChannelRegistry {}
+class _FakeJavascriptChannelRegistry_1 extends _i1.SmartFake
+    implements _i3.JavascriptChannelRegistry {
+  _FakeJavascriptChannelRegistry_1(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
-class _FakeWebView_2 extends _i1.Fake implements _i2.WebView {}
+class _FakeWebView_2 extends _i1.SmartFake implements _i2.WebView {
+  _FakeWebView_2(
+    Object parent,
+    Invocation parentInvocation,
+  ) : super(
+          parent,
+          parentInvocation,
+        );
+}
 
 /// A class which mocks [FlutterAssetManager].
 ///
@@ -39,14 +65,22 @@ class MockFlutterAssetManager extends _i1.Mock
   }
 
   @override
-  _i4.Future<List<String?>> list(String? path) =>
-      (super.noSuchMethod(Invocation.method(#list, [path]),
-              returnValue: Future<List<String?>>.value(<String?>[]))
-          as _i4.Future<List<String?>>);
+  _i4.Future<List<String?>> list(String? path) => (super.noSuchMethod(
+        Invocation.method(
+          #list,
+          [path],
+        ),
+        returnValue: _i4.Future<List<String?>>.value(<String?>[]),
+      ) as _i4.Future<List<String?>>);
   @override
   _i4.Future<String> getAssetFilePathByName(String? name) =>
-      (super.noSuchMethod(Invocation.method(#getAssetFilePathByName, [name]),
-          returnValue: Future<String>.value('')) as _i4.Future<String>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #getAssetFilePathByName,
+          [name],
+        ),
+        returnValue: _i4.Future<String>.value(''),
+      ) as _i4.Future<String>);
 }
 
 /// A class which mocks [WebSettings].
@@ -58,72 +92,127 @@ class MockWebSettings extends _i1.Mock implements _i2.WebSettings {
   }
 
   @override
-  _i4.Future<void> setDomStorageEnabled(bool? flag) =>
-      (super.noSuchMethod(Invocation.method(#setDomStorageEnabled, [flag]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+  _i4.Future<void> setDomStorageEnabled(bool? flag) => (super.noSuchMethod(
+        Invocation.method(
+          #setDomStorageEnabled,
+          [flag],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> setJavaScriptCanOpenWindowsAutomatically(bool? flag) =>
       (super.noSuchMethod(
-          Invocation.method(#setJavaScriptCanOpenWindowsAutomatically, [flag]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setSupportMultipleWindows(bool? support) => (super
-      .noSuchMethod(Invocation.method(#setSupportMultipleWindows, [support]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setJavaScriptEnabled(bool? flag) =>
-      (super.noSuchMethod(Invocation.method(#setJavaScriptEnabled, [flag]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setUserAgentString(String? userAgentString) => (super
-      .noSuchMethod(Invocation.method(#setUserAgentString, [userAgentString]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #setJavaScriptCanOpenWindowsAutomatically,
+          [flag],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setSupportMultipleWindows(bool? support) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #setSupportMultipleWindows,
+          [support],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setJavaScriptEnabled(bool? flag) => (super.noSuchMethod(
+        Invocation.method(
+          #setJavaScriptEnabled,
+          [flag],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setUserAgentString(String? userAgentString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #setUserAgentString,
+          [userAgentString],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> setMediaPlaybackRequiresUserGesture(bool? require) =>
       (super.noSuchMethod(
-          Invocation.method(#setMediaPlaybackRequiresUserGesture, [require]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setSupportZoom(bool? support) =>
-      (super.noSuchMethod(Invocation.method(#setSupportZoom, [support]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setGeolocationEnabled(bool? enabled) =>
-      (super.noSuchMethod(Invocation.method(#setGeolocationEnabled, [enabled]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setLoadWithOverviewMode(bool? overview) => (super
-      .noSuchMethod(Invocation.method(#setLoadWithOverviewMode, [overview]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setUseWideViewPort(bool? use) =>
-      (super.noSuchMethod(Invocation.method(#setUseWideViewPort, [use]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setDisplayZoomControls(bool? enabled) =>
-      (super.noSuchMethod(Invocation.method(#setDisplayZoomControls, [enabled]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setBuiltInZoomControls(bool? enabled) =>
-      (super.noSuchMethod(Invocation.method(#setBuiltInZoomControls, [enabled]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setAllowFileAccess(bool? enabled) =>
-      (super.noSuchMethod(Invocation.method(#setAllowFileAccess, [enabled]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #setMediaPlaybackRequiresUserGesture,
+          [require],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setSupportZoom(bool? support) => (super.noSuchMethod(
+        Invocation.method(
+          #setSupportZoom,
+          [support],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setGeolocationEnabled(bool? enabled) => (super.noSuchMethod(
+        Invocation.method(
+          #setGeolocationEnabled,
+          [enabled],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setLoadWithOverviewMode(bool? overview) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #setLoadWithOverviewMode,
+          [overview],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setUseWideViewPort(bool? use) => (super.noSuchMethod(
+        Invocation.method(
+          #setUseWideViewPort,
+          [use],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setDisplayZoomControls(bool? enabled) => (super.noSuchMethod(
+        Invocation.method(
+          #setDisplayZoomControls,
+          [enabled],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setBuiltInZoomControls(bool? enabled) => (super.noSuchMethod(
+        Invocation.method(
+          #setBuiltInZoomControls,
+          [enabled],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setAllowFileAccess(bool? enabled) => (super.noSuchMethod(
+        Invocation.method(
+          #setAllowFileAccess,
+          [enabled],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [WebView].
@@ -135,145 +224,287 @@ class MockWebView extends _i1.Mock implements _i2.WebView {
   }
 
   @override
-  bool get useHybridComposition =>
-      (super.noSuchMethod(Invocation.getter(#useHybridComposition),
-          returnValue: false) as bool);
-  @override
-  _i2.WebSettings get settings =>
-      (super.noSuchMethod(Invocation.getter(#settings),
-          returnValue: _FakeWebSettings_0()) as _i2.WebSettings);
-  @override
-  _i4.Future<void> loadData(
-          {String? data, String? mimeType, String? encoding}) =>
+  bool get useHybridComposition => (super.noSuchMethod(
+        Invocation.getter(#useHybridComposition),
+        returnValue: false,
+      ) as bool);
+  @override
+  _i2.WebSettings get settings => (super.noSuchMethod(
+        Invocation.getter(#settings),
+        returnValue: _FakeWebSettings_0(
+          this,
+          Invocation.getter(#settings),
+        ),
+      ) as _i2.WebSettings);
+  @override
+  _i4.Future<void> loadData({
+    required String? data,
+    String? mimeType,
+    String? encoding,
+  }) =>
       (super.noSuchMethod(
-          Invocation.method(#loadData, [],
-              {#data: data, #mimeType: mimeType, #encoding: encoding}),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> loadDataWithBaseUrl(
-          {String? baseUrl,
-          String? data,
-          String? mimeType,
-          String? encoding,
-          String? historyUrl}) =>
+        Invocation.method(
+          #loadData,
+          [],
+          {
+            #data: data,
+            #mimeType: mimeType,
+            #encoding: encoding,
+          },
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> loadDataWithBaseUrl({
+    String? baseUrl,
+    required String? data,
+    String? mimeType,
+    String? encoding,
+    String? historyUrl,
+  }) =>
       (super.noSuchMethod(
-          Invocation.method(#loadDataWithBaseUrl, [], {
+        Invocation.method(
+          #loadDataWithBaseUrl,
+          [],
+          {
             #baseUrl: baseUrl,
             #data: data,
             #mimeType: mimeType,
             #encoding: encoding,
-            #historyUrl: historyUrl
-          }),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> loadUrl(String? url, Map<String, String>? headers) =>
-      (super.noSuchMethod(Invocation.method(#loadUrl, [url, headers]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> postUrl(String? url, _i5.Uint8List? data) =>
-      (super.noSuchMethod(Invocation.method(#postUrl, [url, data]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<String?> getUrl() =>
-      (super.noSuchMethod(Invocation.method(#getUrl, []),
-          returnValue: Future<String?>.value()) as _i4.Future<String?>);
-  @override
-  _i4.Future<bool> canGoBack() =>
-      (super.noSuchMethod(Invocation.method(#canGoBack, []),
-          returnValue: Future<bool>.value(false)) as _i4.Future<bool>);
-  @override
-  _i4.Future<bool> canGoForward() =>
-      (super.noSuchMethod(Invocation.method(#canGoForward, []),
-          returnValue: Future<bool>.value(false)) as _i4.Future<bool>);
-  @override
-  _i4.Future<void> goBack() =>
-      (super.noSuchMethod(Invocation.method(#goBack, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> goForward() =>
-      (super.noSuchMethod(Invocation.method(#goForward, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> reload() =>
-      (super.noSuchMethod(Invocation.method(#reload, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> clearCache(bool? includeDiskFiles) =>
-      (super.noSuchMethod(Invocation.method(#clearCache, [includeDiskFiles]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<String?> evaluateJavascript(String? javascriptString) => (super
-      .noSuchMethod(Invocation.method(#evaluateJavascript, [javascriptString]),
-          returnValue: Future<String?>.value()) as _i4.Future<String?>);
-  @override
-  _i4.Future<String?> getTitle() =>
-      (super.noSuchMethod(Invocation.method(#getTitle, []),
-          returnValue: Future<String?>.value()) as _i4.Future<String?>);
-  @override
-  _i4.Future<void> scrollTo(int? x, int? y) =>
-      (super.noSuchMethod(Invocation.method(#scrollTo, [x, y]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> scrollBy(int? x, int? y) =>
-      (super.noSuchMethod(Invocation.method(#scrollBy, [x, y]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<int> getScrollX() =>
-      (super.noSuchMethod(Invocation.method(#getScrollX, []),
-          returnValue: Future<int>.value(0)) as _i4.Future<int>);
-  @override
-  _i4.Future<int> getScrollY() =>
-      (super.noSuchMethod(Invocation.method(#getScrollY, []),
-          returnValue: Future<int>.value(0)) as _i4.Future<int>);
+            #historyUrl: historyUrl,
+          },
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> loadUrl(
+    String? url,
+    Map<String, String>? headers,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #loadUrl,
+          [
+            url,
+            headers,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> postUrl(
+    String? url,
+    _i5.Uint8List? data,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #postUrl,
+          [
+            url,
+            data,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<String?> getUrl() => (super.noSuchMethod(
+        Invocation.method(
+          #getUrl,
+          [],
+        ),
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);
+  @override
+  _i4.Future<bool> canGoBack() => (super.noSuchMethod(
+        Invocation.method(
+          #canGoBack,
+          [],
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<bool> canGoForward() => (super.noSuchMethod(
+        Invocation.method(
+          #canGoForward,
+          [],
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.Future<bool>);
+  @override
+  _i4.Future<void> goBack() => (super.noSuchMethod(
+        Invocation.method(
+          #goBack,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> goForward() => (super.noSuchMethod(
+        Invocation.method(
+          #goForward,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> reload() => (super.noSuchMethod(
+        Invocation.method(
+          #reload,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> clearCache(bool? includeDiskFiles) => (super.noSuchMethod(
+        Invocation.method(
+          #clearCache,
+          [includeDiskFiles],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<String?> evaluateJavascript(String? javascriptString) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #evaluateJavascript,
+          [javascriptString],
+        ),
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);
+  @override
+  _i4.Future<String?> getTitle() => (super.noSuchMethod(
+        Invocation.method(
+          #getTitle,
+          [],
+        ),
+        returnValue: _i4.Future<String?>.value(),
+      ) as _i4.Future<String?>);
+  @override
+  _i4.Future<void> scrollTo(
+    int? x,
+    int? y,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #scrollTo,
+          [
+            x,
+            y,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> scrollBy(
+    int? x,
+    int? y,
+  ) =>
+      (super.noSuchMethod(
+        Invocation.method(
+          #scrollBy,
+          [
+            x,
+            y,
+          ],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<int> getScrollX() => (super.noSuchMethod(
+        Invocation.method(
+          #getScrollX,
+          [],
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
+  @override
+  _i4.Future<int> getScrollY() => (super.noSuchMethod(
+        Invocation.method(
+          #getScrollY,
+          [],
+        ),
+        returnValue: _i4.Future<int>.value(0),
+      ) as _i4.Future<int>);
   @override
   _i4.Future<void> setWebViewClient(_i2.WebViewClient? webViewClient) =>
-      (super.noSuchMethod(Invocation.method(#setWebViewClient, [webViewClient]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #setWebViewClient,
+          [webViewClient],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> addJavaScriptChannel(
           _i2.JavaScriptChannel? javaScriptChannel) =>
       (super.noSuchMethod(
-          Invocation.method(#addJavaScriptChannel, [javaScriptChannel]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #addJavaScriptChannel,
+          [javaScriptChannel],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> removeJavaScriptChannel(
           _i2.JavaScriptChannel? javaScriptChannel) =>
       (super.noSuchMethod(
-          Invocation.method(#removeJavaScriptChannel, [javaScriptChannel]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #removeJavaScriptChannel,
+          [javaScriptChannel],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> setDownloadListener(_i2.DownloadListener? listener) =>
-      (super.noSuchMethod(Invocation.method(#setDownloadListener, [listener]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #setDownloadListener,
+          [listener],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
   @override
   _i4.Future<void> setWebChromeClient(_i2.WebChromeClient? client) =>
-      (super.noSuchMethod(Invocation.method(#setWebChromeClient, [client]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> setBackgroundColor(_i6.Color? color) =>
-      (super.noSuchMethod(Invocation.method(#setBackgroundColor, [color]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
-  @override
-  _i4.Future<void> release() =>
-      (super.noSuchMethod(Invocation.method(#release, []),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+      (super.noSuchMethod(
+        Invocation.method(
+          #setWebChromeClient,
+          [client],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> setBackgroundColor(_i6.Color? color) => (super.noSuchMethod(
+        Invocation.method(
+          #setBackgroundColor,
+          [color],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
+  @override
+  _i4.Future<void> release() => (super.noSuchMethod(
+        Invocation.method(
+          #release,
+          [],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [WebViewAndroidDownloadListener].
@@ -286,18 +517,41 @@ class MockWebViewAndroidDownloadListener extends _i1.Mock
   }
 
   @override
-  _i4.Future<void> Function(String, Map<String, String>?) get loadUrl =>
-      (super.noSuchMethod(Invocation.getter(#loadUrl),
-          returnValue: (String url, Map<String, String>? headers) =>
-              Future<void>.value()) as _i4.Future<void> Function(
-          String, Map<String, String>?));
-  @override
-  void onDownloadStart(String? url, String? userAgent,
-          String? contentDisposition, String? mimetype, int? contentLength) =>
+  _i4.Future<void> Function(
+    String,
+    Map<String, String>?,
+  ) get loadUrl => (super.noSuchMethod(
+        Invocation.getter(#loadUrl),
+        returnValue: (
+          String url,
+          Map<String, String>? headers,
+        ) =>
+            _i4.Future<void>.value(),
+      ) as _i4.Future<void> Function(
+        String,
+        Map<String, String>?,
+      ));
+  @override
+  void onDownloadStart(
+    String? url,
+    String? userAgent,
+    String? contentDisposition,
+    String? mimetype,
+    int? contentLength,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#onDownloadStart,
-              [url, userAgent, contentDisposition, mimetype, contentLength]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #onDownloadStart,
+          [
+            url,
+            userAgent,
+            contentDisposition,
+            mimetype,
+            contentLength,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebViewAndroidJavaScriptChannel].
@@ -311,17 +565,26 @@ class MockWebViewAndroidJavaScriptChannel extends _i1.Mock
 
   @override
   _i3.JavascriptChannelRegistry get javascriptChannelRegistry =>
-      (super.noSuchMethod(Invocation.getter(#javascriptChannelRegistry),
-              returnValue: _FakeJavascriptChannelRegistry_1())
-          as _i3.JavascriptChannelRegistry);
-  @override
-  String get channelName =>
-      (super.noSuchMethod(Invocation.getter(#channelName), returnValue: '')
-          as String);
-  @override
-  void postMessage(String? message) =>
-      super.noSuchMethod(Invocation.method(#postMessage, [message]),
-          returnValueForMissingStub: null);
+      (super.noSuchMethod(
+        Invocation.getter(#javascriptChannelRegistry),
+        returnValue: _FakeJavascriptChannelRegistry_1(
+          this,
+          Invocation.getter(#javascriptChannelRegistry),
+        ),
+      ) as _i3.JavascriptChannelRegistry);
+  @override
+  String get channelName => (super.noSuchMethod(
+        Invocation.getter(#channelName),
+        returnValue: '',
+      ) as String);
+  @override
+  void postMessage(String? message) => super.noSuchMethod(
+        Invocation.method(
+          #postMessage,
+          [message],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebViewAndroidWebChromeClient].
@@ -334,9 +597,20 @@ class MockWebViewAndroidWebChromeClient extends _i1.Mock
   }
 
   @override
-  void onProgressChanged(_i2.WebView? webView, int? progress) => super
-      .noSuchMethod(Invocation.method(#onProgressChanged, [webView, progress]),
-          returnValueForMissingStub: null);
+  void onProgressChanged(
+    _i2.WebView? webView,
+    int? progress,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #onProgressChanged,
+          [
+            webView,
+            progress,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebViewAndroidWebViewClient].
@@ -349,62 +623,137 @@ class MockWebViewAndroidWebViewClient extends _i1.Mock
   }
 
   @override
-  void Function(String) get onPageStartedCallback =>
-      (super.noSuchMethod(Invocation.getter(#onPageStartedCallback),
-          returnValue: (String url) {}) as void Function(String));
+  void Function(String) get onPageStartedCallback => (super.noSuchMethod(
+        Invocation.getter(#onPageStartedCallback),
+        returnValue: (String url) {},
+      ) as void Function(String));
   @override
-  void Function(String) get onPageFinishedCallback =>
-      (super.noSuchMethod(Invocation.getter(#onPageFinishedCallback),
-          returnValue: (String url) {}) as void Function(String));
+  void Function(String) get onPageFinishedCallback => (super.noSuchMethod(
+        Invocation.getter(#onPageFinishedCallback),
+        returnValue: (String url) {},
+      ) as void Function(String));
   @override
   void Function(_i3.WebResourceError) get onWebResourceErrorCallback =>
-      (super.noSuchMethod(Invocation.getter(#onWebResourceErrorCallback),
-              returnValue: (_i3.WebResourceError error) {})
-          as void Function(_i3.WebResourceError));
+      (super.noSuchMethod(
+        Invocation.getter(#onWebResourceErrorCallback),
+        returnValue: (_i3.WebResourceError error) {},
+      ) as void Function(_i3.WebResourceError));
   @override
   set onWebResourceErrorCallback(
           void Function(_i3.WebResourceError)? _onWebResourceErrorCallback) =>
       super.noSuchMethod(
-          Invocation.setter(
-              #onWebResourceErrorCallback, _onWebResourceErrorCallback),
-          returnValueForMissingStub: null);
-  @override
-  bool get handlesNavigation =>
-      (super.noSuchMethod(Invocation.getter(#handlesNavigation),
-          returnValue: false) as bool);
-  @override
-  bool get shouldOverrideUrlLoading =>
-      (super.noSuchMethod(Invocation.getter(#shouldOverrideUrlLoading),
-          returnValue: false) as bool);
-  @override
-  void onPageStarted(_i2.WebView? webView, String? url) =>
-      super.noSuchMethod(Invocation.method(#onPageStarted, [webView, url]),
-          returnValueForMissingStub: null);
-  @override
-  void onPageFinished(_i2.WebView? webView, String? url) =>
-      super.noSuchMethod(Invocation.method(#onPageFinished, [webView, url]),
-          returnValueForMissingStub: null);
-  @override
-  void onReceivedError(_i2.WebView? webView, int? errorCode,
-          String? description, String? failingUrl) =>
+        Invocation.setter(
+          #onWebResourceErrorCallback,
+          _onWebResourceErrorCallback,
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  bool get handlesNavigation => (super.noSuchMethod(
+        Invocation.getter(#handlesNavigation),
+        returnValue: false,
+      ) as bool);
+  @override
+  bool get shouldOverrideUrlLoading => (super.noSuchMethod(
+        Invocation.getter(#shouldOverrideUrlLoading),
+        returnValue: false,
+      ) as bool);
+  @override
+  void onPageStarted(
+    _i2.WebView? webView,
+    String? url,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(
-              #onReceivedError, [webView, errorCode, description, failingUrl]),
-          returnValueForMissingStub: null);
-  @override
-  void onReceivedRequestError(_i2.WebView? webView,
-          _i2.WebResourceRequest? request, _i2.WebResourceError? error) =>
+        Invocation.method(
+          #onPageStarted,
+          [
+            webView,
+            url,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onPageFinished(
+    _i2.WebView? webView,
+    String? url,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#onReceivedRequestError, [webView, request, error]),
-          returnValueForMissingStub: null);
-  @override
-  void urlLoading(_i2.WebView? webView, String? url) =>
-      super.noSuchMethod(Invocation.method(#urlLoading, [webView, url]),
-          returnValueForMissingStub: null);
-  @override
-  void requestLoading(_i2.WebView? webView, _i2.WebResourceRequest? request) =>
-      super.noSuchMethod(Invocation.method(#requestLoading, [webView, request]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #onPageFinished,
+          [
+            webView,
+            url,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onReceivedError(
+    _i2.WebView? webView,
+    int? errorCode,
+    String? description,
+    String? failingUrl,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #onReceivedError,
+          [
+            webView,
+            errorCode,
+            description,
+            failingUrl,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onReceivedRequestError(
+    _i2.WebView? webView,
+    _i2.WebResourceRequest? request,
+    _i2.WebResourceError? error,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #onReceivedRequestError,
+          [
+            webView,
+            request,
+            error,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void urlLoading(
+    _i2.WebView? webView,
+    String? url,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #urlLoading,
+          [
+            webView,
+            url,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void requestLoading(
+    _i2.WebView? webView,
+    _i2.WebResourceRequest? request,
+  ) =>
+      super.noSuchMethod(
+        Invocation.method(
+          #requestLoading,
+          [
+            webView,
+            request,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [JavascriptChannelRegistry].
@@ -417,20 +766,34 @@ class MockJavascriptChannelRegistry extends _i1.Mock
   }
 
   @override
-  Map<String, _i3.JavascriptChannel> get channels =>
-      (super.noSuchMethod(Invocation.getter(#channels),
-              returnValue: <String, _i3.JavascriptChannel>{})
-          as Map<String, _i3.JavascriptChannel>);
+  Map<String, _i3.JavascriptChannel> get channels => (super.noSuchMethod(
+        Invocation.getter(#channels),
+        returnValue: <String, _i3.JavascriptChannel>{},
+      ) as Map<String, _i3.JavascriptChannel>);
   @override
-  void onJavascriptChannelMessage(String? channel, String? message) =>
+  void onJavascriptChannelMessage(
+    String? channel,
+    String? message,
+  ) =>
       super.noSuchMethod(
-          Invocation.method(#onJavascriptChannelMessage, [channel, message]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #onJavascriptChannelMessage,
+          [
+            channel,
+            message,
+          ],
+        ),
+        returnValueForMissingStub: null,
+      );
   @override
   void updateJavascriptChannelsFromSet(Set<_i3.JavascriptChannel>? channels) =>
       super.noSuchMethod(
-          Invocation.method(#updateJavascriptChannelsFromSet, [channels]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #updateJavascriptChannelsFromSet,
+          [channels],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebViewPlatformCallbacksHandler].
@@ -443,27 +806,53 @@ class MockWebViewPlatformCallbacksHandler extends _i1.Mock
   }
 
   @override
-  _i4.FutureOr<bool> onNavigationRequest({String? url, bool? isForMainFrame}) =>
+  _i4.FutureOr<bool> onNavigationRequest({
+    required String? url,
+    required bool? isForMainFrame,
+  }) =>
       (super.noSuchMethod(
-          Invocation.method(#onNavigationRequest, [],
-              {#url: url, #isForMainFrame: isForMainFrame}),
-          returnValue: Future<bool>.value(false)) as _i4.FutureOr<bool>);
-  @override
-  void onPageStarted(String? url) =>
-      super.noSuchMethod(Invocation.method(#onPageStarted, [url]),
-          returnValueForMissingStub: null);
-  @override
-  void onPageFinished(String? url) =>
-      super.noSuchMethod(Invocation.method(#onPageFinished, [url]),
-          returnValueForMissingStub: null);
-  @override
-  void onProgress(int? progress) =>
-      super.noSuchMethod(Invocation.method(#onProgress, [progress]),
-          returnValueForMissingStub: null);
-  @override
-  void onWebResourceError(_i3.WebResourceError? error) =>
-      super.noSuchMethod(Invocation.method(#onWebResourceError, [error]),
-          returnValueForMissingStub: null);
+        Invocation.method(
+          #onNavigationRequest,
+          [],
+          {
+            #url: url,
+            #isForMainFrame: isForMainFrame,
+          },
+        ),
+        returnValue: _i4.Future<bool>.value(false),
+      ) as _i4.FutureOr<bool>);
+  @override
+  void onPageStarted(String? url) => super.noSuchMethod(
+        Invocation.method(
+          #onPageStarted,
+          [url],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onPageFinished(String? url) => super.noSuchMethod(
+        Invocation.method(
+          #onPageFinished,
+          [url],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onProgress(int? progress) => super.noSuchMethod(
+        Invocation.method(
+          #onProgress,
+          [progress],
+        ),
+        returnValueForMissingStub: null,
+      );
+  @override
+  void onWebResourceError(_i3.WebResourceError? error) => super.noSuchMethod(
+        Invocation.method(
+          #onWebResourceError,
+          [error],
+        ),
+        returnValueForMissingStub: null,
+      );
 }
 
 /// A class which mocks [WebViewProxy].
@@ -475,15 +864,30 @@ class MockWebViewProxy extends _i1.Mock implements _i7.WebViewProxy {
   }
 
   @override
-  _i2.WebView createWebView({bool? useHybridComposition}) =>
+  _i2.WebView createWebView({required bool? useHybridComposition}) =>
       (super.noSuchMethod(
-          Invocation.method(#createWebView, [],
-              {#useHybridComposition: useHybridComposition}),
-          returnValue: _FakeWebView_2()) as _i2.WebView);
+        Invocation.method(
+          #createWebView,
+          [],
+          {#useHybridComposition: useHybridComposition},
+        ),
+        returnValue: _FakeWebView_2(
+          this,
+          Invocation.method(
+            #createWebView,
+            [],
+            {#useHybridComposition: useHybridComposition},
+          ),
+        ),
+      ) as _i2.WebView);
   @override
   _i4.Future<void> setWebContentsDebuggingEnabled(bool? enabled) =>
       (super.noSuchMethod(
-          Invocation.method(#setWebContentsDebuggingEnabled, [enabled]),
-          returnValue: Future<void>.value(),
-          returnValueForMissingStub: Future<void>.value()) as _i4.Future<void>);
+        Invocation.method(
+          #setWebContentsDebuggingEnabled,
+          [enabled],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/CHANGELOG.md b/packages/webview_flutter/webview_flutter_platform_interface/CHANGELOG.md
index e1ecc46813a8..f7493adc6c93 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter_platform_interface/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.12.0
+
+- enh: DEV-156308 Convert flutter_platform out of a monorepo
+
 # 5.11.0
 
 - enh: DEV-148888 Drop Android 8 Support
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/method_channel/webview_method_channel.dart b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/method_channel/webview_method_channel.dart
index 11ac55a531e9..f1739f7dbff8 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/method_channel/webview_method_channel.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/method_channel/webview_method_channel.dart
@@ -4,11 +4,8 @@
 
 import 'dart:async';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-
-import '../platform_interface/javascript_channel_registry.dart';
-import '../platform_interface/platform_interface.dart';
-import '../types/types.dart';
+import 'package:flutter/services.dart';
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 /// A [WebViewPlatformController] that uses a method channel to control the webview.
 class MethodChannelWebViewPlatform implements WebViewPlatformController {
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/platform_interface/webview_platform.dart b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/platform_interface/webview_platform.dart
index e7225c6778bd..7c9074aa0e5f 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/platform_interface/webview_platform.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/platform_interface/webview_platform.dart
@@ -1,13 +1,7 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-// Copyright 2013 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:webview_flutter_platform_interface/src/platform_interface/javascript_channel_registry.dart';
-
-import '../types/types.dart';
-import 'webview_platform_callbacks_handler.dart';
-import 'webview_platform_controller.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 /// Signature for callbacks reporting that a [WebViewPlatformController] was created.
 ///
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/creation_params.dart b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/creation_params.dart
index b2ce2a2251b8..e0c3fd372f46 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/creation_params.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/creation_params.dart
@@ -1,4 +1,5 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
+
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
@@ -21,8 +22,7 @@ class CreationParams {
     this.webSettings,
     this.javascriptChannelNames = const <String>{},
     this.userAgent,
-    this.autoMediaPlaybackPolicy =
-        AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
+    this.autoMediaPlaybackPolicy = AutoMediaPlaybackPolicy.require_user_action_for_all_media_types,
     this.backgroundColor,
     this.cookies = const <WebViewCookie>[],
   }) : assert(autoMediaPlaybackPolicy != null);
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/web_settings.dart b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/web_settings.dart
index d668e63af255..d3fb780f70c8 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/web_settings.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/web_settings.dart
@@ -1,4 +1,5 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
+
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/pubspec.yaml b/packages/webview_flutter/webview_flutter_platform_interface/pubspec.yaml
index a9d05f58174c..290bfa934faa 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_platform_interface/pubspec.yaml
@@ -2,26 +2,19 @@ name: webview_flutter_platform_interface
 description: A common platform interface for the webview_flutter plugin.
 repository: https://github.com/Alkami/plugins/tree/main/packages/webview_flutter
 publish_to: https://dart.cloudsmith.io/alkami/flutter/
-version: 5.11.0 # original version was 1.8.1 when this was forked
+version: 5.12.0 # original version was 1.8.1 when this was forked
 
 environment:
   sdk: ">=2.18.0 <3.0.0" # dart version
   flutter: ">=3.3.0"
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
+
   plugin_platform_interface: ^2.1.0
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter_test:
     sdk: flutter
 
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/test/src/method_channel/webview_method_channel_test.dart b/packages/webview_flutter/webview_flutter_platform_interface/test/src/method_channel/webview_method_channel_test.dart
index e23bdd7d4b75..d297bf5ec67b 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/test/src/method_channel/webview_method_channel_test.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/test/src/method_channel/webview_method_channel_test.dart
@@ -4,8 +4,11 @@
 
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter_platform_interface/src/method_channel/webview_method_channel.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/javascript_channel_registry_test.dart b/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/javascript_channel_registry_test.dart
index 13e647305578..df1b53090fc8 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/javascript_channel_registry_test.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/javascript_channel_registry_test.dart
@@ -1,8 +1,8 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:webview_flutter_platform_interface/src/platform_interface/javascript_channel_registry.dart';
 import 'package:webview_flutter_platform_interface/src/types/javascript_channel.dart';
 import 'package:webview_flutter_platform_interface/src/types/types.dart';
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/webview_cookie_manager_test.dart b/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/webview_cookie_manager_test.dart
index 0d32a18e594d..acfacf839c92 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/webview_cookie_manager_test.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/test/src/platform_interface/webview_cookie_manager_test.dart
@@ -1,4 +1,4 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter_test/flutter_test.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/javascript_channel_test.dart b/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/javascript_channel_test.dart
index 428330628bec..f481edda1edd 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/javascript_channel_test.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/javascript_channel_test.dart
@@ -1,8 +1,8 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter_test/flutter_test.dart';
 import 'package:webview_flutter_platform_interface/src/types/javascript_channel.dart';
 
 void main() {
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_cookie_test.dart b/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_cookie_test.dart
index bdd28cbcd0bd..cce992e4334d 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_cookie_test.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_cookie_test.dart
@@ -1,4 +1,4 @@
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter_test/flutter_test.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
diff --git a/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_request_test.dart b/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_request_test.dart
index 5bfce1119574..14d9c2a99d85 100644
--- a/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_request_test.dart
+++ b/packages/webview_flutter/webview_flutter_platform_interface/test/src/types/webview_request_test.dart
@@ -4,7 +4,7 @@
 
 import 'dart:typed_data';
 
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter_test/flutter_test.dart';
 import 'package:webview_flutter_platform_interface/src/types/types.dart';
 
 void main() {
diff --git a/packages/webview_flutter/webview_flutter_web/CHANGELOG.md b/packages/webview_flutter/webview_flutter_web/CHANGELOG.md
index 6d39e14b572f..693ad895fdf4 100644
--- a/packages/webview_flutter/webview_flutter_web/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter_web/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.12.0
+
+- enh: DEV-156308 Convert flutter_platform out of a monorepo
+
 # 5.11.0
 
 - enh: DEV-148888 Drop Android 8 Support
diff --git a/packages/webview_flutter/webview_flutter_web/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_web/example/integration_test/webview_flutter_test.dart
index 3649aa1ddde4..3013ffb9270f 100644
--- a/packages/webview_flutter/webview_flutter_web/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter_web/example/integration_test/webview_flutter_test.dart
@@ -5,8 +5,9 @@
 import 'dart:async';
 import 'dart:html' as html;
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:webview_flutter_web_example/web_view.dart';
 
 void main() {
diff --git a/packages/webview_flutter/webview_flutter_web/example/lib/main.dart b/packages/webview_flutter/webview_flutter_web/example/lib/main.dart
index f6ad24410542..e6dba6125f7a 100644
--- a/packages/webview_flutter/webview_flutter_web/example/lib/main.dart
+++ b/packages/webview_flutter/webview_flutter_web/example/lib/main.dart
@@ -3,7 +3,8 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
+
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 import 'web_view.dart';
diff --git a/packages/webview_flutter/webview_flutter_web/example/lib/web_view.dart b/packages/webview_flutter/webview_flutter_web/example/lib/web_view.dart
index 296defae733f..71cc00de320b 100644
--- a/packages/webview_flutter/webview_flutter_web/example/lib/web_view.dart
+++ b/packages/webview_flutter/webview_flutter_web/example/lib/web_view.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/material.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 import 'package:webview_flutter_web/webview_flutter_web.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_web/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_web/example/pubspec.yaml
index bcc73f542dd4..d9d73f24c91b 100644
--- a/packages/webview_flutter/webview_flutter_web/example/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_web/example/pubspec.yaml
@@ -7,9 +7,6 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
   flutter:
     sdk: flutter
   flutter_web_plugins:
@@ -23,9 +20,6 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
   espresso: ^0.1.0+2
   flutter_driver:
     sdk: flutter
diff --git a/packages/webview_flutter/webview_flutter_web/lib/webview_flutter_web.dart b/packages/webview_flutter/webview_flutter_web/lib/webview_flutter_web.dart
index 2282e5d11815..666f0e6c341f 100644
--- a/packages/webview_flutter/webview_flutter_web/lib/webview_flutter_web.dart
+++ b/packages/webview_flutter/webview_flutter_web/lib/webview_flutter_web.dart
@@ -5,7 +5,9 @@
 import 'dart:async';
 import 'dart:html';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_web/pubspec.yaml b/packages/webview_flutter/webview_flutter_web/pubspec.yaml
index 5f0097c50c4a..232d843f85e5 100644
--- a/packages/webview_flutter/webview_flutter_web/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_web/pubspec.yaml
@@ -2,7 +2,7 @@ name: webview_flutter_web
 description: A Flutter plugin that provides a WebView widget on web.
 repository: https://github.com/Alkami/plugins/tree/main/packages/webview_flutter
 publish_to: https://dart.cloudsmith.io/alkami/flutter/
-version: 5.11.0 # original version was 0.1.0+1 when this was forked
+version: 5.12.0 # original version was 0.1.0+1 when this was forked
 
 environment:
   sdk: ">=2.18.0 <3.0.0" # dart version
@@ -17,26 +17,17 @@ flutter:
         fileName: webview_flutter_web.dart
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
 
   flutter_web_plugins:
     sdk: flutter
 
-  # FOR TESTING ONLY. DO NOT MERGE.
   webview_flutter_platform_interface: 
     hosted: https://dart.cloudsmith.io/alkami/flutter/
     version: ^5.0.0
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   build_runner: ^2.1.5
 
   flutter_driver:
diff --git a/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.dart b/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.dart
index 4c0998a08408..bd5e6efeff61 100644
--- a/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.dart
+++ b/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.dart
@@ -5,8 +5,11 @@
 import 'dart:html';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 import 'package:webview_flutter_web/webview_flutter_web.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.mocks.dart b/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.mocks.dart
index 6ea18e5d35e8..065903f93431 100644
--- a/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_web/test/webview_flutter_web_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.3.2 from annotations
+// Mocks generated by Mockito 5.4.0 from annotations
 // in webview_flutter_web/test/webview_flutter_web_test.dart.
 // Do not manually edit this file.
 
@@ -7,8 +7,8 @@ import 'dart:async' as _i6;
 import 'dart:html' as _i2;
 import 'dart:math' as _i3;
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' as _i4;
 import 'package:flutter/foundation.dart' as _i5;
+import 'package:flutter/material.dart' as _i4;
 import 'package:flutter/src/widgets/notification_listener.dart' as _i7;
 import 'package:mockito/mockito.dart' as _i1;
 import 'package:webview_flutter_platform_interface/src/types/types.dart' as _i8;
@@ -2117,6 +2117,11 @@ class MockBuildContext extends _i1.Mock implements _i4.BuildContext {
         ),
       ) as _i4.Widget);
   @override
+  bool get mounted => (super.noSuchMethod(
+        Invocation.getter(#mounted),
+        returnValue: false,
+      ) as bool);
+  @override
   bool get debugDoingBuild => (super.noSuchMethod(
         Invocation.getter(#debugDoingBuild),
         returnValue: false,
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md b/packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md
index 833bd035b9b1..962e5898d1ba 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md
+++ b/packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 5.12.0
+
+- enh: DEV-156308 Convert flutter_platform out of a monorepo
+
 # 5.11.0
 
 - enh: DEV-148888 Drop Android 8 Support
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart
index e62d36803c1f..cc4d99c6016c 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart
@@ -5,10 +5,12 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 import 'package:webview_flutter_wkwebview_example/navigation_decision.dart';
 import 'package:webview_flutter_wkwebview_example/navigation_request.dart';
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart
index 9a9e781096f8..18f7035b02f5 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart
@@ -5,7 +5,9 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
+import 'package:path_provider/path_provider.dart';
+
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 import 'navigation_decision.dart';
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart b/packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart
index 578a646ffb0c..a61bcc039a29 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/example/lib/web_view.dart
@@ -5,7 +5,9 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
 
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml
index 6fa4aadf7cf7..d23b0ed902a0 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml
@@ -7,10 +7,6 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
 
@@ -25,10 +21,6 @@ dependencies:
     path: ../
 
 dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-      
   espresso: ^0.1.0+2
   flutter_driver:
     sdk: flutter
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation.dart
index 99887eabe3fd..78d083ffedd8 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/foundation/foundation.dart
@@ -4,7 +4,7 @@
 
 import 'dart:typed_data';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
 
 /// A URL load request that is independent of protocol or URL scheme.
 ///
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit.dart
index 245726ce31a4..9e1f883a31fe 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit/web_kit.dart
@@ -1,9 +1,9 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
+import 'package:flutter/material.dart';
+
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 import '../foundation/foundation.dart';
 
 /// Times at which to inject script content into a webpage.
@@ -214,8 +214,7 @@ class WKWebViewConfiguration {
   // TODO(bparrishMines): Remove ignore once constructor is implemented.
   // ignore: avoid_unused_constructor_parameters
   WKWebViewConfiguration._fromWebView(WKWebView webView) {
-    userContentController =
-        WKUserContentController._fromWebViewConfiguretion(this);
+    userContentController = WKUserContentController._fromWebViewConfiguretion(this);
   }
 
   /// Coordinates interactions between your app’s code and the webpage’s scripts and other content.
@@ -282,8 +281,7 @@ class WKWebView {
   ///
   /// If you didn’t create your web view with a [WKWebViewConfiguration] this
   /// property contains a default configuration object.
-  late final WKWebViewConfiguration configuration =
-      WKWebViewConfiguration._fromWebView(this);
+  late final WKWebViewConfiguration configuration = WKWebViewConfiguration._fromWebView(this);
 
   /// Used to integrate custom user interface elements into web view interactions.
   set uiDelegate(WKUIDelegate delegate) {
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart
index 03a40c4442f6..85137ff0729e 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/web_kit_webview_widget.dart
@@ -4,7 +4,7 @@
 
 import 'dart:async';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/material.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 import 'web_kit/web_kit.dart';
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webview_cupertino.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webview_cupertino.dart
index f6ef9cce3d68..efb547157f86 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webview_cupertino.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webview_cupertino.dart
@@ -4,7 +4,10 @@
 
 import 'dart:async';
 
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 /// Builds an iOS webview.
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml b/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml
index 13b78325d644..9f09c059cfc2 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml
+++ b/packages/webview_flutter/webview_flutter_wkwebview/pubspec.yaml
@@ -2,7 +2,7 @@ name: webview_flutter_wkwebview
 description: A Flutter plugin that provides a WebView widget based on Apple's WKWebView control.
 repository: https://github.com/Alkami/plugins/tree/main/packages/webview_flutter
 publish_to: https://dart.cloudsmith.io/alkami/flutter/
-version: 5.11.0 # original version was 2.7.1 when this was forked
+version: 5.12.0 # original version was 2.7.1 when this was forked
 
 environment:
   sdk: ">=2.18.0 <3.0.0" # dart version
@@ -16,22 +16,14 @@ flutter:
         pluginClass: FLTWebViewFlutterPlugin
 
 dependencies:
-  alkami_core_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-
   flutter:
     sdk: flutter
-  # FOR TESTING ONLY. DO NOT MERGE.
+
   webview_flutter_platform_interface: 
     hosted: https://dart.cloudsmith.io/alkami/flutter/
     version: ^5.0.0
 
-dev_dependencies:
-  alkami_core_dev_dependencies: 
-    hosted: https://dart.cloudsmith.io/alkami/flutter/
-    version: ^3.0.0
-      
+dev_dependencies:      
   build_runner: ^2.1.5
   flutter_driver:
     sdk: flutter
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.dart
index f9212e66e641..8c3321dd1e7b 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/web_kit_webview_widget_test.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
-
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
 import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 import 'package:webview_flutter_wkwebview/src/foundation/foundation.dart';
 import 'package:webview_flutter_wkwebview/src/web_kit/web_kit.dart';
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/src/wkwebview_cookie_manager_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/src/wkwebview_cookie_manager_test.dart
index e2c87631b23d..5709d25f9886 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/test/src/wkwebview_cookie_manager_test.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/test/src/wkwebview_cookie_manager_test.dart
@@ -1,5 +1,5 @@
-import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
-import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.