Skip to content

Commit 4dca723

Browse files
joshhealdjoshheald
authored
Merge branch 'trunk' into task/hide-cart-images-when-the-view-is-too-narrow
2 parents 75f3331 + 9c04b30 commit 4dca723

File tree

645 files changed

+57761
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

645 files changed

+57761
-173
lines changed

‎.editorconfig‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
1+
root = true
2+
13
# Apply to all files
24
[*]
5+
indent_style = space
6+
indent_size = 2
37
end_of_line = lf
4-
insert_final_newline = true
8+
charset = utf-8
59
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[*.md]
13+
trim_trailing_whitespace = false
14+
15+
[*.swift]
16+
indent_size = 4
17+
18+
[{*.h,*.m}]
19+
indent_size = 4
620

721
# Ruby specific rules
822
[{*.rb,Fastfile,Gemfile}]

‎Experiments/Experiments.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
attributes = {
212212
BuildIndependentTargetsInParallel = YES;
213213
LastSwiftUpdateCheck = 1250;
214-
LastUpgradeCheck = 1430;
214+
LastUpgradeCheck = 1620;
215215
TargetAttributes = {
216216
0270C08027069A8900FC799F = {
217217
CreatedOnToolsVersion = 12.5.1;
@@ -397,6 +397,7 @@
397397
DEBUG_INFORMATION_FORMAT = dwarf;
398398
ENABLE_STRICT_OBJC_MSGSEND = YES;
399399
ENABLE_TESTABILITY = YES;
400+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
400401
GCC_C_LANGUAGE_STANDARD = gnu11;
401402
GCC_DYNAMIC_NO_PIC = NO;
402403
GCC_NO_COMMON_BLOCKS = YES;
@@ -461,6 +462,7 @@
461462
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
462463
ENABLE_NS_ASSERTIONS = NO;
463464
ENABLE_STRICT_OBJC_MSGSEND = YES;
465+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
464466
GCC_C_LANGUAGE_STANDARD = gnu11;
465467
GCC_NO_COMMON_BLOCKS = YES;
466468
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -546,9 +548,9 @@
546548
isa = XCBuildConfiguration;
547549
baseConfigurationReference = 3022E2766134CE2735C73FC6 /* Pods-ExperimentsTests.debug.xcconfig */;
548550
buildSettings = {
549-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "${inherited}";
550551
CLANG_ENABLE_MODULES = YES;
551552
CODE_SIGN_STYLE = Automatic;
553+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
552554
INFOPLIST_FILE = ExperimentsTests/Info.plist;
553555
LD_RUNPATH_SEARCH_PATHS = (
554556
"$(inherited)",
@@ -567,9 +569,9 @@
567569
isa = XCBuildConfiguration;
568570
baseConfigurationReference = 7C831644164B49828A485590 /* Pods-ExperimentsTests.release.xcconfig */;
569571
buildSettings = {
570-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "${inherited}";
571572
CLANG_ENABLE_MODULES = YES;
572573
CODE_SIGN_STYLE = Automatic;
574+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
573575
INFOPLIST_FILE = ExperimentsTests/Info.plist;
574576
LD_RUNPATH_SEARCH_PATHS = (
575577
"$(inherited)",
@@ -621,6 +623,7 @@
621623
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
622624
ENABLE_NS_ASSERTIONS = NO;
623625
ENABLE_STRICT_OBJC_MSGSEND = YES;
626+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
624627
GCC_C_LANGUAGE_STANDARD = gnu11;
625628
GCC_NO_COMMON_BLOCKS = YES;
626629
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -676,9 +679,9 @@
676679
isa = XCBuildConfiguration;
677680
baseConfigurationReference = 3F9DB5FBFF7A42EFBCB746F3 /* Pods-ExperimentsTests.release-alpha.xcconfig */;
678681
buildSettings = {
679-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "${inherited}";
680682
CLANG_ENABLE_MODULES = YES;
681683
CODE_SIGN_STYLE = Automatic;
684+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
682685
INFOPLIST_FILE = ExperimentsTests/Info.plist;
683686
LD_RUNPATH_SEARCH_PATHS = (
684687
"$(inherited)",

‎Fakes/Fakes.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@
153153
26CA6D1825F6C87800B01F48 /* Project object */ = {
154154
isa = PBXProject;
155155
attributes = {
156-
LastUpgradeCheck = 1240;
156+
BuildIndependentTargetsInParallel = YES;
157+
LastUpgradeCheck = 1620;
157158
TargetAttributes = {
158159
26CA6D2025F6C87800B01F48 = {
159160
CreatedOnToolsVersion = 12.4;
@@ -244,6 +245,7 @@
244245
DEBUG_INFORMATION_FORMAT = dwarf;
245246
ENABLE_STRICT_OBJC_MSGSEND = YES;
246247
ENABLE_TESTABILITY = YES;
248+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
247249
GCC_C_LANGUAGE_STANDARD = gnu11;
248250
GCC_DYNAMIC_NO_PIC = NO;
249251
GCC_NO_COMMON_BLOCKS = YES;
@@ -308,6 +310,7 @@
308310
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
309311
ENABLE_NS_ASSERTIONS = NO;
310312
ENABLE_STRICT_OBJC_MSGSEND = YES;
313+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
311314
GCC_C_LANGUAGE_STANDARD = gnu11;
312315
GCC_NO_COMMON_BLOCKS = YES;
313316
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -338,13 +341,15 @@
338341
DYLIB_COMPATIBILITY_VERSION = 1;
339342
DYLIB_CURRENT_VERSION = 1;
340343
DYLIB_INSTALL_NAME_BASE = "@rpath";
344+
ENABLE_MODULE_VERIFIER = YES;
341345
INFOPLIST_FILE = Fakes/Info.plist;
342346
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
343347
LD_RUNPATH_SEARCH_PATHS = (
344348
"$(inherited)",
345349
"@executable_path/Frameworks",
346350
"@loader_path/Frameworks",
347351
);
352+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
348353
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.Fakes.Fakes;
349354
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
350355
SKIP_INSTALL = YES;
@@ -365,13 +370,15 @@
365370
DYLIB_COMPATIBILITY_VERSION = 1;
366371
DYLIB_CURRENT_VERSION = 1;
367372
DYLIB_INSTALL_NAME_BASE = "@rpath";
373+
ENABLE_MODULE_VERIFIER = YES;
368374
INFOPLIST_FILE = Fakes/Info.plist;
369375
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
370376
LD_RUNPATH_SEARCH_PATHS = (
371377
"$(inherited)",
372378
"@executable_path/Frameworks",
373379
"@loader_path/Frameworks",
374380
);
381+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
375382
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.Fakes.Fakes;
376383
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
377384
SKIP_INSTALL = YES;

‎Gemfile.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ GEM
2626
ast (2.4.2)
2727
atomos (0.1.3)
2828
aws-eventstream (1.3.0)
29-
aws-partitions (1.1040.0)
30-
aws-sdk-core (3.216.0)
29+
aws-partitions (1.1029.0)
30+
aws-sdk-core (3.214.1)
3131
aws-eventstream (~> 1, >= 1.3.0)
3232
aws-partitions (~> 1, >= 1.992.0)
3333
aws-sigv4 (~> 1.9)
3434
jmespath (~> 1, >= 1.6.1)
35-
aws-sdk-kms (1.97.0)
36-
aws-sdk-core (~> 3, >= 3.216.0)
35+
aws-sdk-kms (1.96.0)
36+
aws-sdk-core (~> 3, >= 3.210.0)
3737
aws-sigv4 (~> 1.5)
38-
aws-sdk-s3 (1.178.0)
39-
aws-sdk-core (~> 3, >= 3.216.0)
38+
aws-sdk-s3 (1.176.1)
39+
aws-sdk-core (~> 3, >= 3.210.0)
4040
aws-sdk-kms (~> 1)
4141
aws-sigv4 (~> 1.5)
42-
aws-sigv4 (1.11.0)
42+
aws-sigv4 (1.10.1)
4343
aws-eventstream (~> 1, >= 1.0.2)
4444
babosa (1.0.4)
4545
base64 (0.2.0)
@@ -97,8 +97,8 @@ GEM
9797
colored2 (3.1.2)
9898
commander (4.6.0)
9999
highline (~> 2.0.0)
100-
concurrent-ruby (1.3.5)
101-
connection_pool (2.5.0)
100+
concurrent-ruby (1.3.4)
101+
connection_pool (2.4.1)
102102
cork (0.3.0)
103103
colored2 (~> 3.1)
104104
danger (9.5.1)
@@ -167,7 +167,7 @@ GEM
167167
faraday-retry (1.0.3)
168168
faraday_middleware (1.2.1)
169169
faraday (~> 1.0)
170-
fastimage (2.4.0)
170+
fastimage (2.3.1)
171171
fastlane (2.226.0)
172172
CFPropertyList (>= 2.3, < 4.0.0)
173173
addressable (>= 2.8, < 3.0.0)
@@ -280,7 +280,7 @@ GEM
280280
http-cookie (1.0.8)
281281
domain_name (~> 0.5)
282282
httpclient (2.8.3)
283-
i18n (1.14.7)
283+
i18n (1.14.6)
284284
concurrent-ruby (~> 1.0)
285285
java-properties (0.3.0)
286286
jmespath (1.6.2)
@@ -292,7 +292,7 @@ GEM
292292
kramdown-parser-gfm (1.1.0)
293293
kramdown (~> 2.0)
294294
language_server-protocol (3.17.0.3)
295-
logger (1.6.5)
295+
logger (1.6.4)
296296
mini_magick (4.13.2)
297297
mini_mime (1.1.5)
298298
mini_portile2 (2.8.8)
@@ -305,10 +305,10 @@ GEM
305305
naturally (2.2.1)
306306
netrc (0.11.0)
307307
nkf (0.2.0)
308-
nokogiri (1.18.2)
308+
nokogiri (1.18.1)
309309
mini_portile2 (~> 2.8.2)
310310
racc (~> 1.4)
311-
nokogiri (1.18.2-x86_64-darwin)
311+
nokogiri (1.18.1-x86_64-darwin)
312312
racc (~> 1.4)
313313
octokit (6.1.1)
314314
faraday (>= 1, < 3)
@@ -332,7 +332,7 @@ GEM
332332
rake (12.3.3)
333333
rake-compiler (1.2.9)
334334
rake
335-
rchardet (1.9.0)
335+
rchardet (1.8.0)
336336
regexp_parser (2.9.2)
337337
representable (3.2.0)
338338
declarative (< 0.1.0)
@@ -359,7 +359,7 @@ GEM
359359
ruby-macho (2.5.1)
360360
ruby-progressbar (1.13.0)
361361
ruby2_keywords (0.0.5)
362-
rubyzip (2.4.1)
362+
rubyzip (2.3.2)
363363
sawyer (0.9.2)
364364
addressable (>= 2.3.5)
365365
faraday (>= 0.17.3, < 3)

‎Hardware/Hardware.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@
665665
attributes = {
666666
BuildIndependentTargetsInParallel = YES;
667667
LastSwiftUpdateCheck = 1240;
668-
LastUpgradeCheck = 1430;
668+
LastUpgradeCheck = 1620;
669669
TargetAttributes = {
670670
D88FDAFE25DD216B00CB0DBD = {
671671
CreatedOnToolsVersion = 12.4;
@@ -1003,6 +1003,7 @@
10031003
DEBUG_INFORMATION_FORMAT = dwarf;
10041004
ENABLE_STRICT_OBJC_MSGSEND = YES;
10051005
ENABLE_TESTABILITY = YES;
1006+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
10061007
GCC_C_LANGUAGE_STANDARD = gnu11;
10071008
GCC_DYNAMIC_NO_PIC = NO;
10081009
GCC_NO_COMMON_BLOCKS = YES;
@@ -1068,6 +1069,7 @@
10681069
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10691070
ENABLE_NS_ASSERTIONS = NO;
10701071
ENABLE_STRICT_OBJC_MSGSEND = YES;
1072+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
10711073
GCC_C_LANGUAGE_STANDARD = gnu11;
10721074
GCC_NO_COMMON_BLOCKS = YES;
10731075
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1101,14 +1103,15 @@
11011103
DYLIB_COMPATIBILITY_VERSION = 1;
11021104
DYLIB_CURRENT_VERSION = 1;
11031105
DYLIB_INSTALL_NAME_BASE = "@rpath";
1106+
ENABLE_MODULE_VERIFIER = YES;
11041107
INFOPLIST_FILE = Hardware/Info.plist;
11051108
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1106-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
11071109
LD_RUNPATH_SEARCH_PATHS = (
11081110
"$(inherited)",
11091111
"@executable_path/Frameworks",
11101112
"@loader_path/Frameworks",
11111113
);
1114+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
11121115
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.woo.Hardware;
11131116
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
11141117
SKIP_INSTALL = YES;
@@ -1131,14 +1134,15 @@
11311134
DYLIB_COMPATIBILITY_VERSION = 1;
11321135
DYLIB_CURRENT_VERSION = 1;
11331136
DYLIB_INSTALL_NAME_BASE = "@rpath";
1137+
ENABLE_MODULE_VERIFIER = YES;
11341138
INFOPLIST_FILE = Hardware/Info.plist;
11351139
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1136-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
11371140
LD_RUNPATH_SEARCH_PATHS = (
11381141
"$(inherited)",
11391142
"@executable_path/Frameworks",
11401143
"@loader_path/Frameworks",
11411144
);
1145+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
11421146
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.woo.Hardware;
11431147
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
11441148
SKIP_INSTALL = YES;
@@ -1152,13 +1156,12 @@
11521156
isa = XCBuildConfiguration;
11531157
baseConfigurationReference = 1CC96A71F2937BCB7432766F /* Pods-HardwareTests.debug.xcconfig */;
11541158
buildSettings = {
1155-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "${inherited}";
11561159
CLANG_ENABLE_MODULES = YES;
11571160
CODE_SIGN_IDENTITY = "iPhone Developer";
11581161
CODE_SIGN_STYLE = Automatic;
11591162
DEVELOPMENT_TEAM = PZYM8XX95Q;
1163+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
11601164
INFOPLIST_FILE = HardwareTests/Info.plist;
1161-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
11621165
LD_RUNPATH_SEARCH_PATHS = (
11631166
"$(inherited)",
11641167
"@executable_path/Frameworks",
@@ -1176,13 +1179,12 @@
11761179
isa = XCBuildConfiguration;
11771180
baseConfigurationReference = C61D1642BE09D1A1AD6AA9FA /* Pods-HardwareTests.release.xcconfig */;
11781181
buildSettings = {
1179-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "${inherited}";
11801182
CLANG_ENABLE_MODULES = YES;
11811183
CODE_SIGN_IDENTITY = "iPhone Developer";
11821184
CODE_SIGN_STYLE = Automatic;
11831185
DEVELOPMENT_TEAM = PZYM8XX95Q;
1186+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
11841187
INFOPLIST_FILE = HardwareTests/Info.plist;
1185-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
11861188
LD_RUNPATH_SEARCH_PATHS = (
11871189
"$(inherited)",
11881190
"@executable_path/Frameworks",
@@ -1233,6 +1235,7 @@
12331235
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
12341236
ENABLE_NS_ASSERTIONS = NO;
12351237
ENABLE_STRICT_OBJC_MSGSEND = YES;
1238+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
12361239
GCC_C_LANGUAGE_STANDARD = gnu11;
12371240
GCC_NO_COMMON_BLOCKS = YES;
12381241
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1266,14 +1269,15 @@
12661269
DYLIB_COMPATIBILITY_VERSION = 1;
12671270
DYLIB_CURRENT_VERSION = 1;
12681271
DYLIB_INSTALL_NAME_BASE = "@rpath";
1272+
ENABLE_MODULE_VERIFIER = YES;
12691273
INFOPLIST_FILE = Hardware/Info.plist;
12701274
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1271-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
12721275
LD_RUNPATH_SEARCH_PATHS = (
12731276
"$(inherited)",
12741277
"@executable_path/Frameworks",
12751278
"@loader_path/Frameworks",
12761279
);
1280+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14";
12771281
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.woo.Hardware;
12781282
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
12791283
SKIP_INSTALL = YES;
@@ -1288,13 +1292,12 @@
12881292
isa = XCBuildConfiguration;
12891293
baseConfigurationReference = DB2B86965868C0EC25910D7D /* Pods-HardwareTests.release-alpha.xcconfig */;
12901294
buildSettings = {
1291-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "${inherited}";
12921295
CLANG_ENABLE_MODULES = YES;
12931296
CODE_SIGN_IDENTITY = "iPhone Developer";
12941297
CODE_SIGN_STYLE = Automatic;
12951298
DEVELOPMENT_TEAM = PZYM8XX95Q;
1299+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
12961300
INFOPLIST_FILE = HardwareTests/Info.plist;
1297-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
12981301
LD_RUNPATH_SEARCH_PATHS = (
12991302
"$(inherited)",
13001303
"@executable_path/Frameworks",
@@ -1316,7 +1319,6 @@
13161319
DEVELOPMENT_TEAM = PZYM8XX95Q;
13171320
ENABLE_PREVIEWS = YES;
13181321
INFOPLIST_FILE = SampleReceiptPrinter/Info.plist;
1319-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
13201322
LD_RUNPATH_SEARCH_PATHS = (
13211323
"$(inherited)",
13221324
"@executable_path/Frameworks",
@@ -1337,7 +1339,6 @@
13371339
DEVELOPMENT_TEAM = PZYM8XX95Q;
13381340
ENABLE_PREVIEWS = YES;
13391341
INFOPLIST_FILE = SampleReceiptPrinter/Info.plist;
1340-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
13411342
LD_RUNPATH_SEARCH_PATHS = (
13421343
"$(inherited)",
13431344
"@executable_path/Frameworks",
@@ -1358,7 +1359,6 @@
13581359
DEVELOPMENT_TEAM = PZYM8XX95Q;
13591360
ENABLE_PREVIEWS = YES;
13601361
INFOPLIST_FILE = SampleReceiptPrinter/Info.plist;
1361-
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
13621362
LD_RUNPATH_SEARCH_PATHS = (
13631363
"$(inherited)",
13641364
"@executable_path/Frameworks",

0 commit comments

Comments
 (0)