diff --git a/.gitignore b/.gitignore index 2dcb50c9..b21277a5 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ migrate_working_dir/ **/libclash.h **/*.dll **/*.dylib +**/*.xcframework /dist/ /assets/core/* diff --git a/Makefile b/Makefile index 9725433c..1fb36eaa 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include dependencies.properties BINDIR=./libcore/bin ANDROID_OUT=./android/app/libs -IOS_OUT=./libcore/bin +IOS_OUT=./ios/Frameworks DESKTOP_OUT=./libcore/bin GEO_ASSETS_DIR=./assets/core @@ -117,7 +117,7 @@ build-macos-libs: make -C libcore -f Makefile macos-universal && mv $(BINDIR)/$(CORE_NAME)-macos-universal.dylib $(DESKTOP_OUT)/libcore.dylib build-ios-libs: - make -C libcore -f Makefile ios && mv $(BINDIR)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/libcore.xcframework + make -C libcore -f Makefile ios && mv $(BINDIR)/$(CORE_NAME)-ios.xcframework $(IOS_OUT)/Libcore.xcframework release: # Create a new tag for release. @echo "previous version was $$(git describe --tags $$(git rev-list --tags --max-count=1))" diff --git a/ios/Pods/Frameworks/.gitkeep b/ios/Frameworks/.gitkeep similarity index 100% rename from ios/Pods/Frameworks/.gitkeep rename to ios/Frameworks/.gitkeep diff --git a/ios/Podfile b/ios/Podfile index 535b1ebc..da1e90fe 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -35,6 +35,8 @@ target 'Runner' do target 'RunnerTests' do inherit! :search_paths end + pod 'Libcore', :path => './Frameworks/Libcore.xcframework' + end # post_install do |installer| @@ -69,4 +71,4 @@ post_install do |installer| end end -end \ No newline at end of file +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 46b6f3d0..eda50aab 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -6,7 +6,7 @@ PODS: - Flutter (1.0.0) - flutter_native_splash (0.0.1): - Flutter - - GoogleDataTransport (9.2.5): + - GoogleDataTransport (9.3.0): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) @@ -36,6 +36,7 @@ PODS: - GoogleUtilitiesComponents (1.1.0): - GoogleUtilities/Logger - GTMSessionFetcher/Core (2.3.0) + - Libcore (1.0.0.local) - MLImage (1.0.0-beta4) - MLKitBarcodeScanning (3.0.0): - MLKitCommon (~> 9.0) @@ -70,13 +71,13 @@ PODS: - PromisesObjC (2.3.1) - protocol_handler (0.0.1): - Flutter - - Sentry/HybridSDK (8.15.2): - - SentryPrivate (= 8.15.2) + - Sentry/HybridSDK (8.17.2): + - SentryPrivate (= 8.17.2) - sentry_flutter (0.0.1): - Flutter - FlutterMacOS - - Sentry/HybridSDK (= 8.15.2) - - SentryPrivate (8.15.2) + - Sentry/HybridSDK (= 8.17.2) + - SentryPrivate (8.17.2) - share_plus (0.0.1): - Flutter - shared_preferences_foundation (0.0.1): @@ -105,6 +106,7 @@ DEPENDENCIES: - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) + - Libcore (from `./Frameworks/Libcore.xcframework`) - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) @@ -142,6 +144,8 @@ EXTERNAL SOURCES: :path: Flutter flutter_native_splash: :path: ".symlinks/plugins/flutter_native_splash/ios" + Libcore: + :path: "./Frameworks/Libcore.xcframework" mobile_scanner: :path: ".symlinks/plugins/mobile_scanner/ios" package_info_plus: @@ -166,12 +170,13 @@ SPEC CHECKSUMS: device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef - GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 + GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 + Libcore: 755017c5b3afb0244329093a5f20c1cc04a99831 MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505 MLKitCommon: c1b791c3e667091918d91bda4bba69a91011e390 @@ -182,15 +187,15 @@ SPEC CHECKSUMS: path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 protocol_handler: ae9efcf3b307f3fdffcd9d5252775b9f7d9f0d09 - Sentry: 6f5742b4c47c17c9adcf265f6f328cf4a0ed1923 - sentry_flutter: 2c309a1d4b45e59d02cfa15795705687f1e2081b - SentryPrivate: b2f7996f37781080f04a946eb4e377ff63c64195 + Sentry: 64a9f9c3637af913adcf53deced05bbe452d1410 + sentry_flutter: 57912cf425e09398bdf47f38842a1fcb9836f1be + SentryPrivate: 024c6fed507ac39ae98e6d087034160f942920d5 share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5 shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 sqlite3: 6e2d4a4879854d0ec86b476bf3c3e30870bac273 sqlite3_flutter_libs: eb769059df0356dc52ddda040f09cacc9391a7cf url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b -PODFILE CHECKSUM: 70f411ab18983c65d4dc48b9a20148f13632ec38 +PODFILE CHECKSUM: 367d7a6193b749777e3939af38a774b483fbfab7 -COCOAPODS: 1.14.2 +COCOAPODS: 1.14.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index dce4ac2a..3f355ca7 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -27,13 +27,14 @@ 03E392D02ADDF1BD000ADF15 /* FilePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392CE2ADDEFC8000ADF15 /* FilePath.swift */; }; 03E392D22ADDF1F4000ADF15 /* ExtensionPlatformInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392D12ADDF1F4000ADF15 /* ExtensionPlatformInterface.swift */; }; 03E392D42ADDF262000ADF15 /* Extension+RunBlocking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03E392D32ADDF262000ADF15 /* Extension+RunBlocking.swift */; }; - 073695582B36B248007249BE /* libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; }; + 073695732B39DA23007249BE /* Libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 073695722B39DA23007249BE /* Libcore.xcframework */; }; + 073695782B39DB2B007249BE /* Libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 073695722B39DA23007249BE /* Libcore.xcframework */; }; + 0736957B2B39DE78007249BE /* Libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0736957A2B39DE78007249BE /* Libcore.xcframework */; }; + 0736957C2B39DE78007249BE /* Libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0736957A2B39DE78007249BE /* Libcore.xcframework */; }; 075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */; }; - 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks (2 items) */ = {isa = PBXBuildFile; fileRef = 60F1D4AAC33ACF5C8307310D /* Pods_Runner.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 075637BC2B015864005AFB8E /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03E392B72ADDA00E000ADF15 /* NetworkExtension.framework */; }; 075637BD2B015864005AFB8E /* NetworkExtension.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 03E392B72ADDA00E000ADF15 /* NetworkExtension.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 075637BF2B01588D005AFB8E /* libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; }; - 075637C02B01588D005AFB8E /* libcore.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 075637C12B015899005AFB8E /* libcore.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; }; 075637C22B015899005AFB8E /* libcore.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 075637B22B0157CB005AFB8E /* libcore.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 07A63AD52B1E961E00CAFA4D /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A63AD42B1E961E00CAFA4D /* GeneratedPluginRegistrant.m */; }; @@ -81,7 +82,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 075637C02B01588D005AFB8E /* libcore.xcframework in Embed Frameworks */, 075637BD2B015864005AFB8E /* NetworkExtension.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -98,15 +98,15 @@ name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; }; - 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + 9705A1C41CF9048500538489 /* Embed Frameworks (2 items) */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; dstSubfolderSpec = 10; files = ( - 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks */, + 075637BB2B01583F005AFB8E /* Pods_Runner.framework in Embed Frameworks (2 items) */, ); - name = "Embed Frameworks"; + name = "Embed Frameworks (2 items)"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ @@ -137,6 +137,11 @@ 03E392D32ADDF262000ADF15 /* Extension+RunBlocking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Extension+RunBlocking.swift"; sourceTree = ""; }; 073695362B1FD56C007249BE /* libcore */ = {isa = PBXFileReference; lastKnownFileType = folder; name = libcore; path = ../libcore; sourceTree = ""; }; 0736954E2B1FEB3E007249BE /* mobile_scanner.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = mobile_scanner.xcframework; path = ../build/ios/framework/Release/mobile_scanner.xcframework; sourceTree = ""; }; + 0736955C2B384217007249BE /* libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = libcore.xcframework; sourceTree = ""; }; + 0736956A2B39814F007249BE /* libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcore.xcframework; path = Framework/libcore.xcframework; sourceTree = ""; }; + 0736956E2B3998A2007249BE /* libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcore.xcframework; path = Frameworks/libcore.xcframework; sourceTree = ""; }; + 073695722B39DA23007249BE /* Libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Libcore.xcframework; path = Frameworks/Libcore.xcframework; sourceTree = ""; }; + 0736957A2B39DE78007249BE /* Libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Libcore.xcframework; path = Frameworks/Libcore.xcframework; sourceTree = ""; }; 075637B22B0157CB005AFB8E /* libcore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcore.xcframework; path = ../libcore/bin/libcore.xcframework; sourceTree = ""; }; 07A63A832B1E728C00CAFA4D /* Release */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Release; path = ../build/ios/framework/release; sourceTree = ""; }; 07A63A842B1E72AE00CAFA4D /* App.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = App.xcframework; path = ../build/ios/framework/release/App.xcframework; sourceTree = ""; }; @@ -193,7 +198,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 075637BF2B01588D005AFB8E /* libcore.xcframework in Frameworks */, + 073695782B39DB2B007249BE /* Libcore.xcframework in Frameworks */, + 0736957C2B39DE78007249BE /* Libcore.xcframework in Frameworks */, 075637BC2B015864005AFB8E /* NetworkExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -211,7 +217,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 073695582B36B248007249BE /* libcore.xcframework in Frameworks */, + 073695732B39DA23007249BE /* Libcore.xcframework in Frameworks */, + 0736957B2B39DE78007249BE /* Libcore.xcframework in Frameworks */, 075637BA2B01583F005AFB8E /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -318,6 +325,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( + 0736957A2B39DE78007249BE /* Libcore.xcframework */, 03E392CD2ADDE103000ADF15 /* Shared */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, @@ -360,6 +368,10 @@ B8133545EEE13EDD5549E6A3 /* Frameworks */ = { isa = PBXGroup; children = ( + 073695722B39DA23007249BE /* Libcore.xcframework */, + 0736955C2B384217007249BE /* libcore.xcframework */, + 0736956A2B39814F007249BE /* libcore.xcframework */, + 0736956E2B3998A2007249BE /* libcore.xcframework */, 0736954E2B1FEB3E007249BE /* mobile_scanner.xcframework */, 073695362B1FD56C007249BE /* libcore */, 07A63A932B1E72FB00CAFA4D /* cupertino_http.xcframework */, @@ -446,7 +458,7 @@ 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, + 9705A1C41CF9048500538489 /* Embed Frameworks (2 items) */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, FBEFD3291AEA65EDE2F5AEF6 /* [CP] Embed Pods Frameworks */, ); @@ -466,6 +478,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1500; LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; @@ -864,6 +877,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -908,6 +922,37 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilitiesComponents\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/Sentry\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SentryPrivate\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/cupertino_http\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/flutter_native_splash\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/mobile_scanner\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/package_info_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/path_provider_foundation\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/protocol_handler\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sentry_flutter\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/share_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/shared_preferences_foundation\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sqlite3\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sqlite3_flutter_libs\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/url_launcher_ios\"", + "\"${PODS_ROOT}/MLImage/Frameworks\"", + "\"${PODS_ROOT}/MLKitBarcodeScanning/Frameworks\"", + "\"${PODS_ROOT}/MLKitCommon/Frameworks\"", + "\"${PODS_ROOT}/MLKitVision/Frameworks\"", + "$(PROJECT_DIR)/Flutter", + "$(PROJECT_DIR)/Frameworks", + ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1010,6 +1055,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1070,6 +1116,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1117,6 +1164,37 @@ DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 arm64"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilitiesComponents\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/Sentry\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SentryPrivate\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/cupertino_http\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/flutter_native_splash\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/mobile_scanner\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/package_info_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/path_provider_foundation\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/protocol_handler\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sentry_flutter\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/share_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/shared_preferences_foundation\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sqlite3\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sqlite3_flutter_libs\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/url_launcher_ios\"", + "\"${PODS_ROOT}/MLImage/Frameworks\"", + "\"${PODS_ROOT}/MLKitBarcodeScanning/Frameworks\"", + "\"${PODS_ROOT}/MLKitCommon/Frameworks\"", + "\"${PODS_ROOT}/MLKitVision/Frameworks\"", + "$(PROJECT_DIR)/Flutter", + "$(PROJECT_DIR)/Frameworks", + ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1159,6 +1237,37 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = 3JFTY5BP58; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilitiesComponents\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/Sentry\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SentryPrivate\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/cupertino_http\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/device_info_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/flutter_native_splash\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/mobile_scanner\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/package_info_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/path_provider_foundation\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/protocol_handler\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sentry_flutter\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/share_plus\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/shared_preferences_foundation\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sqlite3\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/sqlite3_flutter_libs\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/url_launcher_ios\"", + "\"${PODS_ROOT}/MLImage/Frameworks\"", + "\"${PODS_ROOT}/MLKitBarcodeScanning/Frameworks\"", + "\"${PODS_ROOT}/MLKitCommon/Frameworks\"", + "\"${PODS_ROOT}/MLKitVision/Frameworks\"", + "$(PROJECT_DIR)/Flutter", + "$(PROJECT_DIR)/Frameworks", + ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/Runner/Handlers/StatusEventHandler.swift b/ios/Runner/Handlers/StatusEventHandler.swift index 26a4f2bb..c696b4ce 100644 --- a/ios/Runner/Handlers/StatusEventHandler.swift +++ b/ios/Runner/Handlers/StatusEventHandler.swift @@ -9,7 +9,7 @@ import Foundation import Combine public class StatusEventHandler: NSObject, FlutterPlugin, FlutterStreamHandler { - static let name = "\(FilePath.packageName)/service.status" + static let name = "com.hiddify.app//service.status" private var channel: FlutterEventChannel? diff --git a/lib/core/directories/directories_provider.dart b/lib/core/directories/directories_provider.dart index 01595726..7e8d16eb 100644 --- a/lib/core/directories/directories_provider.dart +++ b/lib/core/directories/directories_provider.dart @@ -15,7 +15,8 @@ class AppDirectories extends _$AppDirectories with InfraLogger { @override Future build() async { final Directories dirs; - if (Platform.isIOS) { + if (false&&Platform.isIOS) { + final paths = await _methodChannel.invokeMethod("get_paths"); loggy.debug("paths: $paths"); dirs = ( diff --git a/pubspec.lock b/pubspec.lock index b98fcfc0..a9908c75 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: "direct main" description: name: accessibility_tools - sha256: "0a16adc8dfa3a7ebd38775135d86443011a65d4ecbb438913e4992b5d29135fe" + sha256: deca88d9f181ad6fdd12df9c5fa952c763264da14336ca1c0e4124525725b174 url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" analyzer: dependency: transitive description: @@ -101,10 +101,10 @@ packages: dependency: transitive description: name: build_resolvers - sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8" + sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a" url: "https://pub.dev" source: hosted - version: "2.4.1" + version: "2.4.2" build_runner: dependency: "direct dev" description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: built_value - sha256: "69acb7007eb2a31dc901512bfe0f7b767168be34cb734835d54c070bfa74c1b2" + sha256: c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309 url: "https://pub.dev" source: hosted - version: "8.8.0" + version: "8.8.1" characters: dependency: transitive description: @@ -173,10 +173,10 @@ packages: dependency: transitive description: name: cli_util - sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19 url: "https://pub.dev" source: hosted - version: "0.4.0" + version: "0.4.1" clock: dependency: transitive description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: code_builder - sha256: b2151ce26a06171005b379ecff6e08d34c470180ffe16b8e14b6d52be292b55f + sha256: feee43a5c05e7b3199bb375a86430b8ada1b04104f2923d0e03cc01ca87b6d84 url: "https://pub.dev" source: hosted - version: "4.8.0" + version: "4.9.0" collection: dependency: transitive description: @@ -269,10 +269,10 @@ packages: dependency: transitive description: name: cupertino_http - sha256: "93cdb8a3aa8bc71caf62fdaca66e613871a6aa1388c7cd7f39b6366b5d2f5af6" + sha256: b4c900b2bc458965093b60dc9841d3ab43f42e974ce779ef96d8bea56dbd34e0 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" cupertino_icons: dependency: "direct main" description: @@ -357,18 +357,18 @@ packages: dependency: "direct main" description: name: drift - sha256: e27a96acab5686c5b4ae38fbe8a05e76c37411bd15ae35497dac9c404111b5ec + sha256: "05363b695885c72036ed5c76287125bfc6f1deda20cb3aa044a09fe22792f81b" url: "https://pub.dev" source: hosted - version: "2.14.0" + version: "2.14.1" drift_dev: dependency: "direct dev" description: name: drift_dev - sha256: b2f9a29aa4b40379e6836646555dc793d827bfb597a380f3c7d50d2781413472 + sha256: "50c14b8248d133d36b41c1b08ceed138be869b5b98ccaf3af16c9b88c7adc54e" url: "https://pub.dev" source: hosted - version: "2.14.0" + version: "2.14.1" equatable: dependency: transitive description: @@ -495,10 +495,10 @@ packages: dependency: "direct main" description: name: flutter_native_splash - sha256: c4d899312b36e7454bedfd0a4740275837b99e532d81c8477579d8183db1de6c + sha256: "141b20f15a2c4fe6e33c49257ca1bc114fc5c500b04fcbc8d75016bb86af672f" url: "https://pub.dev" source: hosted - version: "2.3.6" + version: "2.3.8" flutter_riverpod: dependency: transitive description: @@ -537,10 +537,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "21bf2825311de65501d22e563e3d7605dff57fb5e6da982db785ae5372ff018a" + sha256: "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba" url: "https://pub.dev" source: hosted - version: "2.4.5" + version: "2.4.6" freezed_annotation: dependency: "direct main" description: @@ -585,18 +585,18 @@ packages: dependency: "direct main" description: name: go_router - sha256: c247a4f76071c3b97bb5ae8912968870d5565644801c5e09f3bc961b4d874895 + sha256: c5fa45fa502ee880839e3b2152d987c44abae26d064a2376d4aad434cf0f7b15 url: "https://pub.dev" source: hosted - version: "12.1.1" + version: "12.1.3" go_router_builder: dependency: "direct dev" description: name: go_router_builder - sha256: a4820cf40c647d674aa9305cdac2eaa6d03a795bb8f6b30c0469939417f7c4d8 + sha256: c1a643f7efafe01ac0a19be5297e414c5f65aede38b83b203f7f420d8c911471 url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.4.0" graphs: dependency: transitive description: @@ -761,10 +761,10 @@ packages: dependency: "direct dev" description: name: lint - sha256: "77b3777e8e9adca8e942da1e835882ae3248dfa00488a2ebbdbc1f1a4aa3f4a7" + sha256: d758a5211fce7fd3f5e316f804daefecdc34c7e53559716125e6da7388ae8565 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.0" logging: dependency: transitive description: @@ -1017,10 +1017,10 @@ packages: dependency: "direct main" description: name: protocol_handler - sha256: be85285f5cdc2541bb5ae5368f1c9924eeaae8d28e74c7235b7cd2c02521d760 + sha256: fb1882bd6cf767114f46b4708d1794fcd662e0a9b9b4512519adeaff3f931d7d url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.1.6" pub_semver: dependency: transitive description: @@ -1145,10 +1145,10 @@ packages: dependency: transitive description: name: sentry - sha256: e7ded42974bac5f69e4ca4ddc57d30499dd79381838f24b7e8fd9aa4139e7b79 + sha256: "89e426587b0879e53c46a0aae0eb312696d9d2d803ba14b252a65cc24b1416a2" url: "https://pub.dev" source: hosted - version: "7.13.2" + version: "7.14.0" sentry_dart_plugin: dependency: "direct main" description: @@ -1161,10 +1161,10 @@ packages: dependency: "direct main" description: name: sentry_flutter - sha256: d6f55ec7a1f681784165021f749007712a72ff57eadf91e963331b6ae326f089 + sha256: fd089ee4e75a927be037c56815a0a54af5a519f52b803a5ffecb589bb36e2401 url: "https://pub.dev" source: hosted - version: "7.13.2" + version: "7.14.0" share_plus: dependency: "direct main" description: @@ -1270,26 +1270,26 @@ packages: dependency: "direct main" description: name: slang - sha256: fe73e995287db77a32ef5a4ab8247bd20adc7a27ba2a4ba373a8132164eba654 + sha256: "77fd99f7b0da15e671ef0289b24a0a63e74f693c58a0ca54111388e4c0ddb1dd" url: "https://pub.dev" source: hosted - version: "3.26.1" + version: "3.28.0" slang_build_runner: dependency: "direct dev" description: name: slang_build_runner - sha256: "72364adbb8d682b48b72402fd67f84e1b62fd96424eae98477a8fe58faec280c" + sha256: "387a3d569da4490b1fffbf31f203021fbfd34f15228d83e14a0f40bc940966fa" url: "https://pub.dev" source: hosted - version: "3.26.1" + version: "3.28.0" slang_flutter: dependency: "direct main" description: name: slang_flutter - sha256: df1d6e5a7237028bcf94f7401d575fdfee8c9ca066b3e9a02acdcd5096e2a25a + sha256: "57817bb15553bb5df37aed3bac497286bdd8c2eab6763f4de6815efe2c0becee" url: "https://pub.dev" source: hosted - version: "3.26.1" + version: "3.28.0" sliver_tools: dependency: "direct main" description: @@ -1310,10 +1310,10 @@ packages: dependency: transitive description: name: source_gen - sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" source_helper: dependency: transitive description: @@ -1342,10 +1342,10 @@ packages: dependency: transitive description: name: sqlite3 - sha256: "8922805564b78eb7aa9386c10056d377a541ac7270dc6a1589176277ebb4d15d" + sha256: c4a4c5a4b2a32e2d0f6837b33d7c91a67903891a5b7dbe706cf4b1f6b0c798c5 url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.3.0" sqlite3_flutter_libs: dependency: "direct main" description: @@ -1502,10 +1502,10 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba + sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86 url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.2" url_launcher_android: dependency: transitive description: @@ -1526,10 +1526,10 @@ packages: dependency: transitive description: name: url_launcher_linux - sha256: "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd" + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" url_launcher_macos: dependency: transitive description: @@ -1550,26 +1550,26 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7" + sha256: "7286aec002c8feecc338cc33269e96b73955ab227456e9fb2a91f7fab8a358e9" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.1" uuid: dependency: "direct main" description: name: uuid - sha256: df5a4d8f22ee4ccd77f8839ac7cb274ebc11ef9adcce8b92be14b797fe889921 + sha256: "22c94e5ad1e75f9934b766b53c742572ee2677c56bc871d850a57dad0f82127f" url: "https://pub.dev" source: hosted - version: "4.2.1" + version: "4.2.2" vclibs: dependency: "direct main" description: