Skip to content

Commit d2e05d5

Browse files
jaclyncjaclync
committed
Merge branch 'trunk' into feat/WOOMOB-140-fix-blurry-payment-method-icons
# Conflicts: # Podfile.lock
2 parents 06eaa51 + e6bdcbb commit d2e05d5

File tree

563 files changed

+2050
-3522
lines changed

Some content is hidden

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

563 files changed

+2050
-3522
lines changed

‎Experiments/Experiments.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
0270C0A327069B7800FC799F /* FeatureFlagService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0270C0A227069B7800FC799F /* FeatureFlagService.swift */; };
1414
0270C0A527069B8900FC799F /* DefaultFeatureFlagService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0270C0A427069B8900FC799F /* DefaultFeatureFlagService.swift */; };
1515
0270C0A727069BA500FC799F /* BuildConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0270C0A627069BA500FC799F /* BuildConfiguration.swift */; };
16-
3F8115032DD2A6EC0042DDB6 /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = 3F8115022DD2A6EC0042DDB6 /* AutomatticTracks */; };
16+
3F2B4ACA2DDC30E000E5E49C /* XcodeTarget_Experiments in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC92DDC30E000E5E49C /* XcodeTarget_Experiments */; };
17+
3F2B4ACC2DDC30E800E5E49C /* XcodeTarget_ExperimentsTests in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4ACB2DDC30E800E5E49C /* XcodeTarget_ExperimentsTests */; };
1718
3F8B84192DD2FEC2002DD6E8 /* Experiments.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 3F8B84182DD2FEC2002DD6E8 /* Experiments.xctestplan */; };
18-
3F8B841B2DD301C6002DD6E8 /* AutomatticTracks in Frameworks */ = {isa = PBXBuildFile; productRef = 3F8B841A2DD301C6002DD6E8 /* AutomatticTracks */; };
1919
CC53FB48275E426900C4CA4F /* ABTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC53FB47275E426900C4CA4F /* ABTest.swift */; };
2020
EE2EDFDF29879331004E702B /* ABTestVariationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE2EDFDE29879331004E702B /* ABTestVariationProvider.swift */; };
2121
EEC8C0ED298A92F10047B4CB /* CachedABTestVariationProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEC8C0EC298A92F10047B4CB /* CachedABTestVariationProvider.swift */; };
@@ -61,16 +61,16 @@
6161
isa = PBXFrameworksBuildPhase;
6262
buildActionMask = 2147483647;
6363
files = (
64-
3F8115032DD2A6EC0042DDB6 /* AutomatticTracks in Frameworks */,
64+
3F2B4ACA2DDC30E000E5E49C /* XcodeTarget_Experiments in Frameworks */,
6565
);
6666
runOnlyForDeploymentPostprocessing = 0;
6767
};
6868
0270C08727069A8900FC799F /* Frameworks */ = {
6969
isa = PBXFrameworksBuildPhase;
7070
buildActionMask = 2147483647;
7171
files = (
72+
3F2B4ACC2DDC30E800E5E49C /* XcodeTarget_ExperimentsTests in Frameworks */,
7273
0270C08B27069A8900FC799F /* Experiments.framework in Frameworks */,
73-
3F8B841B2DD301C6002DD6E8 /* AutomatticTracks in Frameworks */,
7474
);
7575
runOnlyForDeploymentPostprocessing = 0;
7676
};
@@ -222,9 +222,6 @@
222222
Base,
223223
);
224224
mainGroup = 0270C07727069A8900FC799F;
225-
packageReferences = (
226-
3F8115012DD2A6EC0042DDB6 /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */,
227-
);
228225
productRefGroup = 0270C08227069A8900FC799F /* Products */;
229226
projectDirPath = "";
230227
projectRoot = "";
@@ -654,27 +651,14 @@
654651
};
655652
/* End XCConfigurationList section */
656653

657-
/* Begin XCRemoteSwiftPackageReference section */
658-
3F8115012DD2A6EC0042DDB6 /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */ = {
659-
isa = XCRemoteSwiftPackageReference;
660-
repositoryURL = "https://github.com/Automattic/Automattic-Tracks-iOS";
661-
requirement = {
662-
kind = upToNextMajorVersion;
663-
minimumVersion = 3.5.2;
664-
};
665-
};
666-
/* End XCRemoteSwiftPackageReference section */
667-
668654
/* Begin XCSwiftPackageProductDependency section */
669-
3F8115022DD2A6EC0042DDB6 /* AutomatticTracks */ = {
655+
3F2B4AC92DDC30E000E5E49C /* XcodeTarget_Experiments */ = {
670656
isa = XCSwiftPackageProductDependency;
671-
package = 3F8115012DD2A6EC0042DDB6 /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */;
672-
productName = AutomatticTracks;
657+
productName = XcodeTarget_Experiments;
673658
};
674-
3F8B841A2DD301C6002DD6E8 /* AutomatticTracks */ = {
659+
3F2B4ACB2DDC30E800E5E49C /* XcodeTarget_ExperimentsTests */ = {
675660
isa = XCSwiftPackageProductDependency;
676-
package = 3F8115012DD2A6EC0042DDB6 /* XCRemoteSwiftPackageReference "Automattic-Tracks-iOS" */;
677-
productName = AutomatticTracks;
661+
productName = XcodeTarget_ExperimentsTests;
678662
};
679663
/* End XCSwiftPackageProductDependency section */
680664
};

‎Fakes/Fakes.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
02B5147E2825532A00750B71 /* Hardware.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B5147D2825532A00750B71 /* Hardware.generated.swift */; };
1111
20AD34D12B0CD9AF00F38F44 /* WooFoundation.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20AD34D02B0CD9AF00F38F44 /* WooFoundation.generated.swift */; };
1212
26106B3D25FA4F6C0000DF30 /* ProductFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26106B3C25FA4F6C0000DF30 /* ProductFactory.swift */; };
13-
263E383C2641FED600260D3B /* Codegen in Frameworks */ = {isa = PBXBuildFile; productRef = 263E383B2641FED600260D3B /* Codegen */; };
1413
26CA6D2625F6C87800B01F48 /* Fakes.h in Headers */ = {isa = PBXBuildFile; fileRef = 26CA6D2425F6C87800B01F48 /* Fakes.h */; settings = {ATTRIBUTES = (Public, ); }; };
1514
26CA6D2F25F6C8FC00B01F48 /* Fake.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CA6D2D25F6C8FB00B01F48 /* Fake.swift */; };
1615
26CA6D3625F6C93C00B01F48 /* Networking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26CA6D3525F6C93C00B01F48 /* Networking.framework */; };
1716
26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */; };
1817
26EEDC9026FE1C7B00D5BA0E /* Networking.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */; };
1918
26EEDC9126FE1C7B00D5BA0E /* Yosemite.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */; };
19+
3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC12DDC30B200E5E49C /* XcodeTarget_Fakes */; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXCopyFilesBuildPhase section */
@@ -53,9 +53,9 @@
5353
isa = PBXFrameworksBuildPhase;
5454
buildActionMask = 2147483647;
5555
files = (
56+
3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */,
5657
26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */,
5758
26CA6D3625F6C93C00B01F48 /* Networking.framework in Frameworks */,
58-
263E383C2641FED600260D3B /* Codegen in Frameworks */,
5959
);
6060
runOnlyForDeploymentPostprocessing = 0;
6161
};
@@ -143,7 +143,7 @@
143143
);
144144
name = Fakes;
145145
packageProductDependencies = (
146-
263E383B2641FED600260D3B /* Codegen */,
146+
3F2B4AC12DDC30B200E5E49C /* XcodeTarget_Fakes */,
147147
);
148148
productName = Fakes;
149149
productReference = 26CA6D2125F6C87800B01F48 /* Fakes.framework */;
@@ -414,9 +414,9 @@
414414
/* End XCConfigurationList section */
415415

416416
/* Begin XCSwiftPackageProductDependency section */
417-
263E383B2641FED600260D3B /* Codegen */ = {
417+
3F2B4AC12DDC30B200E5E49C /* XcodeTarget_Fakes */ = {
418418
isa = XCSwiftPackageProductDependency;
419-
productName = Codegen;
419+
productName = XcodeTarget_Fakes;
420420
};
421421
/* End XCSwiftPackageProductDependency section */
422422
};

‎Hardware/Hardware.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
019A77CA2D88645100ABBB71 /* PaymentMethodType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 019A77C92D88645100ABBB71 /* PaymentMethodType.swift */; };
1111
028C39E028255CFE0007BA25 /* Models+Copiable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 028C39DF28255CFE0007BA25 /* Models+Copiable.generated.swift */; };
12-
02B5147A28254ED300750B71 /* Codegen in Frameworks */ = {isa = PBXBuildFile; productRef = 02B5147928254ED300750B71 /* Codegen */; };
1312
02FDAB102CEEF11F00B6C8AA /* PaymentChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FDAB0F2CEEF11D00B6C8AA /* PaymentChannel.swift */; };
1413
030338102705F7D400764131 /* ReceiptTotalLine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0303380F2705F7D400764131 /* ReceiptTotalLine.swift */; };
1514
035DBA3929251ED6003E5125 /* CardReaderInputOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 035DBA3829251ED6003E5125 /* CardReaderInputOptions.swift */; };
@@ -28,7 +27,9 @@
2827
317975C0274EB1F9004357B1 /* DeclineReason.swift in Sources */ = {isa = PBXBuildFile; fileRef = 317975BF274EB1F9004357B1 /* DeclineReason.swift */; };
2928
317975C2274EBC1F004357B1 /* DeclineReason+Stripe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 317975C1274EBC1F004357B1 /* DeclineReason+Stripe.swift */; };
3029
317975C4274ED591004357B1 /* DeclineReasonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 317975C3274ED591004357B1 /* DeclineReasonTests.swift */; };
31-
3FF80E3B2DD322880049E028 /* CocoaLumberjackSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF80E3A2DD322880049E028 /* CocoaLumberjackSwift */; };
30+
3F2B4AC42DDC30C300E5E49C /* XcodeTarget_Hardware in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC32DDC30C300E5E49C /* XcodeTarget_Hardware */; };
31+
3F2B4AC62DDC30D000E5E49C /* XcodeTarget_HardwareTests in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC52DDC30D000E5E49C /* XcodeTarget_HardwareTests */; };
32+
3F2B4AC82DDC30D800E5E49C /* XcodeTarget_SampleReceiptPrinter in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC72DDC30D800E5E49C /* XcodeTarget_SampleReceiptPrinter */; };
3233
55CD4BB4273E617C007686D3 /* ReceiptRendererTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55CD4BB3273E617C007686D3 /* ReceiptRendererTest.swift */; };
3334
5A747BE9FA06EC8752A35752 /* Pods_HardwareTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B1DC5B6141B8184FAC29B0A4 /* Pods_HardwareTests.framework */; };
3435
8FFAA245E257B9EB98E2FCBD /* Pods_SampleReceiptPrinter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AFA997D6786C67B0A061854 /* Pods_SampleReceiptPrinter.framework */; };
@@ -292,16 +293,16 @@
292293
isa = PBXFrameworksBuildPhase;
293294
buildActionMask = 2147483647;
294295
files = (
295-
02B5147A28254ED300750B71 /* Codegen in Frameworks */,
296296
C5D2CB7D21CEE28FEBF18BF6 /* Pods_Hardware.framework in Frameworks */,
297-
3FF80E3B2DD322880049E028 /* CocoaLumberjackSwift in Frameworks */,
297+
3F2B4AC42DDC30C300E5E49C /* XcodeTarget_Hardware in Frameworks */,
298298
);
299299
runOnlyForDeploymentPostprocessing = 0;
300300
};
301301
D88FDB0525DD216B00CB0DBD /* Frameworks */ = {
302302
isa = PBXFrameworksBuildPhase;
303303
buildActionMask = 2147483647;
304304
files = (
305+
3F2B4AC62DDC30D000E5E49C /* XcodeTarget_HardwareTests in Frameworks */,
305306
D88FDB0925DD216B00CB0DBD /* Hardware.framework in Frameworks */,
306307
5A747BE9FA06EC8752A35752 /* Pods_HardwareTests.framework in Frameworks */,
307308
);
@@ -311,6 +312,7 @@
311312
isa = PBXFrameworksBuildPhase;
312313
buildActionMask = 2147483647;
313314
files = (
315+
3F2B4AC82DDC30D800E5E49C /* XcodeTarget_SampleReceiptPrinter in Frameworks */,
314316
E1CFC16D2643EBCB0089F86F /* Hardware.framework in Frameworks */,
315317
8FFAA245E257B9EB98E2FCBD /* Pods_SampleReceiptPrinter.framework in Frameworks */,
316318
);
@@ -617,8 +619,7 @@
617619
);
618620
name = Hardware;
619621
packageProductDependencies = (
620-
02B5147928254ED300750B71 /* Codegen */,
621-
3FF80E3A2DD322880049E028 /* CocoaLumberjackSwift */,
622+
3F2B4AC32DDC30C300E5E49C /* XcodeTarget_Hardware */,
622623
);
623624
productName = Hardware;
624625
productReference = D88FDAFF25DD216B00CB0DBD /* Hardware.framework */;
@@ -698,7 +699,6 @@
698699
);
699700
mainGroup = D88FDAF525DD216B00CB0DBD;
700701
packageReferences = (
701-
3FF80E392DD322880049E028 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */,
702702
);
703703
productRefGroup = D88FDB0025DD216B00CB0DBD /* Products */;
704704
projectDirPath = "";
@@ -1427,26 +1427,18 @@
14271427
};
14281428
/* End XCConfigurationList section */
14291429

1430-
/* Begin XCRemoteSwiftPackageReference section */
1431-
3FF80E392DD322880049E028 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */ = {
1432-
isa = XCRemoteSwiftPackageReference;
1433-
repositoryURL = "https://github.com/CocoaLumberjack/CocoaLumberjack";
1434-
requirement = {
1435-
kind = upToNextMajorVersion;
1436-
minimumVersion = 3.8.5;
1437-
};
1438-
};
1439-
/* End XCRemoteSwiftPackageReference section */
1440-
14411430
/* Begin XCSwiftPackageProductDependency section */
1442-
02B5147928254ED300750B71 /* Codegen */ = {
1431+
3F2B4AC32DDC30C300E5E49C /* XcodeTarget_Hardware */ = {
1432+
isa = XCSwiftPackageProductDependency;
1433+
productName = XcodeTarget_Hardware;
1434+
};
1435+
3F2B4AC52DDC30D000E5E49C /* XcodeTarget_HardwareTests */ = {
14431436
isa = XCSwiftPackageProductDependency;
1444-
productName = Codegen;
1437+
productName = XcodeTarget_HardwareTests;
14451438
};
1446-
3FF80E3A2DD322880049E028 /* CocoaLumberjackSwift */ = {
1439+
3F2B4AC72DDC30D800E5E49C /* XcodeTarget_SampleReceiptPrinter */ = {
14471440
isa = XCSwiftPackageProductDependency;
1448-
package = 3FF80E392DD322880049E028 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */;
1449-
productName = CocoaLumberjackSwift;
1441+
productName = XcodeTarget_SampleReceiptPrinter;
14501442
};
14511443
/* End XCSwiftPackageProductDependency section */
14521444
};

‎Modules/.swiftpm/xcode/xcshareddata/xcschemes/Codegen.xcscheme‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1630"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "Codegen"
19+
BuildableName = "Codegen"
20+
BlueprintName = "Codegen"
21+
ReferencedContainer = "container:">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "Codegen"
54+
BuildableName = "Codegen"
55+
BlueprintName = "Codegen"
56+
ReferencedContainer = "container:">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

0 commit comments

Comments
 (0)