Skip to content

Commit 5060a41

Browse files
author
WooSignal
committed
Xcode 11.4 support, tweaks for Flutter update
1 parent 73129ae commit 5060a41

File tree

5 files changed

+7
-203
lines changed

5 files changed

+7
-203
lines changed

‎LabelStoreMax/ios/Podfile‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎LabelStoreMax/ios/Podfile.lock‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1713
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1814
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1915
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -28,8 +24,6 @@
2824
dstPath = "";
2925
dstSubfolderSpec = 10;
3026
files = (
31-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
32-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3327
);
3428
name = "Embed Frameworks";
3529
runOnlyForDeploymentPostprocessing = 0;
@@ -41,15 +35,13 @@
4135
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4236
1BA921103C32B79944361E71 /* 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>"; };
4337
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
44-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4538
41358261A3745FB464B72CE9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4639
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4740
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4841
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4942
87F77F819B61E54C61672D11 /* 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>"; };
5043
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5144
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
52-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5345
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5446
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5547
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -63,8 +55,6 @@
6355
isa = PBXFrameworksBuildPhase;
6456
buildActionMask = 2147483647;
6557
files = (
66-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
67-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
6858
D86A9FCC0FDE40E749D2F6CC /* Pods_Runner.framework in Frameworks */,
6959
);
7060
runOnlyForDeploymentPostprocessing = 0;
@@ -83,9 +73,7 @@
8373
9740EEB11CF90186004384FC /* Flutter */ = {
8474
isa = PBXGroup;
8575
children = (
86-
3B80C3931E831B6300D905FE /* App.framework */,
8776
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
88-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
8977
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9078
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
9179
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -181,6 +169,7 @@
181169
TargetAttributes = {
182170
97C146ED1CF9000F007C117D = {
183171
CreatedOnToolsVersion = 7.3.1;
172+
DevelopmentTeam = YPEM49WRL2;
184173
LastSwiftMigration = 0910;
185174
};
186175
};
@@ -231,7 +220,7 @@
231220
);
232221
runOnlyForDeploymentPostprocessing = 0;
233222
shellPath = /bin/sh;
234-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
223+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed\n/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin\n";
235224
};
236225
7A4371A0EF7EDBC9E03FB2D7 /* [CP] Check Pods Manifest.lock */ = {
237226
isa = PBXShellScriptBuildPhase;
@@ -267,7 +256,7 @@
267256
);
268257
runOnlyForDeploymentPostprocessing = 0;
269258
shellPath = /bin/sh;
270-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
259+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
271260
};
272261
C10A9485E174060F4694B3D0 /* [CP] Embed Pods Frameworks */ = {
273262
isa = PBXShellScriptBuildPhase;
@@ -375,7 +364,7 @@
375364
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
376365
CLANG_ENABLE_MODULES = YES;
377366
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
378-
DEVELOPMENT_TEAM = "";
367+
DEVELOPMENT_TEAM = YPEM49WRL2;
379368
ENABLE_BITCODE = NO;
380369
FRAMEWORK_SEARCH_PATHS = (
381370
"$(inherited)",
@@ -511,7 +500,7 @@
511500
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
512501
CLANG_ENABLE_MODULES = YES;
513502
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
514-
DEVELOPMENT_TEAM = "";
503+
DEVELOPMENT_TEAM = YPEM49WRL2;
515504
ENABLE_BITCODE = NO;
516505
FRAMEWORK_SEARCH_PATHS = (
517506
"$(inherited)",
@@ -541,7 +530,7 @@
541530
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
542531
CLANG_ENABLE_MODULES = YES;
543532
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
544-
DEVELOPMENT_TEAM = "";
533+
DEVELOPMENT_TEAM = YPEM49WRL2;
545534
ENABLE_BITCODE = NO;
546535
FRAMEWORK_SEARCH_PATHS = (
547536
"$(inherited)",

‎LabelStoreMax/lib/helpers/lifecycle_event_handler.dart‎

Whitespace-only changes.

‎LabelStoreMax/lib/helpers/tools.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Future<double> workoutShippingCostWC({@required String sum}) async {
281281
Future<double> workoutShippingClassCostWC(
282282
{@required String sum, List<CartLineItem> cartLineItem}) async {
283283
sum = sum.replaceAllMapped(defaultRegex(r'\[qty\]', strict: true), (replace) {
284-
return cartLineItem.length.toString();
284+
return cartLineItem.map((f) => f.quantity).toList().reduce((i,d) => i+d).toString();
285285
});
286286

287287
String orderTotal = await Cart.getInstance.getSubtotal();

0 commit comments

Comments
 (0)