diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 8da2e79d..e7990a9f 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -398,7 +398,7 @@ class ChatController extends State<Chat> {
   void voiceMessageAction() async {
     if (PlatformInfos.isAndroid) {
       final info = await DeviceInfoPlugin().androidInfo;
-      if ((info.version.sdkInt ?? 16) < 19) {
+      if (info.version.sdkInt < 19) {
         showOkAlertDialog(
           context: context,
           title: L10n.of(context)!.unsupportedAndroidVersion,
@@ -961,7 +961,7 @@ class ChatController extends State<Chat> {
     // VoIP required Android SDK 21
     if (PlatformInfos.isAndroid) {
       DeviceInfoPlugin().androidInfo.then((value) {
-        if ((value.version.sdkInt ?? 16) < 21) {
+        if (value.version.sdkInt < 21) {
           Navigator.pop(context);
           showOkAlertDialog(
             context: context,
diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart
index 0a2a7be1..d4470a5b 100644
--- a/lib/pages/new_private_chat/new_private_chat.dart
+++ b/lib/pages/new_private_chat/new_private_chat.dart
@@ -86,7 +86,7 @@ class NewPrivateChatController extends State<NewPrivateChat> {
   void openScannerAction() async {
     if (PlatformInfos.isAndroid) {
       final info = await DeviceInfoPlugin().androidInfo;
-      if ((info.version.sdkInt ?? 16) < 21) {
+      if (info.version.sdkInt < 21) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
             content: Text(
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 6f2fa9d2..5d5ceb70 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,10 +6,10 @@ import FlutterMacOS
 import Foundation
 
 import audio_session
-import connectivity_plus_macos
+import connectivity_plus
 import desktop_drop
 import desktop_lifecycle
-import device_info_plus_macos
+import device_info_plus
 import emoji_picker_flutter
 import flutter_local_notifications
 import flutter_secure_storage_macos
diff --git a/pubspec.lock b/pubspec.lock
index 8b2ad768..93c723c3 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -203,42 +203,14 @@ packages:
       name: connectivity_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.9"
-  connectivity_plus_linux:
-    dependency: transitive
-    description:
-      name: connectivity_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
-  connectivity_plus_macos:
-    dependency: transitive
-    description:
-      name: connectivity_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.6"
+    version: "3.0.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
-  connectivity_plus_web:
-    dependency: transitive
-    description:
-      name: connectivity_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.5"
-  connectivity_plus_windows:
-    dependency: transitive
-    description:
-      name: connectivity_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
   convert:
     dependency: transitive
     description:
@@ -336,42 +308,14 @@ packages:
       name: device_info_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.0"
-  device_info_plus_linux:
-    dependency: transitive
-    description:
-      name: device_info_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
-  device_info_plus_macos:
-    dependency: transitive
-    description:
-      name: device_info_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.2.3"
+    version: "8.0.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.0+1"
-  device_info_plus_web:
-    dependency: transitive
-    description:
-      name: device_info_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  device_info_plus_windows:
-    dependency: transitive
-    description:
-      name: device_info_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.1"
+    version: "7.0.0"
   disk_space:
     dependency: transitive
     description:
@@ -509,7 +453,7 @@ packages:
       name: flutter_app_lock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "3.0.0"
   flutter_blurhash:
     dependency: "direct main"
     description:
@@ -736,7 +680,7 @@ packages:
       name: flutter_web_auth
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.5.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -1348,7 +1292,7 @@ packages:
       name: proj4dart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   provider:
     dependency: "direct main"
     description:
@@ -2004,7 +1948,7 @@ packages:
       name: win32
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
   wkt_parser:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 6f0c5430..458df870 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,12 +16,12 @@ dependencies:
   callkeep: ^0.3.2
   chewie: ^1.2.2
   collection: ^1.15.0-nullsafety.4
-  connectivity_plus: ^2.3.9
+  connectivity_plus: ^3.0.2
   cupertino_icons: any
   desktop_drop: ^0.3.2
   desktop_lifecycle: ^0.1.0
   desktop_notifications: ^0.6.3
-  device_info_plus: ^4.0.0
+  device_info_plus: ^8.0.0
   dynamic_color: ^1.2.2
   email_validator: ^2.0.1
   emoji_picker_flutter: ^1.1.2
@@ -33,7 +33,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_app_badger: ^1.3.0
-  flutter_app_lock: ^2.0.0
+  flutter_app_lock: ^3.0.0
   flutter_blurhash: ^0.7.0
   flutter_cache_manager: ^3.3.0
   flutter_foreground_task: ^3.10.0
@@ -49,7 +49,7 @@ dependencies:
   flutter_slidable: ^2.0.0
   flutter_svg: ^0.22.0
   flutter_typeahead: ^4.0.0
-  flutter_web_auth: ^0.4.0
+  flutter_web_auth: ^0.5.0
   flutter_webrtc: ^0.9.11
   future_loading_dialog: ^0.2.3
   geolocator: ^7.6.2
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 22e9537d..7f25f03d 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,7 +6,7 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <desktop_drop/desktop_drop_plugin.h>
 #include <desktop_lifecycle/desktop_lifecycle_plugin.h>
 #include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 229023b1..200b8757 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  connectivity_plus_windows
+  connectivity_plus
   desktop_drop
   desktop_lifecycle
   flutter_webrtc