From bb973b297b3f9864703cf72b45d9b5dae9aadeea Mon Sep 17 00:00:00 2001
From: Dillon Nys <24740863+dnys1@users.noreply.github.com>
Date: Tue, 29 Aug 2023 08:51:17 -0700
Subject: [PATCH] chore(repo): Bump pigeon to `^11.0.0` (#3642)

---
 .../pigeons/NativePluginBindings.kt           | 14 ++++-----
 .../pigeons/NativePluginBindings.swift        | 18 ++++++-----
 .../lib/src/native_plugin.g.dart              | 24 +++++++++------
 packages/amplify_datastore/pubspec.yaml       |  2 +-
 .../LegacyNativePluginPigeon.java             |  8 ++---
 .../Pigeons/AmplifyNativeLegacyPlugin.swift   | 12 +++++---
 .../lib/amplify_native_legacy_plugin.g.dart   | 11 ++++---
 .../pubspec.yaml                              |  2 +-
 .../amplify_analytics_pinpoint/Messages.java  |  4 +--
 ...pigeon_legacy_data_provider.android.g.dart |  5 ++--
 .../amplify_analytics_pinpoint/pubspec.yaml   |  2 +-
 .../pigeons/NativeAuthPluginBindingsPigeon.kt | 18 +++++------
 .../darwin/Classes/pigeons/messages.g.swift   | 28 +++++++++--------
 .../lib/src/native_auth_plugin.g.dart         | 30 ++++++++++++-------
 .../auth/amplify_auth_cognito/pubspec.yaml    |  2 +-
 .../PushNotificationsHostApiBindings.java     |  4 +--
 .../Classes/PushNotificationsNativePlugin.h   |  8 ++++-
 .../Classes/PushNotificationsNativePlugin.m   | 12 +++++++-
 .../native_push_notifications_plugin.g.dart   |  2 +-
 .../amplify_push_notifications/pubspec.yaml   |  2 +-
 .../pigeons/AmplifySecureStoragePigeon.kt     | 10 +++----
 .../pigeons/NSUserDefaultsPigeon.swift        | 10 +++++--
 .../amplify_secure_storage_pigeon.g.dart      | 14 +++++----
 .../pigeons/ns_user_defaults_pigeon.g.dart    |  8 +++--
 .../pigeons/NSUserDefaultsPigeon.swift        | 10 +++++--
 .../amplify_secure_storage/pubspec.yaml       |  2 +-
 pubspec.yaml                                  |  2 +-
 27 files changed, 162 insertions(+), 102 deletions(-)

diff --git a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt
index 19aa2fa76a..ccf949889f 100644
--- a/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt
+++ b/packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/pigeons/NativePluginBindings.kt
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_datastore.pigeons
@@ -207,7 +207,7 @@ class NativeAuthPlugin(private val binaryMessenger: BinaryMessenger) {
     }
   }
   fun fetchAuthSession(callback: (NativeAuthSession) -> Unit) {
-    val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthPlugin.fetchAuthSession", codec)
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession", codec)
     channel.send(null) {
       val result = it as NativeAuthSession
       callback(result)
@@ -224,7 +224,7 @@ class NativeApiPlugin(private val binaryMessenger: BinaryMessenger) {
     }
   }
   fun getLatestAuthToken(providerNameArg: String, callback: (String?) -> Unit) {
-    val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeApiPlugin.getLatestAuthToken", codec)
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken", codec)
     channel.send(listOf(providerNameArg)) {
       val result = it as String?
       callback(result)
@@ -244,7 +244,7 @@ interface NativeAmplifyBridge {
     @Suppress("UNCHECKED_CAST")
     fun setUp(binaryMessenger: BinaryMessenger, api: NativeAmplifyBridge?) {
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAmplifyBridge.configure", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -303,7 +303,7 @@ interface NativeAuthBridge {
     @Suppress("UNCHECKED_CAST")
     fun setUp(binaryMessenger: BinaryMessenger, api: NativeAuthBridge?) {
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.addAuthPlugin", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin", codec)
         if (api != null) {
           channel.setMessageHandler { _, reply ->
             api.addAuthPlugin() { result: Result<Unit> ->
@@ -320,7 +320,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.updateCurrentUser", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -354,7 +354,7 @@ interface NativeApiBridge {
     @Suppress("UNCHECKED_CAST")
     fun setUp(binaryMessenger: BinaryMessenger, api: NativeApiBridge?) {
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeApiBridge.addApiPlugin", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
diff --git a/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift b/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift
index 324a7261dc..94d8936d1d 100644
--- a/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift
+++ b/packages/amplify_datastore/ios/Classes/pigeons/NativePluginBindings.swift
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -13,6 +13,10 @@ import FlutterMacOS
 #error("Unsupported platform.")
 #endif
 
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
 private func wrapResult(_ result: Any?) -> [Any?] {
   return [result]
 }
@@ -211,7 +215,7 @@ class NativeAuthPlugin {
     return NativeAuthPluginCodec.shared
   }
   func fetchAuthSession(completion: @escaping (NativeAuthSession) -> Void) {
-    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthPlugin.fetchAuthSession", binaryMessenger: binaryMessenger, codec: codec)
+    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession", binaryMessenger: binaryMessenger, codec: codec)
     channel.sendMessage(nil) { response in
       let result = response as! NativeAuthSession
       completion(result)
@@ -225,7 +229,7 @@ class NativeApiPlugin {
     self.binaryMessenger = binaryMessenger
   }
   func getLatestAuthToken(providerName providerNameArg: String, completion: @escaping (String?) -> Void) {
-    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeApiPlugin.getLatestAuthToken", binaryMessenger: binaryMessenger)
+    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken", binaryMessenger: binaryMessenger)
     channel.sendMessage([providerNameArg] as [Any?]) { response in
       let result: String? = nilOrValue(response)
       completion(result)
@@ -242,7 +246,7 @@ class NativeAmplifyBridgeSetup {
   /// The codec used by NativeAmplifyBridge.
   /// Sets up an instance of `NativeAmplifyBridge` to handle messages through the `binaryMessenger`.
   static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAmplifyBridge?) {
-    let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAmplifyBridge.configure", binaryMessenger: binaryMessenger)
+    let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure", binaryMessenger: binaryMessenger)
     if let api = api {
       configureChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -310,7 +314,7 @@ class NativeAuthBridgeSetup {
   static var codec: FlutterStandardMessageCodec { NativeAuthBridgeCodec.shared }
   /// Sets up an instance of `NativeAuthBridge` to handle messages through the `binaryMessenger`.
   static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeAuthBridge?) {
-    let addAuthPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.addAuthPlugin", binaryMessenger: binaryMessenger, codec: codec)
+    let addAuthPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       addAuthPluginChannel.setMessageHandler { _, reply in
         api.addAuthPlugin() { result in
@@ -325,7 +329,7 @@ class NativeAuthBridgeSetup {
     } else {
       addAuthPluginChannel.setMessageHandler(nil)
     }
-    let updateCurrentUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.updateCurrentUser", binaryMessenger: binaryMessenger, codec: codec)
+    let updateCurrentUserChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       updateCurrentUserChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -352,7 +356,7 @@ class NativeApiBridgeSetup {
   /// The codec used by NativeApiBridge.
   /// Sets up an instance of `NativeApiBridge` to handle messages through the `binaryMessenger`.
   static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NativeApiBridge?) {
-    let addApiPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeApiBridge.addApiPlugin", binaryMessenger: binaryMessenger)
+    let addApiPluginChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin", binaryMessenger: binaryMessenger)
     if let api = api {
       addApiPluginChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
diff --git a/packages/amplify_datastore/lib/src/native_plugin.g.dart b/packages/amplify_datastore/lib/src/native_plugin.g.dart
index aceade84bb..d4116ddb6b 100644
--- a/packages/amplify_datastore/lib/src/native_plugin.g.dart
+++ b/packages/amplify_datastore/lib/src/native_plugin.g.dart
@@ -1,7 +1,7 @@
 //
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
@@ -190,7 +190,8 @@ abstract class NativeAuthPlugin {
   static void setup(NativeAuthPlugin? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.NativeAuthPlugin.fetchAuthSession', codec,
+          'dev.flutter.pigeon.amplify_datastore.NativeAuthPlugin.fetchAuthSession',
+          codec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
@@ -213,18 +214,19 @@ abstract class NativeApiPlugin {
   static void setup(NativeApiPlugin? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.NativeApiPlugin.getLatestAuthToken', codec,
+          'dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken',
+          codec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.NativeApiPlugin.getLatestAuthToken was null.');
+              'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final String? arg_providerName = (args[0] as String?);
           assert(arg_providerName != null,
-              'Argument for dev.flutter.pigeon.NativeApiPlugin.getLatestAuthToken was null, expected non-null String.');
+              'Argument for dev.flutter.pigeon.amplify_datastore.NativeApiPlugin.getLatestAuthToken was null, expected non-null String.');
           final String? output =
               await api.getLatestAuthToken(arg_providerName!);
           return output;
@@ -246,7 +248,8 @@ class NativeAmplifyBridge {
 
   Future<void> configure(String arg_version, String arg_config) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAmplifyBridge.configure', codec,
+        'dev.flutter.pigeon.amplify_datastore.NativeAmplifyBridge.configure',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel
         .send(<Object?>[arg_version, arg_config]) as List<Object?>?;
@@ -302,7 +305,8 @@ class NativeAuthBridge {
 
   Future<void> addAuthPlugin() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.addAuthPlugin', codec,
+        'dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.addAuthPlugin',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
     if (replyList == null) {
@@ -323,7 +327,8 @@ class NativeAuthBridge {
 
   Future<void> updateCurrentUser(NativeAuthUser? arg_user) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.updateCurrentUser', codec,
+        'dev.flutter.pigeon.amplify_datastore.NativeAuthBridge.updateCurrentUser',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_user]) as List<Object?>?;
@@ -356,7 +361,8 @@ class NativeApiBridge {
 
   Future<void> addApiPlugin(List<String?> arg_authProvidersList) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeApiBridge.addApiPlugin', codec,
+        'dev.flutter.pigeon.amplify_datastore.NativeApiBridge.addApiPlugin',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_authProvidersList]) as List<Object?>?;
diff --git a/packages/amplify_datastore/pubspec.yaml b/packages/amplify_datastore/pubspec.yaml
index 4bd91c8434..d9b2ba08b1 100644
--- a/packages/amplify_datastore/pubspec.yaml
+++ b/packages/amplify_datastore/pubspec.yaml
@@ -25,7 +25,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   fake_async: ^1.2.0
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
 
 # The following section is specific to Flutter.
 flutter:
diff --git a/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/LegacyNativePluginPigeon.java b/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/LegacyNativePluginPigeon.java
index f7f53cbe3d..96c2f20684 100644
--- a/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/LegacyNativePluginPigeon.java
+++ b/packages/amplify_native_legacy_wrapper/android/src/main/kotlin/com/amazonaws/amplify/amplify_native_legacy_wrapper/LegacyNativePluginPigeon.java
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_native_legacy_wrapper;
@@ -84,7 +84,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable LegacyNati
       {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.LegacyNativePlugin.configure", getCodec());
+                binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure", getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
@@ -113,7 +113,7 @@ public void error(Throwable error) {
       {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.LegacyNativePlugin.signOut", getCodec());
+                binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut", getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
@@ -140,7 +140,7 @@ public void error(Throwable error) {
       {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.LegacyNativePlugin.signIn", getCodec());
+                binaryMessenger, "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn", getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
diff --git a/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift b/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift
index e4832cf9b5..bbca6c2663 100644
--- a/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift
+++ b/packages/amplify_native_legacy_wrapper/ios/Classes/Pigeons/AmplifyNativeLegacyPlugin.swift
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -13,6 +13,10 @@ import FlutterMacOS
 #error("Unsupported platform.")
 #endif
 
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
 private func wrapResult(_ result: Any?) -> [Any?] {
   return [result]
 }
@@ -49,7 +53,7 @@ class LegacyNativePluginSetup {
   /// The codec used by LegacyNativePlugin.
   /// Sets up an instance of `LegacyNativePlugin` to handle messages through the `binaryMessenger`.
   static func setUp(binaryMessenger: FlutterBinaryMessenger, api: LegacyNativePlugin?) {
-    let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.LegacyNativePlugin.configure", binaryMessenger: binaryMessenger)
+    let configureChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure", binaryMessenger: binaryMessenger)
     if let api = api {
       configureChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -66,7 +70,7 @@ class LegacyNativePluginSetup {
     } else {
       configureChannel.setMessageHandler(nil)
     }
-    let signOutChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.LegacyNativePlugin.signOut", binaryMessenger: binaryMessenger)
+    let signOutChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut", binaryMessenger: binaryMessenger)
     if let api = api {
       signOutChannel.setMessageHandler { _, reply in
         api.signOut() { result in
@@ -81,7 +85,7 @@ class LegacyNativePluginSetup {
     } else {
       signOutChannel.setMessageHandler(nil)
     }
-    let signInChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.LegacyNativePlugin.signIn", binaryMessenger: binaryMessenger)
+    let signInChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn", binaryMessenger: binaryMessenger)
     if let api = api {
       signInChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
diff --git a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart
index 09f41a1862..2d3c5e5ca0 100644
--- a/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart
+++ b/packages/amplify_native_legacy_wrapper/lib/amplify_native_legacy_plugin.g.dart
@@ -1,7 +1,7 @@
 //
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
@@ -23,7 +23,8 @@ class LegacyNativePlugin {
 
   Future<void> configure(String arg_config) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.LegacyNativePlugin.configure', codec,
+        'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.configure',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_config]) as List<Object?>?;
@@ -45,7 +46,8 @@ class LegacyNativePlugin {
 
   Future<void> signOut() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.LegacyNativePlugin.signOut', codec,
+        'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signOut',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
     if (replyList == null) {
@@ -66,7 +68,8 @@ class LegacyNativePlugin {
 
   Future<void> signIn(String arg_username, String arg_password) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.LegacyNativePlugin.signIn', codec,
+        'dev.flutter.pigeon.amplify_native_legacy_wrapper.LegacyNativePlugin.signIn',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel
         .send(<Object?>[arg_username, arg_password]) as List<Object?>?;
diff --git a/packages/amplify_native_legacy_wrapper/pubspec.yaml b/packages/amplify_native_legacy_wrapper/pubspec.yaml
index aa77174df4..60ae63baf5 100644
--- a/packages/amplify_native_legacy_wrapper/pubspec.yaml
+++ b/packages/amplify_native_legacy_wrapper/pubspec.yaml
@@ -15,7 +15,7 @@ dev_dependencies:
   amplify_lints: ">=2.0.2 <2.1.0"
   flutter_test:
     sdk: flutter
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
 
 flutter:
   plugin:
diff --git a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java
index 3c574b0cde..b237532d82 100644
--- a/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java
+++ b/packages/analytics/amplify_analytics_pinpoint/android/src/main/java/com/amazonaws/amplify/amplify_analytics_pinpoint/Messages.java
@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_analytics_pinpoint;
@@ -79,7 +79,7 @@ static void setup(@NonNull BinaryMessenger binaryMessenger, @Nullable PigeonLega
       {
         BasicMessageChannel<Object> channel =
             new BasicMessageChannel<>(
-                binaryMessenger, "dev.flutter.pigeon.PigeonLegacyDataProvider.getEndpointId", getCodec());
+                binaryMessenger, "dev.flutter.pigeon.amplify_analytics_pinpoint.PigeonLegacyDataProvider.getEndpointId", getCodec());
         if (api != null) {
           channel.setMessageHandler(
               (message, reply) -> {
diff --git a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
index 8367a73d50..8d0fcb92e3 100644
--- a/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
+++ b/packages/analytics/amplify_analytics_pinpoint/lib/src/legacy_native_data_provider/pigeon_legacy_data_provider.android.g.dart
@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
@@ -22,7 +22,8 @@ class PigeonLegacyDataProvider {
 
   Future<String?> getEndpointId(String arg_pinpointAppId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.PigeonLegacyDataProvider.getEndpointId', codec,
+        'dev.flutter.pigeon.amplify_analytics_pinpoint.PigeonLegacyDataProvider.getEndpointId',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_pinpointAppId]) as List<Object?>?;
diff --git a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
index 255853fd15..6ec575b6a4 100644
--- a/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
+++ b/packages/analytics/amplify_analytics_pinpoint/pubspec.yaml
@@ -35,7 +35,7 @@ dev_dependencies:
   amplify_lints: ">=3.0.0 <3.1.0"
   flutter_test:
     sdk: flutter
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
 
 flutter:
   plugin:
diff --git a/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt b/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt
index 8127dd91c8..f76163165a 100644
--- a/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt
+++ b/packages/auth/amplify_auth_cognito/android/src/main/kotlin/com/amazonaws/amplify/amplify_auth_cognito/pigeons/NativeAuthPluginBindingsPigeon.kt
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_auth_cognito
@@ -144,7 +144,7 @@ class NativeAuthPlugin(private val binaryMessenger: BinaryMessenger) {
    * intent was launched with the redirect parameters (Android).
    */
   fun exchange(paramsArg: Map<String, String>, callback: () -> Unit) {
-    val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthPlugin.exchange", codec)
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange", codec)
     channel.send(listOf(paramsArg)) {
       callback()
     }
@@ -215,7 +215,7 @@ interface NativeAuthBridge {
     @Suppress("UNCHECKED_CAST")
     fun setUp(binaryMessenger: BinaryMessenger, api: NativeAuthBridge?) {
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.signInWithUrl", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -238,7 +238,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.signOutWithUrl", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -260,7 +260,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.getValidationData", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData", codec)
         if (api != null) {
           channel.setMessageHandler { _, reply ->
             var wrapped: List<Any?>
@@ -276,7 +276,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.getContextData", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData", codec)
         if (api != null) {
           channel.setMessageHandler { _, reply ->
             var wrapped: List<Any?>
@@ -292,7 +292,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.getBundleId", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId", codec)
         if (api != null) {
           channel.setMessageHandler { _, reply ->
             var wrapped: List<Any?>
@@ -308,7 +308,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.getLegacyCredentials", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials", codec)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -329,7 +329,7 @@ interface NativeAuthBridge {
         }
       }
       run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.NativeAuthBridge.clearLegacyCredentials", codec)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials", codec)
         if (api != null) {
           channel.setMessageHandler { _, reply ->
             api.clearLegacyCredentials() { result: Result<Unit> ->
diff --git a/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift b/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift
index 89ac91f31e..0ce21750f6 100644
--- a/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift
+++ b/packages/auth/amplify_auth_cognito/darwin/Classes/pigeons/messages.g.swift
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -13,6 +13,10 @@ import FlutterMacOS
 #error("Unsupported platform.")
 #endif
 
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
 private func wrapResult(_ result: Any?) -> [Any?] {
   return [result]
 }
@@ -57,8 +61,8 @@ struct NativeUserContextData {
     let applicationVersion: String? = nilOrValue(list[4])
     let deviceLanguage: String? = nilOrValue(list[5])
     let deviceOsReleaseVersion: String? = nilOrValue(list[6])
-    let screenHeightPixels: Int64? = list[7] is NSNull ? nil : (list[7] is Int64? ? list[7] as! Int64? : Int64(list[7] as! Int32))
-    let screenWidthPixels: Int64? = list[8] is NSNull ? nil : (list[8] is Int64? ? list[8] as! Int64? : Int64(list[8] as! Int32))
+    let screenHeightPixels: Int64? = isNullish(list[7]) ? nil : (list[7] is Int64? ? list[7] as! Int64? : Int64(list[7] as! Int32))
+    let screenWidthPixels: Int64? = isNullish(list[8]) ? nil : (list[8] is Int64? ? list[8] as! Int64? : Int64(list[8] as! Int32))
 
     return NativeUserContextData(
       deviceName: deviceName,
@@ -103,7 +107,7 @@ struct LegacyCredentialStoreData {
     let accessKeyId: String? = nilOrValue(list[1])
     let secretAccessKey: String? = nilOrValue(list[2])
     let sessionToken: String? = nilOrValue(list[3])
-    let expirationMsSinceEpoch: Int64? = list[4] is NSNull ? nil : (list[4] is Int64? ? list[4] as! Int64? : Int64(list[4] as! Int32))
+    let expirationMsSinceEpoch: Int64? = isNullish(list[4]) ? nil : (list[4] is Int64? ? list[4] as! Int64? : Int64(list[4] as! Int32))
     let accessToken: String? = nilOrValue(list[5])
     let refreshToken: String? = nilOrValue(list[6])
     let idToken: String? = nilOrValue(list[7])
@@ -143,7 +147,7 @@ class NativeAuthPlugin {
   /// was closed and a redirect happened to the custom URI scheme (iOS) or an
   /// intent was launched with the redirect parameters (Android).
   func exchange(params paramsArg: [String: String], completion: @escaping () -> Void) {
-    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthPlugin.exchange", binaryMessenger: binaryMessenger)
+    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange", binaryMessenger: binaryMessenger)
     channel.sendMessage([paramsArg] as [Any?]) { _ in
       completion()
     }
@@ -221,7 +225,7 @@ class NativeAuthBridgeSetup {
     /// [callbackUrlScheme].
     ///
     /// If [preferPrivateSession] is `true`, do not persist session cookies.
-    let signInWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.signInWithUrl", binaryMessenger: binaryMessenger, codec: codec)
+    let signInWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       signInWithUrlChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -243,7 +247,7 @@ class NativeAuthBridgeSetup {
     }
     /// Sign out by presenting [url] and waiting for a response to a URL with
     /// [callbackUrlScheme].
-    let signOutWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.signOutWithUrl", binaryMessenger: binaryMessenger, codec: codec)
+    let signOutWithUrlChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       signOutWithUrlChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -264,7 +268,7 @@ class NativeAuthBridgeSetup {
       signOutWithUrlChannel.setMessageHandler(nil)
     }
     /// Retrieves the validation data for the current iOS/Android device.
-    let getValidationDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.getValidationData", binaryMessenger: binaryMessenger, codec: codec)
+    let getValidationDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getValidationDataChannel.setMessageHandler { _, reply in
         do {
@@ -278,7 +282,7 @@ class NativeAuthBridgeSetup {
       getValidationDataChannel.setMessageHandler(nil)
     }
     /// Retrieves context data as required for advanced security features (ASF).
-    let getContextDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.getContextData", binaryMessenger: binaryMessenger, codec: codec)
+    let getContextDataChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getContextDataChannel.setMessageHandler { _, reply in
         do {
@@ -291,7 +295,7 @@ class NativeAuthBridgeSetup {
     } else {
       getContextDataChannel.setMessageHandler(nil)
     }
-    let getBundleIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.getBundleId", binaryMessenger: binaryMessenger, codec: codec)
+    let getBundleIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getBundleIdChannel.setMessageHandler { _, reply in
         do {
@@ -305,7 +309,7 @@ class NativeAuthBridgeSetup {
       getBundleIdChannel.setMessageHandler(nil)
     }
     /// Fetch legacy credentials stored by native SDKs.
-    let getLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.getLegacyCredentials", binaryMessenger: binaryMessenger, codec: codec)
+    let getLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       getLegacyCredentialsChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -324,7 +328,7 @@ class NativeAuthBridgeSetup {
       getLegacyCredentialsChannel.setMessageHandler(nil)
     }
     /// Clears the legacy credential store data.
-    let clearLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NativeAuthBridge.clearLegacyCredentials", binaryMessenger: binaryMessenger, codec: codec)
+    let clearLegacyCredentialsChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       clearLegacyCredentialsChannel.setMessageHandler { _, reply in
         api.clearLegacyCredentials() { result in
diff --git a/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart b/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart
index 924dec1db7..6565384954 100644
--- a/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart
+++ b/packages/auth/amplify_auth_cognito/lib/src/native_auth_plugin.g.dart
@@ -1,7 +1,7 @@
 //
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
@@ -139,19 +139,20 @@ abstract class NativeAuthPlugin {
   static void setup(NativeAuthPlugin? api, {BinaryMessenger? binaryMessenger}) {
     {
       final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-          'dev.flutter.pigeon.NativeAuthPlugin.exchange', codec,
+          'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange',
+          codec,
           binaryMessenger: binaryMessenger);
       if (api == null) {
         channel.setMessageHandler(null);
       } else {
         channel.setMessageHandler((Object? message) async {
           assert(message != null,
-              'Argument for dev.flutter.pigeon.NativeAuthPlugin.exchange was null.');
+              'Argument for dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange was null.');
           final List<Object?> args = (message as List<Object?>?)!;
           final Map<String?, String?>? arg_params =
               (args[0] as Map<Object?, Object?>?)?.cast<String?, String?>();
           assert(arg_params != null,
-              'Argument for dev.flutter.pigeon.NativeAuthPlugin.exchange was null, expected non-null Map<String?, String?>.');
+              'Argument for dev.flutter.pigeon.amplify_auth_cognito.NativeAuthPlugin.exchange was null, expected non-null Map<String?, String?>.');
           api.exchange(arg_params!);
           return;
         });
@@ -208,7 +209,8 @@ class NativeAuthBridge {
       bool arg_preferPrivateSession,
       String? arg_browserPackageName) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.signInWithUrl', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signInWithUrl',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(<Object?>[
       arg_url,
@@ -242,7 +244,8 @@ class NativeAuthBridge {
   Future<void> signOutWithUrl(String arg_url, String arg_callbackUrlScheme,
       bool arg_preferPrivateSession, String? arg_browserPackageName) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.signOutWithUrl', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.signOutWithUrl',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(<Object?>[
       arg_url,
@@ -269,7 +272,8 @@ class NativeAuthBridge {
   /// Retrieves the validation data for the current iOS/Android device.
   Future<Map<String?, String?>> getValidationData() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.getValidationData', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getValidationData',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
     if (replyList == null) {
@@ -296,7 +300,8 @@ class NativeAuthBridge {
   /// Retrieves context data as required for advanced security features (ASF).
   Future<NativeUserContextData> getContextData() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.getContextData', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getContextData',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
     if (replyList == null) {
@@ -322,7 +327,8 @@ class NativeAuthBridge {
 
   Future<String> getBundleId() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.getBundleId', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getBundleId',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
     if (replyList == null) {
@@ -350,7 +356,8 @@ class NativeAuthBridge {
   Future<LegacyCredentialStoreData> getLegacyCredentials(
       String? arg_identityPoolId, String? arg_appClientId) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.getLegacyCredentials', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.getLegacyCredentials',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel
         .send(<Object?>[arg_identityPoolId, arg_appClientId]) as List<Object?>?;
@@ -378,7 +385,8 @@ class NativeAuthBridge {
   /// Clears the legacy credential store data.
   Future<void> clearLegacyCredentials() async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NativeAuthBridge.clearLegacyCredentials', codec,
+        'dev.flutter.pigeon.amplify_auth_cognito.NativeAuthBridge.clearLegacyCredentials',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel.send(null) as List<Object?>?;
     if (replyList == null) {
diff --git a/packages/auth/amplify_auth_cognito/pubspec.yaml b/packages/auth/amplify_auth_cognito/pubspec.yaml
index c9c07ad818..20790eda9b 100644
--- a/packages/auth/amplify_auth_cognito/pubspec.yaml
+++ b/packages/auth/amplify_auth_cognito/pubspec.yaml
@@ -36,7 +36,7 @@ dev_dependencies:
   amplify_lints: ">=3.0.0 <3.1.0"
   flutter_test:
     sdk: flutter
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
 
 flutter:
   plugin:
diff --git a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java
index 0cae2e0921..e39bfea8bb 100644
--- a/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java
+++ b/packages/notifications/push/amplify_push_notifications/android/src/main/kotlin/com/amazonaws/amplify/amplify_push_notifications/PushNotificationsHostApiBindings.java
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.6), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_push_notifications;
@@ -214,7 +214,7 @@ ArrayList<Object> toList() {
     static @NonNull GetPermissionStatusResult fromList(@NonNull ArrayList<Object> list) {
       GetPermissionStatusResult pigeonResult = new GetPermissionStatusResult();
       Object status = list.get(0);
-      pigeonResult.setStatus(status == null ? null : PermissionStatus.values()[(int) status]);
+      pigeonResult.setStatus(PermissionStatus.values()[(int) status]);
       return pigeonResult;
     }
   }
diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h
index 35c55eb833..20fb8b270b 100644
--- a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h
+++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.h
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.6), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import <Foundation/Foundation.h>
@@ -20,6 +20,12 @@ typedef NS_ENUM(NSUInteger, PermissionStatus) {
   PermissionStatusDenied = 3,
 };
 
+/// Wrapper for PermissionStatus to allow for nullability.
+@interface PermissionStatusBox : NSObject
+@property(nonatomic, assign) PermissionStatus value;
+- (instancetype)initWithValue:(PermissionStatus)value;
+@end
+
 @class PermissionsOptions;
 @class GetPermissionStatusResult;
 
diff --git a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m
index 0c93fd1cf6..7222a7f689 100644
--- a/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m
+++ b/packages/notifications/push/amplify_push_notifications/ios/Classes/PushNotificationsNativePlugin.m
@@ -1,7 +1,7 @@
 // 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.6), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 #import "PushNotificationsNativePlugin.h"
@@ -16,6 +16,16 @@
 #error File requires ARC to be enabled.
 #endif
 
+@implementation PermissionStatusBox
+- (instancetype)initWithValue:(PermissionStatus)value {
+  self = [super init];
+  if (self) {
+    _value = value;
+  }
+  return self;
+}
+@end
+
 static NSArray *wrapResult(id result, FlutterError *error) {
   if (error) {
     return @[
diff --git a/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart b/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart
index 85e7a456cd..9893eed5a2 100644
--- a/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart
+++ b/packages/notifications/push/amplify_push_notifications/lib/src/native_push_notifications_plugin.g.dart
@@ -1,7 +1,7 @@
 //
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-// Autogenerated from Pigeon (v10.1.6), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
diff --git a/packages/notifications/push/amplify_push_notifications/pubspec.yaml b/packages/notifications/push/amplify_push_notifications/pubspec.yaml
index 44ff648c36..fb4e4c7136 100644
--- a/packages/notifications/push/amplify_push_notifications/pubspec.yaml
+++ b/packages/notifications/push/amplify_push_notifications/pubspec.yaml
@@ -29,7 +29,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: ^5.0.0
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
   test: ^1.22.1
 
 flutter:
diff --git a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt
index 1aac815ecb..7905f901cc 100644
--- a/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt
+++ b/packages/secure_storage/amplify_secure_storage/android/src/main/kotlin/com/amazonaws/amplify/amplify_secure_storage/pigeons/AmplifySecureStoragePigeon.kt
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 // 
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 package com.amazonaws.amplify.amplify_secure_storage.pigeons
@@ -68,7 +68,7 @@ interface AmplifySecureStoragePigeon {
     fun setUp(binaryMessenger: BinaryMessenger, api: AmplifySecureStoragePigeon?) {
       run {
         val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.AmplifySecureStoragePigeon.read", codec, taskQueue)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.read", codec, taskQueue)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -90,7 +90,7 @@ interface AmplifySecureStoragePigeon {
       }
       run {
         val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.AmplifySecureStoragePigeon.write", codec, taskQueue)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.write", codec, taskQueue)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -112,7 +112,7 @@ interface AmplifySecureStoragePigeon {
       }
       run {
         val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.AmplifySecureStoragePigeon.delete", codec, taskQueue)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.delete", codec, taskQueue)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
@@ -133,7 +133,7 @@ interface AmplifySecureStoragePigeon {
       }
       run {
         val taskQueue = binaryMessenger.makeBackgroundTaskQueue()
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.AmplifySecureStoragePigeon.removeAll", codec, taskQueue)
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.removeAll", codec, taskQueue)
         if (api != null) {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
diff --git a/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift b/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift
index dab12365ce..f546fbe25d 100644
--- a/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift
+++ b/packages/secure_storage/amplify_secure_storage/ios/Classes/pigeons/NSUserDefaultsPigeon.swift
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 // 
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -13,6 +13,10 @@ import FlutterMacOS
 #error("Unsupported platform.")
 #endif
 
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
 private func wrapResult(_ result: Any?) -> [Any?] {
   return [result]
 }
@@ -49,7 +53,7 @@ class NSUserDefaultsPigeonSetup {
   /// The codec used by NSUserDefaultsPigeon.
   /// Sets up an instance of `NSUserDefaultsPigeon` to handle messages through the `binaryMessenger`.
   static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NSUserDefaultsPigeon?) {
-    let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NSUserDefaultsPigeon.setBool", binaryMessenger: binaryMessenger)
+    let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool", binaryMessenger: binaryMessenger)
     if let api = api {
       setBoolChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -65,7 +69,7 @@ class NSUserDefaultsPigeonSetup {
     } else {
       setBoolChannel.setMessageHandler(nil)
     }
-    let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NSUserDefaultsPigeon.boolFor", binaryMessenger: binaryMessenger)
+    let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor", binaryMessenger: binaryMessenger)
     if let api = api {
       boolForChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart
index 278ad2ed97..6d632294bf 100644
--- a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart
+++ b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/amplify_secure_storage_pigeon.g.dart
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
@@ -25,7 +25,8 @@ class AmplifySecureStoragePigeon {
 
   Future<String?> read(String arg_namespace, String arg_key) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.AmplifySecureStoragePigeon.read', codec,
+        'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.read',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_namespace, arg_key]) as List<Object?>?;
@@ -48,7 +49,8 @@ class AmplifySecureStoragePigeon {
   Future<void> write(
       String arg_namespace, String arg_key, String? arg_value) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.AmplifySecureStoragePigeon.write', codec,
+        'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.write',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList = await channel
         .send(<Object?>[arg_namespace, arg_key, arg_value]) as List<Object?>?;
@@ -70,7 +72,8 @@ class AmplifySecureStoragePigeon {
 
   Future<void> delete(String arg_namespace, String arg_key) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.AmplifySecureStoragePigeon.delete', codec,
+        'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.delete',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_namespace, arg_key]) as List<Object?>?;
@@ -92,7 +95,8 @@ class AmplifySecureStoragePigeon {
 
   Future<void> removeAll(String arg_namespace) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.AmplifySecureStoragePigeon.removeAll', codec,
+        'dev.flutter.pigeon.amplify_secure_storage.AmplifySecureStoragePigeon.removeAll',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_namespace]) as List<Object?>?;
diff --git a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart
index 261681352c..94f386adf1 100644
--- a/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart
+++ b/packages/secure_storage/amplify_secure_storage/lib/src/pigeons/ns_user_defaults_pigeon.g.dart
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 //
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), 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, unnecessary_import
 
@@ -24,7 +24,8 @@ class NSUserDefaultsPigeon {
 
   Future<void> setBool(String arg_key, bool arg_value) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NSUserDefaultsPigeon.setBool', codec,
+        'dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_key, arg_value]) as List<Object?>?;
@@ -46,7 +47,8 @@ class NSUserDefaultsPigeon {
 
   Future<bool> boolFor(String arg_key) async {
     final BasicMessageChannel<Object?> channel = BasicMessageChannel<Object?>(
-        'dev.flutter.pigeon.NSUserDefaultsPigeon.boolFor', codec,
+        'dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor',
+        codec,
         binaryMessenger: _binaryMessenger);
     final List<Object?>? replyList =
         await channel.send(<Object?>[arg_key]) as List<Object?>?;
diff --git a/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift b/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift
index dab12365ce..f546fbe25d 100644
--- a/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift
+++ b/packages/secure_storage/amplify_secure_storage/macos/Classes/pigeons/NSUserDefaultsPigeon.swift
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 // 
-// Autogenerated from Pigeon (v10.1.2), do not edit directly.
+// Autogenerated from Pigeon (v11.0.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 
 import Foundation
@@ -13,6 +13,10 @@ import FlutterMacOS
 #error("Unsupported platform.")
 #endif
 
+private func isNullish(_ value: Any?) -> Bool {
+  return value is NSNull || value == nil
+}
+
 private func wrapResult(_ result: Any?) -> [Any?] {
   return [result]
 }
@@ -49,7 +53,7 @@ class NSUserDefaultsPigeonSetup {
   /// The codec used by NSUserDefaultsPigeon.
   /// Sets up an instance of `NSUserDefaultsPigeon` to handle messages through the `binaryMessenger`.
   static func setUp(binaryMessenger: FlutterBinaryMessenger, api: NSUserDefaultsPigeon?) {
-    let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NSUserDefaultsPigeon.setBool", binaryMessenger: binaryMessenger)
+    let setBoolChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.setBool", binaryMessenger: binaryMessenger)
     if let api = api {
       setBoolChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
@@ -65,7 +69,7 @@ class NSUserDefaultsPigeonSetup {
     } else {
       setBoolChannel.setMessageHandler(nil)
     }
-    let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.NSUserDefaultsPigeon.boolFor", binaryMessenger: binaryMessenger)
+    let boolForChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.amplify_secure_storage.NSUserDefaultsPigeon.boolFor", binaryMessenger: binaryMessenger)
     if let api = api {
       boolForChannel.setMessageHandler { message, reply in
         let args = message as! [Any?]
diff --git a/packages/secure_storage/amplify_secure_storage/pubspec.yaml b/packages/secure_storage/amplify_secure_storage/pubspec.yaml
index b72762158e..c555f754ee 100644
--- a/packages/secure_storage/amplify_secure_storage/pubspec.yaml
+++ b/packages/secure_storage/amplify_secure_storage/pubspec.yaml
@@ -24,7 +24,7 @@ dev_dependencies:
   amplify_lints: ">=3.0.0 <3.1.0"
   flutter_test:
     sdk: flutter
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
 
 flutter:
   plugin:
diff --git a/pubspec.yaml b/pubspec.yaml
index 599ff6b9a2..180cf9d8a0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -37,7 +37,7 @@ dependencies:
   mime: ^1.0.0
   oauth2: ^2.0.2
   package_info_plus: ^4.0.1
-  pigeon: ^10.1.2
+  pigeon: ^11.0.0
   sqlite3: ^2.0.0
   source_gen: ^1.3.2
   stack_trace: ^1.10.0