vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of hiddify-github:hiddify/hiddify-next

Browse Source
This commit is contained in:
hiddify-com
2024-07-27 22:59:10 +02:00
parent 3c8420a3d5 6bcf4f9091
commit 47b5a9788f
2 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
ios/Podfile.lock
View File

@@ -19,23 +19,16 @@ PODS:
- GoogleUtilities/Environment (~> 7.7) - GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30911.0, >= 2.30908.0) - nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2) - PromisesObjC (< 3.0, >= 1.2)
- GoogleMLKit/BarcodeScanning (4.0.0): - GoogleMLKit/BarcodeScanning (6.0.0):
- GoogleMLKit/MLKitCore - GoogleMLKit/MLKitCore
- MLKitBarcodeScanning (~> 3.0.0) - MLKitBarcodeScanning (~> 5.0.0)
- GoogleMLKit/MLKitCore (4.0.0): - GoogleMLKit/MLKitCore (6.0.0):
- MLKitCommon (~> 9.0.0) - MLKitCommon (~> 11.0.0)
- GoogleToolboxForMac/DebugUtils (2.3.2): - GoogleToolboxForMac/Defines (4.2.1)
- GoogleToolboxForMac/Defines (= 2.3.2) - GoogleToolboxForMac/Logger (4.2.1):
- GoogleToolboxForMac/Defines (2.3.2) - GoogleToolboxForMac/Defines (= 4.2.1)
- GoogleToolboxForMac/Logger (2.3.2): - "GoogleToolboxForMac/NSData+zlib (4.2.1)":
- GoogleToolboxForMac/Defines (= 2.3.2) - GoogleToolboxForMac/Defines (= 4.2.1)
- "GoogleToolboxForMac/NSData+zlib (2.3.2)":
- GoogleToolboxForMac/Defines (= 2.3.2)
- "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)":
- GoogleToolboxForMac/DebugUtils (= 2.3.2)
- GoogleToolboxForMac/Defines (= 2.3.2)
- "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
- "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
- GoogleUtilities/Environment (7.13.3): - GoogleUtilities/Environment (7.13.3):
- GoogleUtilities/Privacy - GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2) - PromisesObjC (< 3.0, >= 1.2)
@@ -48,30 +41,29 @@ PODS:
- GoogleUtilities/Privacy - GoogleUtilities/Privacy
- GoogleUtilitiesComponents (1.1.0): - GoogleUtilitiesComponents (1.1.0):
- GoogleUtilities/Logger - GoogleUtilities/Logger
- GTMSessionFetcher/Core (2.3.0) - GTMSessionFetcher/Core (3.5.0)
- in_app_review (0.2.0): - in_app_review (0.2.0):
- Flutter - Flutter
- MLImage (1.0.0-beta4) - MLImage (1.0.0-beta5)
- MLKitBarcodeScanning (3.0.0): - MLKitBarcodeScanning (5.0.0):
- MLKitCommon (~> 9.0) - MLKitCommon (~> 11.0)
- MLKitVision (~> 5.0) - MLKitVision (~> 7.0)
- MLKitCommon (9.0.0): - MLKitCommon (11.0.0):
- GoogleDataTransport (~> 9.0) - GoogleDataTransport (< 10.0, >= 9.4.1)
- GoogleToolboxForMac/Logger (~> 2.1) - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
- "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0)
- GoogleUtilities/UserDefaults (~> 7.0)
- GoogleUtilitiesComponents (~> 1.0) - GoogleUtilitiesComponents (~> 1.0)
- GTMSessionFetcher/Core (< 3.0, >= 1.1) - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
- MLKitVision (5.0.0): - MLKitVision (7.0.0):
- GoogleToolboxForMac/Logger (~> 2.1) - GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)" - "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
- GTMSessionFetcher/Core (< 3.0, >= 1.1) - GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
- MLImage (= 1.0.0-beta4) - MLImage (= 1.0.0-beta5)
- MLKitCommon (~> 9.0) - MLKitCommon (~> 11.0)
- mobile_scanner (3.5.6): - mobile_scanner (5.1.1):
- Flutter - Flutter
- GoogleMLKit/BarcodeScanning (~> 4.0.0) - GoogleMLKit/BarcodeScanning (~> 6.0.0)
- nanopb (2.30910.0): - nanopb (2.30910.0):
- nanopb/decode (= 2.30910.0) - nanopb/decode (= 2.30910.0)
- nanopb/encode (= 2.30910.0) - nanopb/encode (= 2.30910.0)
@@ -200,17 +192,17 @@ SPEC CHECKSUMS:
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
MLImage: 7bb7c4264164ade9bf64f679b40fb29c8f33ee9b MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
MLKitBarcodeScanning: 04e264482c5f3810cb89ebc134ef6b61e67db505 MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b
MLKitCommon: c1b791c3e667091918d91bda4bba69a91011e390 MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
MLKitVision: 8baa5f46ee3352614169b85250574fde38c36f49 MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
mobile_scanner: 38dcd8a49d7d485f632b7de65e4900010187aef2 mobile_scanner: 8564358885a9253c43f822435b70f9345c87224f
nanopb: 438bc412db1928dac798aa6fd75726007be04262 nanopb: 438bc412db1928dac798aa6fd75726007be04262
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85 package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943

18
ios/Runner.xcodeproj/project.pbxproj
View File

@@ -466,6 +466,7 @@
FBEFD3291AEA65EDE2F5AEF6 /* [CP] Embed Pods Frameworks */, FBEFD3291AEA65EDE2F5AEF6 /* [CP] Embed Pods Frameworks */,
97C146EB1CF9000F007C117D /* Frameworks */, 97C146EB1CF9000F007C117D /* Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
738EC814CF019E6FA6F32C6B /* [CP] Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
@@ -599,6 +600,23 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
}; };
738EC814CF019E6FA6F32C6B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = { 9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1; alwaysOutOfDate = 1;