Skip to content

Commit 1737b8e

Browse files
authored
Merge branch 'trunk' into fix/woomob-604-crash-in-order-details-order-item
2 parents dc7f0dc + a54cd3e commit 1737b8e

File tree

878 files changed

+5209
-8072
lines changed

Some content is hidden

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

878 files changed

+5209
-8072
lines changed

.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ excluded:
55
- DerivedData
66
- fastlane
77
- Modules/.build
8+
- Modules/DerivedData
89
- Pods
910
- Scripts
1011
# Automattic's CI caching setup may generate this in the project folder

Fakes/Fakes.xcodeproj/project.pbxproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
26106B3D25FA4F6C0000DF30 /* ProductFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26106B3C25FA4F6C0000DF30 /* ProductFactory.swift */; };
1313
26CA6D2625F6C87800B01F48 /* Fakes.h in Headers */ = {isa = PBXBuildFile; fileRef = 26CA6D2425F6C87800B01F48 /* Fakes.h */; settings = {ATTRIBUTES = (Public, ); }; };
1414
26CA6D2F25F6C8FC00B01F48 /* Fake.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26CA6D2D25F6C8FB00B01F48 /* Fake.swift */; };
15-
26CA6D3625F6C93C00B01F48 /* Networking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26CA6D3525F6C93C00B01F48 /* Networking.framework */; };
1615
26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */; };
1716
26EEDC9026FE1C7B00D5BA0E /* Networking.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */; };
1817
26EEDC9126FE1C7B00D5BA0E /* Yosemite.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */; };
1918
3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */ = {isa = PBXBuildFile; productRef = 3F2B4AC12DDC30B200E5E49C /* XcodeTarget_Fakes */; };
2019
3F37E1232DEEAC7200D8BF2B /* WooFoundationCore.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F37E1222DEEAC7200D8BF2B /* WooFoundationCore.generated.swift */; };
20+
3F38F3742DFA9E0800E0FE41 /* NetworkingCore.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F38F3732DFA9E0800E0FE41 /* NetworkingCore.generated.swift */; };
2121
/* End PBXBuildFile section */
2222

2323
/* Begin PBXCopyFilesBuildPhase section */
@@ -41,12 +41,11 @@
4141
26CA6D2425F6C87800B01F48 /* Fakes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Fakes.h; sourceTree = "<group>"; };
4242
26CA6D2525F6C87800B01F48 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4343
26CA6D2D25F6C8FB00B01F48 /* Fake.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fake.swift; sourceTree = "<group>"; };
44-
26CA6D3325F6C92100B01F48 /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
45-
26CA6D3525F6C93C00B01F48 /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4644
26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Yosemite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4745
26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Networking.generated.swift; sourceTree = "<group>"; };
4846
26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Yosemite.generated.swift; sourceTree = "<group>"; };
4947
3F37E1222DEEAC7200D8BF2B /* WooFoundationCore.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WooFoundationCore.generated.swift; sourceTree = "<group>"; };
48+
3F38F3732DFA9E0800E0FE41 /* NetworkingCore.generated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkingCore.generated.swift; sourceTree = "<group>"; };
5049
3FA7DA002D547F2600CE5611 /* Fakes.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Fakes.xcconfig; sourceTree = "<group>"; };
5150
/* End PBXFileReference section */
5251

@@ -57,7 +56,6 @@
5756
files = (
5857
3F2B4AC22DDC30B200E5E49C /* XcodeTarget_Fakes in Frameworks */,
5958
26EEDC8D26FE1C1C00D5BA0E /* Yosemite.framework in Frameworks */,
60-
26CA6D3625F6C93C00B01F48 /* Networking.framework in Frameworks */,
6159
);
6260
runOnlyForDeploymentPostprocessing = 0;
6361
};
@@ -95,6 +93,7 @@
9593
26CA6D2D25F6C8FB00B01F48 /* Fake.swift */,
9694
02B5147D2825532A00750B71 /* Hardware.generated.swift */,
9795
26EEDC8E26FE1C7B00D5BA0E /* Networking.generated.swift */,
96+
3F38F3732DFA9E0800E0FE41 /* NetworkingCore.generated.swift */,
9897
26EEDC8F26FE1C7B00D5BA0E /* Yosemite.generated.swift */,
9998
20AD34D02B0CD9AF00F38F44 /* WooFoundation.generated.swift */,
10099
3F37E1222DEEAC7200D8BF2B /* WooFoundationCore.generated.swift */,
@@ -110,8 +109,6 @@
110109
isa = PBXGroup;
111110
children = (
112111
26EEDC8C26FE1C1C00D5BA0E /* Yosemite.framework */,
113-
26CA6D3525F6C93C00B01F48 /* Networking.framework */,
114-
26CA6D3325F6C92100B01F48 /* Networking.framework */,
115112
);
116113
name = Frameworks;
117114
sourceTree = "<group>";
@@ -207,6 +204,7 @@
207204
20AD34D12B0CD9AF00F38F44 /* WooFoundation.generated.swift in Sources */,
208205
26106B3D25FA4F6C0000DF30 /* ProductFactory.swift in Sources */,
209206
26EEDC9126FE1C7B00D5BA0E /* Yosemite.generated.swift in Sources */,
207+
3F38F3742DFA9E0800E0FE41 /* NetworkingCore.generated.swift in Sources */,
210208
);
211209
runOnlyForDeploymentPostprocessing = 0;
212210
};

0 commit comments

Comments
 (0)