|
@@ -3,22 +3,19 @@ |
|
@@ -3,22 +3,19 @@ |
|
3
|
archiveVersion = 1;
|
3
|
archiveVersion = 1;
|
|
4
|
classes = {
|
4
|
classes = {
|
|
5
|
};
|
5
|
};
|
|
6
|
-<<<<<<< HEAD
|
|
|
|
7
|
- objectVersion = 50;
|
|
|
|
8
|
-=======
|
|
|
|
9
|
objectVersion = 54;
|
6
|
objectVersion = 54;
|
|
10
|
->>>>>>> v5.4.4+
|
|
|
|
11
|
objects = {
|
7
|
objects = {
|
|
12
|
|
8
|
|
|
13
|
/* Begin PBXBuildFile section */
|
9
|
/* Begin PBXBuildFile section */
|
|
14
|
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
|
10
|
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
|
|
15
|
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
|
11
|
331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
|
|
16
|
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
|
12
|
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
|
|
17
|
- 6BEC6C3B65B04502A3990DE7 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */; };
|
13
|
+ 6BEC6C3B65B04502A3990DE7 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
|
|
18
|
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
|
14
|
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
|
|
19
|
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
|
15
|
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
|
|
20
|
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
|
16
|
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
|
|
21
|
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
|
17
|
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
|
|
|
|
18
|
+ F43B5E1643D7B08CBEDE0996 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB879CCCE79DDF0775A54C78 /* Pods_Runner.framework */; };
|
|
22
|
/* End PBXBuildFile section */
|
19
|
/* End PBXBuildFile section */
|
|
23
|
|
20
|
|
|
24
|
/* Begin PBXContainerItemProxy section */
|
21
|
/* Begin PBXContainerItemProxy section */
|
|
@@ -46,11 +43,14 @@ |
|
@@ -46,11 +43,14 @@ |
|
46
|
|
43
|
|
|
47
|
/* Begin PBXFileReference section */
|
44
|
/* Begin PBXFileReference section */
|
|
48
|
0771EF012D141AE300148DB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
45
|
0771EF012D141AE300148DB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
|
|
|
46
|
+ 0B7799D703DD8BACE322F919 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
|
|
49
|
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
|
47
|
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
|
|
50
|
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
|
48
|
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
|
|
|
|
49
|
+ 2EE724F3105BA47869DC3426 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
|
51
|
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
|
50
|
331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
|
|
52
|
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
51
|
331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
53
|
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
|
52
|
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
|
|
|
|
53
|
+ 4539428762C73A77B8E9D43C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
|
|
54
|
5D2E701D6DE8C4040FECD4E8 /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
|
54
|
5D2E701D6DE8C4040FECD4E8 /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
|
|
55
|
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
|
55
|
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
|
|
56
|
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
56
|
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
|
@@ -61,18 +61,7 @@ |
|
@@ -61,18 +61,7 @@ |
|
61
|
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
61
|
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
|
62
|
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
62
|
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
|
63
|
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
63
|
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
|
64
|
-<<<<<<< HEAD
|
|
|
|
65
|
- 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
|
|
66
|
- CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
|
|
|
67
|
- EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
|
|
|
|
68
|
- EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
|
|
|
|
69
|
-=======
|
|
|
|
70
|
- 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
|
|
|
71
|
- B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
|
|
72
|
- C872893A1BAF0A487B493871 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
|
|
|
|
73
|
- DBDA9A3CA19A8342BD2C8436 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
|
|
|
|
74
|
- FEE980E99826EDF475284386 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
|
|
|
|
75
|
->>>>>>> v5.4.4+
|
64
|
+ AB879CCCE79DDF0775A54C78 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
76
|
/* End PBXFileReference section */
|
65
|
/* End PBXFileReference section */
|
|
77
|
|
66
|
|
|
78
|
/* Begin PBXFrameworksBuildPhase section */
|
67
|
/* Begin PBXFrameworksBuildPhase section */
|
|
@@ -80,7 +69,8 @@ |
|
@@ -80,7 +69,8 @@ |
|
80
|
isa = PBXFrameworksBuildPhase;
|
69
|
isa = PBXFrameworksBuildPhase;
|
|
81
|
buildActionMask = 2147483647;
|
70
|
buildActionMask = 2147483647;
|
|
82
|
files = (
|
71
|
files = (
|
|
83
|
- 6BEC6C3B65B04502A3990DE7 /* Pods_Runner.framework in Frameworks */,
|
72
|
+ 6BEC6C3B65B04502A3990DE7 /* BuildFile in Frameworks */,
|
|
|
|
73
|
+ F43B5E1643D7B08CBEDE0996 /* Pods_Runner.framework in Frameworks */,
|
|
84
|
);
|
74
|
);
|
|
85
|
runOnlyForDeploymentPostprocessing = 0;
|
75
|
runOnlyForDeploymentPostprocessing = 0;
|
|
86
|
};
|
76
|
};
|
|
@@ -90,9 +80,9 @@ |
|
@@ -90,9 +80,9 @@ |
|
90
|
1201D8FB0352809AD89E4634 /* Pods */ = {
|
80
|
1201D8FB0352809AD89E4634 /* Pods */ = {
|
|
91
|
isa = PBXGroup;
|
81
|
isa = PBXGroup;
|
|
92
|
children = (
|
82
|
children = (
|
|
93
|
- C872893A1BAF0A487B493871 /* Pods-Runner.debug.xcconfig */,
|
|
|
|
94
|
- DBDA9A3CA19A8342BD2C8436 /* Pods-Runner.release.xcconfig */,
|
|
|
|
95
|
- FEE980E99826EDF475284386 /* Pods-Runner.profile.xcconfig */,
|
83
|
+ 0B7799D703DD8BACE322F919 /* Pods-Runner.debug.xcconfig */,
|
|
|
|
84
|
+ 4539428762C73A77B8E9D43C /* Pods-Runner.release.xcconfig */,
|
|
|
|
85
|
+ 2EE724F3105BA47869DC3426 /* Pods-Runner.profile.xcconfig */,
|
|
96
|
);
|
86
|
);
|
|
97
|
path = Pods;
|
87
|
path = Pods;
|
|
98
|
sourceTree = "<group>";
|
88
|
sourceTree = "<group>";
|
|
@@ -143,12 +133,7 @@ |
|
@@ -143,12 +133,7 @@ |
|
143
|
97C146FA1CF9000F007C117D /* Main.storyboard */,
|
133
|
97C146FA1CF9000F007C117D /* Main.storyboard */,
|
|
144
|
97C146FD1CF9000F007C117D /* Assets.xcassets */,
|
134
|
97C146FD1CF9000F007C117D /* Assets.xcassets */,
|
|
145
|
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
|
135
|
97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
|
|
146
|
-<<<<<<< HEAD
|
|
|
|
147
|
0771EF012D141AE300148DB8 /* Info.plist */,
|
136
|
0771EF012D141AE300148DB8 /* Info.plist */,
|
|
148
|
- 97C146F11CF9000F007C117D /* Supporting Files */,
|
|
|
|
149
|
-=======
|
|
|
|
150
|
- 97C147021CF9000F007C117D /* Info.plist */,
|
|
|
|
151
|
->>>>>>> v5.4.4+
|
|
|
|
152
|
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
|
137
|
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
|
|
153
|
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
|
138
|
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
|
|
154
|
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
|
139
|
74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
|
|
@@ -161,7 +146,7 @@ |
|
@@ -161,7 +146,7 @@ |
|
161
|
CBA3FC8EF17C231CEC54AC20 /* Frameworks */ = {
|
146
|
CBA3FC8EF17C231CEC54AC20 /* Frameworks */ = {
|
|
162
|
isa = PBXGroup;
|
147
|
isa = PBXGroup;
|
|
163
|
children = (
|
148
|
children = (
|
|
164
|
- B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */,
|
149
|
+ AB879CCCE79DDF0775A54C78 /* Pods_Runner.framework */,
|
|
165
|
);
|
150
|
);
|
|
166
|
name = Frameworks;
|
151
|
name = Frameworks;
|
|
167
|
sourceTree = "<group>";
|
152
|
sourceTree = "<group>";
|
|
@@ -190,7 +175,7 @@ |
|
@@ -190,7 +175,7 @@ |
|
190
|
isa = PBXNativeTarget;
|
175
|
isa = PBXNativeTarget;
|
|
191
|
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
|
176
|
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
|
|
192
|
buildPhases = (
|
177
|
buildPhases = (
|
|
193
|
- 9D6E6C8DDD2621BB8784B52B /* [CP] Check Pods Manifest.lock */,
|
178
|
+ AF30BE9A3D42C7964DF80F15 /* [CP] Check Pods Manifest.lock */,
|
|
194
|
9740EEB61CF901F6004384FC /* Run Script */,
|
179
|
9740EEB61CF901F6004384FC /* Run Script */,
|
|
195
|
97C146EA1CF9000F007C117D /* Sources */,
|
180
|
97C146EA1CF9000F007C117D /* Sources */,
|
|
196
|
97C146EB1CF9000F007C117D /* Frameworks */,
|
181
|
97C146EB1CF9000F007C117D /* Frameworks */,
|
|
@@ -335,123 +320,7 @@ |
|
@@ -335,123 +320,7 @@ |
|
335
|
shellPath = /bin/sh;
|
320
|
shellPath = /bin/sh;
|
|
336
|
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
|
321
|
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
|
|
337
|
};
|
322
|
};
|
|
338
|
-<<<<<<< HEAD
|
|
|
|
339
|
- 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
|
|
|
|
340
|
- isa = PBXShellScriptBuildPhase;
|
|
|
|
341
|
- buildActionMask = 2147483647;
|
|
|
|
342
|
- files = (
|
|
|
|
343
|
- );
|
|
|
|
344
|
- inputPaths = (
|
|
|
|
345
|
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
|
|
|
|
346
|
- "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
|
|
|
|
347
|
- "${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
|
|
|
|
348
|
- "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework",
|
|
|
|
349
|
- "${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
|
|
|
|
350
|
- "${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
|
|
|
|
351
|
- "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
|
|
|
|
352
|
- "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework",
|
|
|
|
353
|
- "${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
|
|
|
|
354
|
- "${BUILT_PRODUCTS_DIR}/TOCropViewController/TOCropViewController.framework",
|
|
|
|
355
|
- "${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
|
|
|
|
356
|
- "${BUILT_PRODUCTS_DIR}/audioplayers_darwin/audioplayers_darwin.framework",
|
|
|
|
357
|
- "${BUILT_PRODUCTS_DIR}/barcode_scan2/barcode_scan2.framework",
|
|
|
|
358
|
- "${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
|
|
|
|
359
|
- "${BUILT_PRODUCTS_DIR}/contacts_service/contacts_service.framework",
|
|
|
|
360
|
- "${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
|
|
|
|
361
|
- "${BUILT_PRODUCTS_DIR}/device_utils_my/device_utils_my.framework",
|
|
|
|
362
|
- "${BUILT_PRODUCTS_DIR}/easy_contact_picker/easy_contact_picker.framework",
|
|
|
|
363
|
- "${BUILT_PRODUCTS_DIR}/flutter_app_badger/flutter_app_badger.framework",
|
|
|
|
364
|
- "${BUILT_PRODUCTS_DIR}/flutter_app_update/flutter_app_update.framework",
|
|
|
|
365
|
- "${BUILT_PRODUCTS_DIR}/flutter_downloader/flutter_downloader.framework",
|
|
|
|
366
|
- "${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework",
|
|
|
|
367
|
- "${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
|
|
|
|
368
|
- "${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework",
|
|
|
|
369
|
- "${BUILT_PRODUCTS_DIR}/flutter_native_image/flutter_native_image.framework",
|
|
|
|
370
|
- "${BUILT_PRODUCTS_DIR}/flutter_sms/flutter_sms.framework",
|
|
|
|
371
|
- "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor_ns/flutter_statusbarcolor_ns.framework",
|
|
|
|
372
|
- "${BUILT_PRODUCTS_DIR}/flutter_wxwork/flutter_wxwork.framework",
|
|
|
|
373
|
- "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
|
|
|
|
374
|
- "${BUILT_PRODUCTS_DIR}/geocoding_ios/geocoding_ios.framework",
|
|
|
|
375
|
- "${BUILT_PRODUCTS_DIR}/geolocator_apple/geolocator_apple.framework",
|
|
|
|
376
|
- "${BUILT_PRODUCTS_DIR}/image_cropper/image_cropper.framework",
|
|
|
|
377
|
- "${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
|
|
|
|
378
|
- "${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
|
|
|
|
379
|
- "${BUILT_PRODUCTS_DIR}/install_plugin/install_plugin.framework",
|
|
|
|
380
|
- "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
|
|
|
|
381
|
- "${BUILT_PRODUCTS_DIR}/open_filex/open_filex.framework",
|
|
|
|
382
|
- "${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
|
|
|
|
383
|
- "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
|
|
|
|
384
|
- "${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
|
|
|
|
385
|
- "${BUILT_PRODUCTS_DIR}/sendsms/sendsms.framework",
|
|
|
|
386
|
- "${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
|
|
|
|
387
|
- "${BUILT_PRODUCTS_DIR}/sign_in_with_apple/sign_in_with_apple.framework",
|
|
|
|
388
|
- "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
|
|
|
|
389
|
- "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
|
|
|
|
390
|
- "${BUILT_PRODUCTS_DIR}/video_compress/video_compress.framework",
|
|
|
|
391
|
- "${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
|
|
|
|
392
|
- "${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
|
|
|
|
393
|
- "${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
|
|
|
|
394
|
- );
|
|
|
|
395
|
- name = "[CP] Embed Pods Frameworks";
|
|
|
|
396
|
- outputPaths = (
|
|
|
|
397
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
|
|
|
|
398
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
|
|
|
|
399
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework",
|
|
|
|
400
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
|
|
|
|
401
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
|
|
|
|
402
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
|
|
|
|
403
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework",
|
|
|
|
404
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
|
|
|
|
405
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TOCropViewController.framework",
|
|
|
|
406
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
|
|
|
|
407
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audioplayers_darwin.framework",
|
|
|
|
408
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan2.framework",
|
|
|
|
409
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
|
|
|
|
410
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/contacts_service.framework",
|
|
|
|
411
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
|
|
|
|
412
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_utils_my.framework",
|
|
|
|
413
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/easy_contact_picker.framework",
|
|
|
|
414
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_badger.framework",
|
|
|
|
415
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_app_update.framework",
|
|
|
|
416
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_downloader.framework",
|
|
|
|
417
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework",
|
|
|
|
418
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
|
|
|
|
419
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework",
|
|
|
|
420
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_native_image.framework",
|
|
|
|
421
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_sms.framework",
|
|
|
|
422
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor_ns.framework",
|
|
|
|
423
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_wxwork.framework",
|
|
|
|
424
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
|
|
|
|
425
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geocoding_ios.framework",
|
|
|
|
426
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geolocator_apple.framework",
|
|
|
|
427
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_cropper.framework",
|
|
|
|
428
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
|
|
|
|
429
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
|
|
|
|
430
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/install_plugin.framework",
|
|
|
|
431
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
|
|
|
|
432
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/open_filex.framework",
|
|
|
|
433
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
|
|
|
|
434
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",
|
|
|
|
435
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
|
|
|
|
436
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sendsms.framework",
|
|
|
|
437
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
|
|
|
|
438
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sign_in_with_apple.framework",
|
|
|
|
439
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
|
|
|
|
440
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
|
|
|
|
441
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_compress.framework",
|
|
|
|
442
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
|
|
|
|
443
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
|
|
|
|
444
|
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
|
|
|
|
445
|
- );
|
|
|
|
446
|
- runOnlyForDeploymentPostprocessing = 0;
|
|
|
|
447
|
- shellPath = /bin/sh;
|
|
|
|
448
|
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
|
|
|
|
449
|
- showEnvVarsInLog = 0;
|
|
|
|
450
|
- };
|
|
|
|
451
|
- 9C09FB22D919B3DDAB7B4DE4 /* [CP] Check Pods Manifest.lock */ = {
|
|
|
|
452
|
-=======
|
|
|
|
453
|
- 9D6E6C8DDD2621BB8784B52B /* [CP] Check Pods Manifest.lock */ = {
|
|
|
|
454
|
->>>>>>> v5.4.4+
|
323
|
+ AF30BE9A3D42C7964DF80F15 /* [CP] Check Pods Manifest.lock */ = {
|
|
455
|
isa = PBXShellScriptBuildPhase;
|
324
|
isa = PBXShellScriptBuildPhase;
|
|
456
|
buildActionMask = 2147483647;
|
325
|
buildActionMask = 2147483647;
|
|
457
|
files = (
|
326
|
files = (
|
|
@@ -473,29 +342,6 @@ |
|
@@ -473,29 +342,6 @@ |
|
473
|
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
342
|
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
|
474
|
showEnvVarsInLog = 0;
|
343
|
showEnvVarsInLog = 0;
|
|
475
|
};
|
344
|
};
|
|
476
|
-<<<<<<< HEAD
|
|
|
|
477
|
- FE822B5E2C661DC46807EEC9 /* [CP] Copy Pods Resources */ = {
|
|
|
|
478
|
- isa = PBXShellScriptBuildPhase;
|
|
|
|
479
|
- buildActionMask = 2147483647;
|
|
|
|
480
|
- files = (
|
|
|
|
481
|
- );
|
|
|
|
482
|
- inputPaths = (
|
|
|
|
483
|
- "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
|
|
|
|
484
|
- "${PODS_ROOT}/AMap3DMap-NO-IDFA/MAMapKit.framework/AMap.bundle",
|
|
|
|
485
|
- "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
|
|
|
|
486
|
- );
|
|
|
|
487
|
- name = "[CP] Copy Pods Resources";
|
|
|
|
488
|
- outputPaths = (
|
|
|
|
489
|
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AMap.bundle",
|
|
|
|
490
|
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
|
|
|
|
491
|
- );
|
|
|
|
492
|
- runOnlyForDeploymentPostprocessing = 0;
|
|
|
|
493
|
- shellPath = /bin/sh;
|
|
|
|
494
|
- shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
|
|
|
|
495
|
- showEnvVarsInLog = 0;
|
|
|
|
496
|
- };
|
|
|
|
497
|
-=======
|
|
|
|
498
|
->>>>>>> v5.4.4+
|
|
|
|
499
|
/* End PBXShellScriptBuildPhase section */
|
345
|
/* End PBXShellScriptBuildPhase section */
|
|
500
|
|
346
|
|
|
501
|
/* Begin PBXSourcesBuildPhase section */
|
347
|
/* Begin PBXSourcesBuildPhase section */
|
|
@@ -614,16 +460,8 @@ |
|
@@ -614,16 +460,8 @@ |
|
614
|
"$(inherited)",
|
460
|
"$(inherited)",
|
|
615
|
"@executable_path/Frameworks",
|
461
|
"@executable_path/Frameworks",
|
|
616
|
);
|
462
|
);
|
|
617
|
-<<<<<<< HEAD
|
|
|
|
618
|
-<<<<<<< HEAD
|
|
|
|
619
|
MARKETING_VERSION = 6.0.0;
|
463
|
MARKETING_VERSION = 6.0.0;
|
|
620
|
-=======
|
|
|
|
621
|
- MARKETING_VERSION = 5.4.3;
|
|
|
|
622
|
->>>>>>> 58718afe (预订安排页人数变更修改)
|
|
|
|
623
|
PODS_ROOT = "$(inherited)";
|
464
|
PODS_ROOT = "$(inherited)";
|
|
624
|
-=======
|
|
|
|
625
|
- MARKETING_VERSION = 5.5.0;
|
|
|
|
626
|
->>>>>>> v5.4.4+
|
|
|
|
627
|
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
|
465
|
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
|
|
628
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
466
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
|
629
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
467
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
|
@@ -800,7 +638,6 @@ |
|
@@ -800,7 +638,6 @@ |
|
800
|
CURRENT_PROJECT_VERSION = 5503;
|
638
|
CURRENT_PROJECT_VERSION = 5503;
|
|
801
|
DEVELOPMENT_TEAM = 8J59HM8B82;
|
639
|
DEVELOPMENT_TEAM = 8J59HM8B82;
|
|
802
|
ENABLE_BITCODE = NO;
|
640
|
ENABLE_BITCODE = NO;
|
|
803
|
-<<<<<<< HEAD
|
|
|
|
804
|
FLUTTER_BUILD_MODE = debug;
|
641
|
FLUTTER_BUILD_MODE = debug;
|
|
805
|
FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
|
642
|
FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
|
|
806
|
FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart";
|
643
|
FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart";
|
|
@@ -808,25 +645,15 @@ |
|
@@ -808,25 +645,15 @@ |
|
808
|
"$(inherited)",
|
645
|
"$(inherited)",
|
|
809
|
"$(PROJECT_DIR)/Flutter",
|
646
|
"$(PROJECT_DIR)/Flutter",
|
|
810
|
);
|
647
|
);
|
|
811
|
-=======
|
|
|
|
812
|
->>>>>>> v5.4.4+
|
|
|
|
813
|
INFOPLIST_FILE = Runner/Info.plist;
|
648
|
INFOPLIST_FILE = Runner/Info.plist;
|
|
814
|
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
|
649
|
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
|
|
815
|
LD_RUNPATH_SEARCH_PATHS = (
|
650
|
LD_RUNPATH_SEARCH_PATHS = (
|
|
816
|
"$(inherited)",
|
651
|
"$(inherited)",
|
|
817
|
"@executable_path/Frameworks",
|
652
|
"@executable_path/Frameworks",
|
|
818
|
);
|
653
|
);
|
|
819
|
-<<<<<<< HEAD
|
|
|
|
820
|
-<<<<<<< HEAD
|
|
|
|
821
|
MARKETING_VERSION = 6.0.0;
|
654
|
MARKETING_VERSION = 6.0.0;
|
|
822
|
-=======
|
|
|
|
823
|
- MARKETING_VERSION = 5.4.3;
|
|
|
|
824
|
->>>>>>> 58718afe (预订安排页人数变更修改)
|
|
|
|
825
|
PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
|
655
|
PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
|
|
826
|
PODS_ROOT = "$(inherited)";
|
656
|
PODS_ROOT = "$(inherited)";
|
|
827
|
-=======
|
|
|
|
828
|
- MARKETING_VERSION = 5.5.0;
|
|
|
|
829
|
->>>>>>> v5.4.4+
|
|
|
|
830
|
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
|
657
|
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
|
|
831
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
658
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
|
832
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
659
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
|
@@ -852,16 +679,8 @@ |
|
@@ -852,16 +679,8 @@ |
|
852
|
"$(inherited)",
|
679
|
"$(inherited)",
|
|
853
|
"@executable_path/Frameworks",
|
680
|
"@executable_path/Frameworks",
|
|
854
|
);
|
681
|
);
|
|
855
|
-<<<<<<< HEAD
|
|
|
|
856
|
-<<<<<<< HEAD
|
|
|
|
857
|
MARKETING_VERSION = 6.0.0;
|
682
|
MARKETING_VERSION = 6.0.0;
|
|
858
|
-=======
|
|
|
|
859
|
- MARKETING_VERSION = 5.4.3;
|
|
|
|
860
|
->>>>>>> 58718afe (预订安排页人数变更修改)
|
|
|
|
861
|
PODS_ROOT = "$(inherited)";
|
683
|
PODS_ROOT = "$(inherited)";
|
|
862
|
-=======
|
|
|
|
863
|
- MARKETING_VERSION = 5.5.0;
|
|
|
|
864
|
->>>>>>> v5.4.4+
|
|
|
|
865
|
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
|
684
|
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
|
|
866
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
685
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
|
867
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
686
|
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
