From 7bc0a360bb531721bdf2ba20c6b6d94a35dc6863 Mon Sep 17 00:00:00 2001 From: Jigar-f Date: Mon, 24 Jun 2024 12:10:07 +0530 Subject: [PATCH] Fixed merged conflicts and updated some packages. --- ios/Podfile.lock | 30 ++++++-------- ios/Runner.xcodeproj/project.pbxproj | 32 +++++++-------- .../xcshareddata/swiftpm/Package.resolved | 14 +++++++ pubspec.lock | 40 +++++++++++++++++++ pubspec.yaml | 22 +++++----- 5 files changed, 93 insertions(+), 45 deletions(-) create mode 100644 ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c0dea8c5c..2fb8b429e 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -106,7 +106,7 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - permission_handler_apple (9.1.1): + - permission_handler_apple (9.3.0): - Flutter - qr_code_scanner (0.2.0): - Flutter @@ -117,11 +117,11 @@ PODS: - SDWebImageWebPCoder (0.14.6): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) - - Sentry/HybridSDK (8.25.0) - - sentry_flutter (7.20.2): + - Sentry/HybridSDK (8.29.0) + - sentry_flutter (8.3.0): - Flutter - FlutterMacOS - - Sentry/HybridSDK (= 8.25.0) + - Sentry/HybridSDK (= 8.29.0) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -141,8 +141,6 @@ PODS: - video_thumbnail (0.0.1): - Flutter - libwebp - - wakelock_plus (0.0.1): - - Flutter - webview_flutter_wkwebview (0.0.1): - Flutter @@ -177,7 +175,6 @@ DEPENDENCIES: - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`) - - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`) - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`) SPEC REPOS: @@ -257,8 +254,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/video_player_avfoundation/darwin" video_thumbnail: :path: ".symlinks/plugins/video_thumbnail/ios" - wakelock_plus: - :path: ".symlinks/plugins/wakelock_plus/ios" webview_flutter_wkwebview: :path: ".symlinks/plugins/webview_flutter_wkwebview/ios" @@ -267,16 +262,16 @@ SPEC CHECKSUMS: app_links: e70ca16b4b0f88253b3b3660200d4a10b4ea9795 audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40 connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db - device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 + device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 emoji_picker_flutter: fe2e6151c5b548e975d546e6eeb567daf0962a58 - file_picker: ce3938a0df3cc1ef404671531facef740d03f920 + file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0 flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 - flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743 + flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086 flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83 flutter_pdfview: 25f53dd6097661e6395b17de506e6060585946bd flutter_uploader: 2b07c4d41cf1218f25e6d5b8bcfa2d913838e27c @@ -285,20 +280,20 @@ SPEC CHECKSUMS: google_mobile_ads: 9379c80fdfa9988fb0e105a407890ff8deb3cf86 GoogleUserMessagingPlatform: f131fa7978d2ba88d7426702b057c2cc318e6595 in_app_purchase_storekit: 8c3b0b3eb1b0f04efbff401c3de6266d4258d433 - integration_test: 13825b8a9334a850581300559b8839134b124670 + integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4 libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 + permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 - Sentry: cd86fc55628f5b7c572cabe66cc8f95a9d2f165a - sentry_flutter: 0cf2507eb90ff7a6aa3304e900dd7f08edbbefdf - share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 + Sentry: 016de45ee5ce5fca2a829996f1bfafeb5e62e8b4 + sentry_flutter: 5fb57c5b7e6427a9dc1fedde4269eb65823982d4 + share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 @@ -307,7 +302,6 @@ SPEC CHECKSUMS: url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1 - wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1 webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36 PODFILE CHECKSUM: edbeaea3b499feb7b2b276309b09c237de1a6cff diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 20cae44c0..1cc81c2b0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -854,7 +854,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1006,7 +1006,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1021,7 +1021,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1169,7 +1169,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1184,7 +1184,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1337,7 +1337,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1352,7 +1352,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1630,7 +1630,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1645,7 +1645,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1777,7 +1777,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1792,7 +1792,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1815,7 +1815,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1830,7 +1830,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1909,7 +1909,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 12; + CURRENT_PROJECT_VERSION = 35; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 4FYC28AXA2; ENABLE_BITCODE = NO; @@ -1924,7 +1924,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 7.5.2; + MARKETING_VERSION = 7.5.18; PRODUCT_BUNDLE_IDENTIFIER = org.getlantern.lantern; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 000000000..cb4b75775 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,14 @@ +{ + "pins" : [ + { + "identity" : "sqlite.swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/stephencelis/SQLite.swift.git", + "state" : { + "revision" : "7a2e3cd27de56f6d396e84f63beefd0267b55ccb", + "version" : "0.14.1" + } + } + ], + "version" : 2 +} diff --git a/pubspec.lock b/pubspec.lock index 202ecd349..8574381ce 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -849,6 +849,14 @@ packages: description: flutter source: sdk version: "0.0.0" + get_it: + dependency: "direct main" + description: + name: get_it + sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1 + url: "https://pub.dev" + source: hosted + version: "7.7.0" gettext_parser: dependency: transitive description: @@ -953,6 +961,38 @@ packages: url: "https://pub.dev" source: hosted version: "0.0.6" + in_app_purchase: + dependency: "direct main" + description: + name: in_app_purchase + sha256: "960f26a08d9351fb8f89f08901f8a829d41b04d45a694b8f776121d9e41dcad6" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + in_app_purchase_android: + dependency: transitive + description: + name: in_app_purchase_android + sha256: b18871cffd4ec8911171864bfc0060c983be96215080a0847c29ef9147f439ef + url: "https://pub.dev" + source: hosted + version: "0.3.6+1" + in_app_purchase_platform_interface: + dependency: transitive + description: + name: in_app_purchase_platform_interface + sha256: "1d353d38251da5b9fea6635c0ebfc6bb17a2d28d0e86ea5e083bf64244f1fb4c" + url: "https://pub.dev" + source: hosted + version: "1.4.0" + in_app_purchase_storekit: + dependency: transitive + description: + name: in_app_purchase_storekit + sha256: "9a087c3c051266642468f031737c5a09f6fd90ff2b21d953e130563f3fd4cb34" + url: "https://pub.dev" + source: hosted + version: "0.3.17" infinite_scroll_pagination: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index c31a41b09..a991180f9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,11 +64,11 @@ dependencies: # Networking cached_network_image: ^3.3.1 - dio: ^5.3.2 - internet_connection_checker_plus: ^2.2.0 + dio: ^5.4.3+1 + internet_connection_checker_plus: ^2.4.2 # caching - flutter_cache_manager: ^3.3.1 + flutter_cache_manager: ^3.3.2 # change this with flutter_downloader flutter_uploader: ^3.0.0-beta.3 mime: ^1.0.4 @@ -85,7 +85,7 @@ dependencies: qr_code_scanner: ^1.0.1 # Timer & Overlay - stop_watch_timer: ^3.0.1 + stop_watch_timer: ^3.1.1 loader_overlay: ^2.3.2 # Keyboard & Color utilities @@ -102,25 +102,23 @@ dependencies: ref: master # Desktop - window_manager: ^0.3.8 - tray_manager: ^0.2.2 + window_manager: ^0.3.9 + tray_manager: ^0.2.3 flutter_dotenv: ^5.1.0 # Notifications & Logging flutter_local_notifications: ^17.1.2 - logger: ^2.0.1 + logger: ^2.3.0 # Error handling device_info_plus: ^10.1.0 -# flutter_mailer: ^2.0.0 -# fluttertoast: ^8.2.2 # Package information package_info_plus: ^8.0.0 # Path, permission & Markdown handling - path_provider: ^2.1.0 + path_provider: ^2.1.3 permission_handler: ^11.3.1 flutter_markdown: ^0.7.2+1 @@ -131,9 +129,11 @@ dependencies: google_mobile_ads: ^5.1.0 retry: ^3.1.2 # Generate bindings to native libraries - ffi: ^2.1.0 + ffi: ^2.1.2 # Deeplink handling app_links: ^6.1.1 + # Service Locator + get_it: ^7.7.0 #Loading animated_loading_border: ^0.0.2 shimmer: ^3.0.0