diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 8236f57..f76e8b0 100644
--- a/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,8 +5,10 @@
 import FlutterMacOS
 import Foundation
 
+import flutter_inappwebview_macos
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
 }
diff --git a/example/pubspec.lock b/example/pubspec.lock
index 1fc6ca3..65e71f5 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -5,42 +5,42 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.1"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,10 +66,66 @@ packages:
     dependency: transitive
     description:
       name: flutter_inappwebview
-      sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350
+      sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.5"
+  flutter_inappwebview_android:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_android
+      sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.3"
+  flutter_inappwebview_internal_annotations:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_internal_annotations
+      sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
+  flutter_inappwebview_ios:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_ios
+      sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  flutter_inappwebview_macos:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_macos
+      sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  flutter_inappwebview_platform_interface:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_platform_interface
+      sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0+1"
+  flutter_inappwebview_web:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_web
+      sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0"
+    version: "1.1.2"
+  flutter_inappwebview_windows:
+    dependency: transitive
+    description:
+      name: flutter_inappwebview_windows
+      sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -92,18 +148,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.8"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.9"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -124,10 +180,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16+1"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
@@ -140,10 +196,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   nested:
     dependency: transitive
     description:
@@ -156,10 +212,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -182,60 +238,60 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.4+6"
+    version: "0.0.4+7"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.4"
   url_launcher:
     dependency: transitive
     description:
@@ -312,10 +368,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.1"
   web:
     dependency: transitive
     description:
@@ -325,5 +381,5 @@ packages:
     source: hosted
     version: "1.0.0"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.7.0-0 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc
index 4f78848..f201e2b 100644
--- a/example/windows/flutter/generated_plugin_registrant.cc
+++ b/example/windows/flutter/generated_plugin_registrant.cc
@@ -6,9 +6,12 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <flutter_inappwebview_windows/flutter_inappwebview_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  FlutterInappwebviewWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FlutterInappwebviewWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake
index 88b22e5..28a039d 100644
--- a/example/windows/flutter/generated_plugins.cmake
+++ b/example/windows/flutter/generated_plugins.cmake
@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  flutter_inappwebview_windows
   url_launcher_windows
 )
 
diff --git a/lib/new/webViewOne.dart b/lib/new/webViewOne.dart
index ab702cd..e8fbc20 100644
--- a/lib/new/webViewOne.dart
+++ b/lib/new/webViewOne.dart
@@ -67,90 +67,92 @@ class _WebViewOneState extends State<WebViewOne> {
           return false;
         },
         child: SafeArea(
-          top: true,
+            top: true,
             child: Column(children: <Widget>[
-          WillPopScope(
-            onWillPop: () async {
-              webViewController!.goBack();
-              return false;
-            },
-            child: Expanded(
-              child: Stack(
-                children: [
-                  InAppWebView(
-                    key: webViewKey,
-                    gestureRecognizers:
-                        [Factory(() => EagerGestureRecognizer())].toSet(),
-                    initialUrlRequest: URLRequest(
-                        url: createUri(widget.payload, webViewState)),
-                    initialOptions: options,
-                    onWebViewCreated: (controller) {
-                      webViewController = controller;
-                      webViewState.setControllerOne(controller);
-                      controller.addJavaScriptHandler(
-                          handlerName: 'success',
-                          callback: (_) {
-                            webViewState.setResponse(_);
-                            if (webViewState.reportLink == "about:blank") {
-                              if (_[0].toString().contains('code')) {
-                                widget.onSuccess(jsonDecode(_[0]));
-                              } else {
-                                webViewState.setUrl(_[0]
-                                    .toString()
-                                    .substring(1, _[0].length - 1));
-                                webViewState.switchView(false);
+              WillPopScope(
+                onWillPop: () async {
+                  webViewController!.goBack();
+                  return false;
+                },
+                child: Expanded(
+                  child: Stack(
+                    children: [
+                      InAppWebView(
+                        key: webViewKey,
+                        gestureRecognizers:
+                            [Factory(() => EagerGestureRecognizer())].toSet(),
+                        initialUrlRequest: URLRequest(
+                            url: WebUri(createUri(widget.payload, webViewState)
+                                .toString())),
+                        initialOptions: options,
+                        onWebViewCreated: (controller) {
+                          webViewController = controller;
+                          webViewState.setControllerOne(controller);
+                          controller.addJavaScriptHandler(
+                              handlerName: 'success',
+                              callback: (_) {
+                                webViewState.setResponse(_);
+                                if (webViewState.reportLink == "about:blank") {
+                                  if (_[0].toString().contains('code')) {
+                                    widget.onSuccess(jsonDecode(_[0]));
+                                  } else {
+                                    webViewState.setUrl(_[0]
+                                        .toString()
+                                        .substring(1, _[0].length - 1));
+                                    webViewState.switchView(false);
 
-                                webViewState.controller!.loadUrl(
-                                    urlRequest: URLRequest(
-                                        url: Uri.parse(
-                                            webViewState.currentUrl)));
-                              }
-                            } else {
-                              widget.onSuccess(jsonDecode(_[0]));
-                              if (widget.payload.closeOnSuccess ?? false) {
+                                    webViewState.controller!.loadUrl(
+                                        urlRequest: URLRequest(
+                                            url: WebUri(
+                                                webViewState.currentUrl)));
+                                  }
+                                } else {
+                                  widget.onSuccess(jsonDecode(_[0]));
+                                  if (widget.payload.closeOnSuccess ?? false) {
+                                    Navigator.pop(context);
+                                  }
+                                }
+                              });
+                          controller.addJavaScriptHandler(
+                              handlerName: 'failure',
+                              callback: (_) {
+                                widget.onCancel(jsonDecode(_[0]));
                                 Navigator.pop(context);
-                              }
-                            }
+                                // Navigator.pop(context);
+                              });
+                        },
+                        onLoadStart: (controller, url) {
+                          webViewState.setProgress(true);
+                        },
+                        onLoadStop: (controller, url) async {
+                          webViewState.setProgress(false);
+                        },
+                        onLoadError: (controller, url, code, message) {
+                          webViewState.setProgress(false);
+                          Navigator.pop(context);
+                        },
+                        onProgressChanged: (controller, progress) {
+                          setState(() {
+                            this.progress = progress / 100;
+                            urlController.text = this.url;
                           });
-                      controller.addJavaScriptHandler(
-                          handlerName: 'failure',
-                          callback: (_) {
-                            widget.onCancel(jsonDecode(_[0]));
-                            Navigator.pop(context);
-                            // Navigator.pop(context);
+                        },
+                        onUpdateVisitedHistory:
+                            (controller, url, androidIsReload) {
+                          setState(() {
+                            this.url = url.toString();
+                            urlController.text = this.url;
                           });
-                    },
-                    onLoadStart: (controller, url) {
-                      webViewState.setProgress(true);
-                    },
-                    onLoadStop: (controller, url) async {
-                      webViewState.setProgress(false);
-                    },
-                    onLoadError: (controller, url, code, message) {
-                      webViewState.setProgress(false);
-                      Navigator.pop(context);
-                    },
-                    onProgressChanged: (controller, progress) {
-                      setState(() {
-                        this.progress = progress / 100;
-                        urlController.text = this.url;
-                      });
-                    },
-                    onUpdateVisitedHistory: (controller, url, androidIsReload) {
-                      setState(() {
-                        this.url = url.toString();
-                        urlController.text = this.url;
-                      });
-                      webViewState.setReportLink('about:blank');
-                    },
+                          webViewState.setReportLink('about:blank');
+                        },
+                      ),
+                      progress < 1.0
+                          ? LinearProgressIndicator(value: progress)
+                          : Container(),
+                    ],
                   ),
-                  progress < 1.0
-                      ? LinearProgressIndicator(value: progress)
-                      : Container(),
-                ],
+                ),
               ),
-            ),
-          ),
-        ])));
+            ])));
   }
 }
diff --git a/lib/new/webViewTwo.dart b/lib/new/webViewTwo.dart
index 1319704..1b11e91 100644
--- a/lib/new/webViewTwo.dart
+++ b/lib/new/webViewTwo.dart
@@ -60,7 +60,7 @@ class _WebViewTwoState extends State<WebViewTwo> {
                 children: [
                   InAppWebView(
                     initialUrlRequest:
-                        URLRequest(url: Uri.parse(webViewState.currentUrl)),
+                        URLRequest(url: WebUri(webViewState.currentUrl)),
                     initialOptions: options,
                     gestureRecognizers:
                         [Factory(() => EagerGestureRecognizer())].toSet(),
@@ -87,7 +87,9 @@ class _WebViewTwoState extends State<WebViewTwo> {
 
                         webViewState.controllerOne!.loadUrl(
                             urlRequest: URLRequest(
-                                url: createUri(widget.payload, webViewState)));
+                                url: WebUri(
+                                    createUri(widget.payload, webViewState)
+                                        .toString())));
 
                         ///FIXME:
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 9fef0da..5cbe4fe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_inappwebview: ^5.3.2
+  flutter_inappwebview: ^6.1.5
   url_launcher: ^6.0.10
   provider: ^6.0.2