diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ff25f6528..13a4c91ed 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -3,9 +3,9 @@ PODS: - Flutter - camera_avfoundation (0.0.1): - Flutter - - connectivity (0.0.1): + - connectivity_plus (0.0.1): - Flutter - - Reachability + - ReachabilitySwift - device_info (0.0.1): - Flutter - Firebase/CoreOnly (10.3.0): @@ -136,7 +136,7 @@ PODS: - Flutter - FlutterMacOS - PromisesObjC (2.1.1) - - Reachability (3.2) + - ReachabilitySwift (5.0.0) - receive_sharing_intent (0.0.1): - Flutter - SDWebImage (5.15.2): @@ -178,7 +178,7 @@ PODS: DEPENDENCIES: - background_fetch (from `.symlinks/plugins/background_fetch/ios`) - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - - connectivity (from `.symlinks/plugins/connectivity/ios`) + - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`) - device_info (from `.symlinks/plugins/device_info/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) @@ -231,7 +231,7 @@ SPEC REPOS: - nanopb - OrderedSet - PromisesObjC - - Reachability + - ReachabilitySwift - SDWebImage - SDWebImageWebPCoder - Sentry @@ -242,8 +242,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/background_fetch/ios" camera_avfoundation: :path: ".symlinks/plugins/camera_avfoundation/ios" - connectivity: - :path: ".symlinks/plugins/connectivity/ios" + connectivity_plus: + :path: ".symlinks/plugins/connectivity_plus/ios" device_info: :path: ".symlinks/plugins/device_info/ios" firebase_core: @@ -320,7 +320,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: background_fetch: bd64e544b303ee4cd4cf2fe8cb2187b72aecf9ca camera_avfoundation: 07c77549ea54ad95d8581be86617c094a46280d9 - connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 + connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 Firebase: f92fc551ead69c94168d36c2b26188263860acd9 firebase_core: f95c8bbe65213d406d592573ad42a12d64849cb8 @@ -358,7 +358,7 @@ SPEC CHECKSUMS: path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852 photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb - Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 + ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1 SDWebImage: 8ab87d4b3e5cc4927bd47f78db6ceb0b94442577 SDWebImageWebPCoder: 4851414d9f8894e328e8b97c93ea4f4f4e4418ae diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 9f41a9a3a..529def5d4 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -268,14 +268,14 @@ "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", "${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", - "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", + "${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework", "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework", "${BUILT_PRODUCTS_DIR}/Sentry/Sentry.framework", "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework", "${BUILT_PRODUCTS_DIR}/background_fetch/background_fetch.framework", "${BUILT_PRODUCTS_DIR}/camera_avfoundation/camera_avfoundation.framework", - "${BUILT_PRODUCTS_DIR}/connectivity/connectivity.framework", + "${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework", "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework", "${BUILT_PRODUCTS_DIR}/fk_user_agent/fk_user_agent.framework", "${BUILT_PRODUCTS_DIR}/flutter_email_sender/flutter_email_sender.framework", @@ -331,7 +331,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/background_fetch.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/camera_avfoundation.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fk_user_agent.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_email_sender.framework", diff --git a/lib/services/sync_service.dart b/lib/services/sync_service.dart index cdd5e7643..867e36e9f 100644 --- a/lib/services/sync_service.dart +++ b/lib/services/sync_service.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:connectivity/connectivity.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:dio/dio.dart'; import 'package:logging/logging.dart'; import 'package:photo_manager/photo_manager.dart'; diff --git a/lib/utils/file_uploader.dart b/lib/utils/file_uploader.dart index ec1f6ece3..403fa7668 100644 --- a/lib/utils/file_uploader.dart +++ b/lib/utils/file_uploader.dart @@ -6,7 +6,7 @@ import 'dart:math'; import 'dart:typed_data'; import 'package:collection/collection.dart'; -import 'package:connectivity/connectivity.dart'; +import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:dio/dio.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_sodium/flutter_sodium.dart'; diff --git a/pubspec.lock b/pubspec.lock index 79660f993..35d7ba3a7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -208,38 +208,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.0" - connectivity: + connectivity_plus: dependency: "direct main" description: - name: connectivity - sha256: a8e91263cf3e25fb5cc95e19dfde4999e32a648ac3b9e8a558a28165731678f8 + name: connectivity_plus + sha256: "8875e8ed511a49f030e313656154e4bbbcef18d68dfd32eb853fac10bce48e96" url: "https://pub.dev" source: hosted - version: "3.0.6" - connectivity_for_web: + version: "3.0.3" + connectivity_plus_platform_interface: dependency: transitive description: - name: connectivity_for_web - sha256: "01a390c1d5adc2ed1fa1f52d120c07fe9fd01166a93f965a832fd6cfc0ea6482" + name: connectivity_plus_platform_interface + sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a url: "https://pub.dev" source: hosted - version: "0.4.0+1" - connectivity_macos: - dependency: transitive - description: - name: connectivity_macos - sha256: "51ae08d5162eca9669b9d8951ed83ce19c5355a81149f94e4dee2740beb93628" - url: "https://pub.dev" - source: hosted - version: "0.2.1+2" - connectivity_platform_interface: - dependency: transitive - description: - name: connectivity_platform_interface - sha256: "2d82e942df9d49f29a24bb07fb5ce085d4a53e47818c62364d2b6deb9e0d7a8e" - url: "https://pub.dev" - source: hosted - version: "2.0.1" + version: "1.2.4" convert: dependency: transitive description: @@ -1005,6 +989,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + nm: + dependency: transitive + description: + name: nm + sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" + url: "https://pub.dev" + source: hosted + version: "0.5.0" node_preamble: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a94c086f3..9dffb4f0a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: collection: # dart computer: ^2.0.0 confetti: ^0.6.0 - connectivity: ^3.0.3 + connectivity_plus: ^3.0.3 cupertino_icons: ^1.0.0 device_info: ^2.0.2 dio: ^4.0.6