From 7779803ccccc53e8a926ff538588b7c6005228f5 Mon Sep 17 00:00:00 2001 From: din4_4 Date: Mon, 25 May 2026 15:23:13 +0300 Subject: [PATCH] chore: update dependencies and configurations for iOS build - Updated mobile_scanner dependency version to 7.0.0 in pubspec.yaml. - Adjusted versions of several packages in pubspec.lock. - Added exclusion of arm64 architecture for iOS simulator in Podfile and xcconfig files to support Apple Silicon. - Cleaned up Podfile.lock by removing unused dependencies. This update ensures compatibility with the latest mobile_scanner and improves build stability on M1/M4 devices. --- ios/Flutter/Debug.xcconfig | 2 + ios/Flutter/Profile.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Podfile | 5 +++ ios/Podfile.lock | 86 +++--------------------------------- pubspec.lock | 20 ++++----- pubspec.yaml | 2 +- 7 files changed, 26 insertions(+), 91 deletions(-) diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 61979d5..4729274 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -2,3 +2,5 @@ #include "Generated.xcconfig" #include? "Secrets.xcconfig" YANDEX_MAPKIT_API_KEY=a0ef1404-2650-4f28-9891-c965ecc09174 +// Переопределение Pods/ML Kit: arm64 для симулятора на Apple Silicon (M1/M4) +EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 diff --git a/ios/Flutter/Profile.xcconfig b/ios/Flutter/Profile.xcconfig index 0590e45..b88e23f 100644 --- a/ios/Flutter/Profile.xcconfig +++ b/ios/Flutter/Profile.xcconfig @@ -2,3 +2,4 @@ #include "Generated.xcconfig" #include? "Secrets.xcconfig" YANDEX_MAPKIT_API_KEY=a0ef1404-2650-4f28-9891-c965ecc09174 +EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 35ad143..e58acaa 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -2,3 +2,4 @@ #include "Generated.xcconfig" #include? "Secrets.xcconfig" YANDEX_MAPKIT_API_KEY=a0ef1404-2650-4f28-9891-c965ecc09174 +EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386 diff --git a/ios/Podfile b/ios/Podfile index a9ed6ee..12a7607 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -39,5 +39,10 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + # ML Kit исключает arm64 для симулятора → сборка только x86_64. + # На M1 это ещё могло работать через Rosetta; на M4 симулятор только arm64. + config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'i386' + end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2f7416f..9c64dbf 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -7,64 +7,14 @@ PODS: - geolocator_apple (1.2.0): - Flutter - FlutterMacOS - - GoogleDataTransport (9.4.1): - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30911.0, >= 2.30908.0) - - PromisesObjC (< 3.0, >= 1.2) - - GoogleMLKit/BarcodeScanning (6.0.0): - - GoogleMLKit/MLKitCore - - MLKitBarcodeScanning (~> 5.0.0) - - GoogleMLKit/MLKitCore (6.0.0): - - MLKitCommon (~> 11.0.0) - - GoogleToolboxForMac/Defines (4.2.1) - - GoogleToolboxForMac/Logger (4.2.1): - - GoogleToolboxForMac/Defines (= 4.2.1) - - "GoogleToolboxForMac/NSData+zlib (4.2.1)": - - GoogleToolboxForMac/Defines (= 4.2.1) - - GoogleUtilities/Environment (7.13.3): - - GoogleUtilities/Privacy - - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.13.3): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (7.13.3) - - GoogleUtilities/UserDefaults (7.13.3): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GoogleUtilitiesComponents (1.1.0): - - GoogleUtilities/Logger - - GTMSessionFetcher/Core (3.5.0) - image_picker_ios (0.0.1): - Flutter - - MLImage (1.0.0-beta5) - - MLKitBarcodeScanning (5.0.0): - - MLKitCommon (~> 11.0) - - MLKitVision (~> 7.0) - - MLKitCommon (11.0.0): - - GoogleDataTransport (< 10.0, >= 9.4.1) - - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) - - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" - - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0) - - GoogleUtilitiesComponents (~> 1.0) - - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) - - MLKitVision (7.0.0): - - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1) - - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)" - - GTMSessionFetcher/Core (< 4.0, >= 3.3.2) - - MLImage (= 1.0.0-beta5) - - MLKitCommon (~> 11.0) - - mobile_scanner (5.2.3): + - mobile_scanner (7.0.0): - Flutter - - GoogleMLKit/BarcodeScanning (~> 6.0.0) - - nanopb (2.30910.0): - - nanopb/decode (= 2.30910.0) - - nanopb/encode (= 2.30910.0) - - nanopb/decode (2.30910.0) - - nanopb/encode (2.30910.0) + - FlutterMacOS - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - PromisesObjC (2.4.0) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS @@ -81,7 +31,7 @@ DEPENDENCIES: - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`) - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) - - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`) + - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) @@ -89,18 +39,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - - GoogleDataTransport - - GoogleMLKit - - GoogleToolboxForMac - - GoogleUtilities - - GoogleUtilitiesComponents - - GTMSessionFetcher - - MLImage - - MLKitBarcodeScanning - - MLKitCommon - - MLKitVision - - nanopb - - PromisesObjC - YandexMapsMobile EXTERNAL SOURCES: @@ -115,7 +53,7 @@ EXTERNAL SOURCES: image_picker_ios: :path: ".symlinks/plugins/image_picker_ios/ios" mobile_scanner: - :path: ".symlinks/plugins/mobile_scanner/ios" + :path: ".symlinks/plugins/mobile_scanner/darwin" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" shared_preferences_foundation: @@ -130,26 +68,14 @@ SPEC CHECKSUMS: Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13 geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e - GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a - GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065 - GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8 - GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 - GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe - GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326 - MLImage: 1824212150da33ef225fbd3dc49f184cf611046c - MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b - MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1 - MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1 - mobile_scanner: 92e8812bf22a8f84131e2a7f9d0f44dad1a4742b - nanopb: 438bc412db1928dac798aa6fd75726007be04262 + mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93 path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880 - PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b yandex_mapkit: bac34ca1bdf97e87252a8c6d09a95b1fe39ba103 YandexMapsMobile: c73844c6096bbb240d1491adc511c2ef4a88d88d -PODFILE CHECKSUM: 2301f414ef379b44e245a3312381bf468ba9fa73 +PODFILE CHECKSUM: 715b1068ab8815ca4115a24e305e836709652b69 COCOAPODS: 1.16.2 diff --git a/pubspec.lock b/pubspec.lock index 5820454..5baa7da 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: characters - sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803 url: "https://pub.dev" source: hosted - version: "1.4.1" + version: "1.4.0" checked_yaml: dependency: transitive description: @@ -588,18 +588,18 @@ packages: dependency: transitive description: name: matcher - sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 url: "https://pub.dev" source: hosted - version: "0.12.19" + version: "0.12.17" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.13.0" + version: "0.11.1" meta: dependency: transitive description: @@ -620,10 +620,10 @@ packages: dependency: "direct main" description: name: mobile_scanner - sha256: d234581c090526676fd8fab4ada92f35c6746e3fb4f05a399665d75a399fb760 + sha256: c92c26bf2231695b6d3477c8dcf435f51e28f87b1745966b1fe4c47a286171ce url: "https://pub.dev" source: hosted - version: "5.2.3" + version: "7.2.0" nested: dependency: transitive description: @@ -841,10 +841,10 @@ packages: dependency: transitive description: name: test_api - sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a" + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.10" + version: "0.7.7" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 4ab4aac..4589644 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: go_router: ^14.0.0 android_id: ^0.4.0 device_info_plus: ^12.3.0 - mobile_scanner: ^5.1.1 + mobile_scanner: ^7.0.0 yandex_mapkit: ^4.2.1 geolocator: ^11.0.0 crypto: ^3.0.3