diff --git a/.github/workflows/integration_tests_app_ci.yml b/.github/workflows/integration_tests_app_ci.yml index 2fcaf5fad..f858f5216 100644 --- a/.github/workflows/integration_tests_app_ci.yml +++ b/.github/workflows/integration_tests_app_ci.yml @@ -101,7 +101,7 @@ jobs: channel: ${{ steps.fvm-config-action.outputs.FLUTTER_CHANNEL }} - name: Install patrol cli - run: flutter pub global activate patrol_cli 2.3.1+1 + run: flutter pub global activate patrol_cli 2.5.0 - name: Run Flutter build run: | diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index 9e5e8edcf..77e1debb2 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -235,7 +235,7 @@ PODS: - FirebaseCoreExtension (~> 10.0) - GTMSessionFetcher/Core (< 4.0, >= 2.1) - Flutter (1.0.0) - - flutter_image_compress (1.0.0): + - flutter_image_compress_common (1.0.0): - Flutter - Mantle - SDWebImage @@ -320,22 +320,21 @@ PODS: - AppAuth/Core (~> 1.6) - GTMSessionFetcher/Core (< 4.0, >= 1.5) - GTMSessionFetcher/Core (2.3.0) - - HTTPParserC (2.9.4) - image_picker_ios (0.0.1): - Flutter - integration_test (0.0.1): - Flutter - - libwebp (1.3.1): - - libwebp/demux (= 1.3.1) - - libwebp/mux (= 1.3.1) - - libwebp/sharpyuv (= 1.3.1) - - libwebp/webp (= 1.3.1) - - libwebp/demux (1.3.1): + - libwebp (1.3.2): + - libwebp/demux (= 1.3.2) + - libwebp/mux (= 1.3.2) + - libwebp/sharpyuv (= 1.3.2) + - libwebp/webp (= 1.3.2) + - libwebp/demux (1.3.2): - libwebp/webp - - libwebp/mux (1.3.1): + - libwebp/mux (1.3.2): - libwebp/demux - - libwebp/sharpyuv (1.3.1) - - libwebp/webp (1.3.1): + - libwebp/sharpyuv (1.3.2) + - libwebp/webp (1.3.2): - libwebp/sharpyuv - Mantle (2.2.0): - Mantle/extobjc (= 2.2.0) @@ -374,8 +373,9 @@ PODS: - Flutter - FlutterMacOS - patrol (0.0.1): + - CocoaAsyncSocket (~> 7.6) - Flutter - - Telegraph (~> 0.30.0) + - FlutterMacOS - pdfx (1.0.0): - Flutter - permission_handler_apple (9.1.1): @@ -392,7 +392,7 @@ PODS: - SDWebImage (5.17.0): - SDWebImage/Core (= 5.17.0) - SDWebImage/Core (5.17.0) - - SDWebImageWebPCoder (0.13.0): + - SDWebImageWebPCoder (0.14.2): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) - share (0.0.1): @@ -404,9 +404,6 @@ PODS: - Flutter - FMDB (>= 2.7.5) - SwiftyGif (5.4.4) - - Telegraph (0.30.0): - - CocoaAsyncSocket (~> 7.6) - - HTTPParserC (~> 2.9) - url_launcher_ios (0.0.1): - Flutter - video_player_avfoundation (0.0.1): @@ -433,7 +430,7 @@ DEPENDENCIES: - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`) - FirebaseFirestore (from `https://github.com/invertase/firestore-ios-sdk-frameworks.git`, tag `10.12.0`) - Flutter (from `Flutter`) - - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`) + - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) - flutter_native_timezone (from `.symlinks/plugins/flutter_native_timezone/ios`) - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) @@ -442,7 +439,7 @@ DEPENDENCIES: - open_file_plus (from `.symlinks/plugins/open_file_plus/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - - patrol (from `.symlinks/plugins/patrol/ios`) + - patrol (from `.symlinks/plugins/patrol/darwin`) - pdfx (from `.symlinks/plugins/pdfx/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`) @@ -489,7 +486,6 @@ SPEC REPOS: - GoogleUtilitiesComponents - GTMAppAuth - GTMSessionFetcher - - HTTPParserC - libwebp - Mantle - MLImage @@ -504,7 +500,6 @@ SPEC REPOS: - SDWebImage - SDWebImageWebPCoder - SwiftyGif - - Telegraph EXTERNAL SOURCES: add_2_calendar: @@ -544,8 +539,8 @@ EXTERNAL SOURCES: :tag: 10.12.0 Flutter: :path: Flutter - flutter_image_compress: - :path: ".symlinks/plugins/flutter_image_compress/ios" + flutter_image_compress_common: + :path: ".symlinks/plugins/flutter_image_compress_common/ios" flutter_native_timezone: :path: ".symlinks/plugins/flutter_native_timezone/ios" google_sign_in_ios: @@ -563,7 +558,7 @@ EXTERNAL SOURCES: path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" patrol: - :path: ".symlinks/plugins/patrol/ios" + :path: ".symlinks/plugins/patrol/darwin" pdfx: :path: ".symlinks/plugins/pdfx/ios" permission_handler_apple: @@ -589,7 +584,7 @@ CHECKOUT OPTIONS: :tag: 10.12.0 SPEC CHECKSUMS: - add_2_calendar: e9d68636aed37fb18e12f5a3d74c2e0589487af0 + add_2_calendar: 5eee66d5a3b99cd5e1487a7e03abd4e3ac4aff11 app_review: 6f51001269c59a2f4a5b5ae68b7d106401152764 AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570 cloud_firestore: 85d66b543b25130c45258412a39e851e230186e7 @@ -631,7 +626,7 @@ SPEC CHECKSUMS: FirebaseSharedSwift: 0eec812f08b6ec9e03196fc27635739781513028 FirebaseStorage: 1d7ca8c8953fc61ccacaa7c612696b5402968a0d Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433 + flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e flutter_native_timezone: 5f05b2de06c9776b4cc70e1839f03de178394d22 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a google_sign_in_ios: ede92ec558c3a73ec07cb180f31820152fb8ca89 @@ -644,10 +639,9 @@ SPEC CHECKSUMS: GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 - HTTPParserC: aea14c3d2d4ac5beb3988781daa36dfa62e0d9ef image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 integration_test: 13825b8a9334a850581300559b8839134b124670 - libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96 + libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505 @@ -658,7 +652,7 @@ SPEC CHECKSUMS: open_file_plus: 05737718530c14cf02868e3b7754d7fe4df76d8b package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - patrol: 792c0bb6cc4d552fc8b37f49266341c39e659b4d + patrol: 3e21d514020dbee24b3e3383caac9e8e051292ac pdfx: 7b876b09de8b7a0bf444a4f82b439ffcff4ee1ec permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6 PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 @@ -667,12 +661,11 @@ SPEC CHECKSUMS: PurchasesHybridCommon: 9adfb3252d99e22142aae9b8456e0069f0cae72d RevenueCat: a853fc1d6eb058e8546d91fba9c9c5cd2e041949 SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9 - SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102 + SDWebImageWebPCoder: 633b813fca24f1de5e076bcd7f720c038b23892b share: 0b2c3e82132f5888bccca3351c504d0003b3b410 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f - Telegraph: 12576b119324138e4929792af9e5a1085c2ecbc1 url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126 wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47 diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index 52d455896..26fc2ebe7 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -359,7 +359,6 @@ "${BUILT_PRODUCTS_DIR}/GoogleSignIn/GoogleSignIn.framework", "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", - "${BUILT_PRODUCTS_DIR}/HTTPParserC/HTTPParserC.framework", "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", @@ -368,13 +367,12 @@ "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework", "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework", - "${BUILT_PRODUCTS_DIR}/Telegraph/Telegraph.framework", "${BUILT_PRODUCTS_DIR}/add_2_calendar/add_2_calendar.framework", "${BUILT_PRODUCTS_DIR}/app_review/app_review.framework", "${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework", "${BUILT_PRODUCTS_DIR}/fast_rsa/fast_rsa.framework", "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework", - "${BUILT_PRODUCTS_DIR}/flutter_image_compress/flutter_image_compress.framework", + "${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework", "${BUILT_PRODUCTS_DIR}/flutter_native_timezone/flutter_native_timezone.framework", "${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework", "${BUILT_PRODUCTS_DIR}/integration_test/integration_test.framework", @@ -424,7 +422,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleSignIn.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HTTPParserC.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", @@ -433,13 +430,12 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Telegraph.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/add_2_calendar.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/app_review.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fast_rsa.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_native_timezone.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/integration_test.framework", diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift index 50539401e..880fa6237 100644 --- a/app/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/app/macos/Flutter/GeneratedPluginRegistrant.swift @@ -23,6 +23,7 @@ import google_sign_in_ios import mobile_scanner import package_info_plus import path_provider_foundation +import patrol import pdfx import purchases_flutter import shared_preferences_foundation @@ -49,6 +50,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin")) FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + PatrolPlugin.register(with: registry.registrar(forPlugin: "PatrolPlugin")) PdfxPlugin.register(with: registry.registrar(forPlugin: "PdfxPlugin")) PurchasesFlutterPlugin.register(with: registry.registrar(forPlugin: "PurchasesFlutterPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) diff --git a/app/pubspec.lock b/app/pubspec.lock index fbc4055f3..7cb2cc716 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1583,10 +1583,10 @@ packages: dependency: "direct dev" description: name: patrol - sha256: "56651dde82e845b142c1c22367e691aaa8c9ecffa393c9e86079f3110eeb1dd1" + sha256: "415db7827456cf7133c2fec31a6aba54ba7fcef9b9c35043f850e2636efbcc69" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.3.0" patrol_finders: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index d8437159c..1a4847774 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -193,7 +193,7 @@ dev_dependencies: bloc_test: ^9.1.4 bloc_presentation_test: ^1.0.0 path: ^1.8.3 - patrol: ^3.1.0 + patrol: ^3.3.0 patrol: app_name: Sharezone App