Skip to content

Commit 1b4ba98

Browse files
jleandroperezjleandroperez
authored
Merge pull request #127 from woocommerce/issue/project-cleanup
Project Cleanup
2 parents e6b98cf + 2341473 commit 1b4ba98

File tree

6 files changed

+28
-61
lines changed

6 files changed

+28
-61
lines changed

‎Networking/Networking.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@
221221
B557DA0520975507005962F4 /* Remote */,
222222
B557DA1020975F60005962F4 /* Settings */,
223223
B505F6EB20BEFD9100BB1B69 /* Tools */,
224-
CE60505720D9A99C00A74DD6 /* Utilities */,
225224
B557D9E6209753AA005962F4 /* Networking.h */,
226225
B557D9E7209753AA005962F4 /* Info.plist */,
227226
);
@@ -343,13 +342,6 @@
343342
name = Pods;
344343
sourceTree = "<group>";
345344
};
346-
CE60505720D9A99C00A74DD6 /* Utilities */ = {
347-
isa = PBXGroup;
348-
children = (
349-
);
350-
path = Utilities;
351-
sourceTree = "<group>";
352-
};
353345
/* End PBXGroup section */
354346

355347
/* Begin PBXHeadersBuildPhase section */

‎Storage/Storage.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@
157157
B54CA5BE20A4BD9A00F38CD1 /* Extensions */,
158158
B59E11D720A9CFF3004121A4 /* Model */,
159159
B505F6DC20BEEA4F00BB1B69 /* CoreData */,
160-
CE60505820D9A9BC00A74DD6 /* Utilities */,
161160
B54CA59C20A4BBA500F38CD1 /* Storage.h */,
162161
B54CA59D20A4BBA600F38CD1 /* Info.plist */,
163162
);
@@ -222,13 +221,6 @@
222221
path = CoreData;
223222
sourceTree = "<group>";
224223
};
225-
CE60505820D9A9BC00A74DD6 /* Utilities */ = {
226-
isa = PBXGroup;
227-
children = (
228-
);
229-
path = Utilities;
230-
sourceTree = "<group>";
231-
};
232224
/* End PBXGroup section */
233225

234226
/* Begin PBXHeadersBuildPhase section */

‎WooCommerce/Resources/WooCommerce.xcdatamodeld/.xccurrentversion‎

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

‎WooCommerce/Resources/WooCommerce.xcdatamodeld/WooCommerce.xcdatamodel/contents‎

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

‎WooCommerce/WooCommerce.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
B55D4C2720B717C000D7A50F /* UserAgent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B55D4C2620B717C000D7A50F /* UserAgent.swift */; };
4141
B56DB3CA2049BFAA00D4AA8E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56DB3C92049BFAA00D4AA8E /* AppDelegate.swift */; };
4242
B56DB3CF2049BFAA00D4AA8E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B56DB3CD2049BFAA00D4AA8E /* Main.storyboard */; };
43-
B56DB3D22049BFAA00D4AA8E /* WooCommerce.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B56DB3D02049BFAA00D4AA8E /* WooCommerce.xcdatamodeld */; };
4443
B56DB3D42049BFAA00D4AA8E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B56DB3D32049BFAA00D4AA8E /* Assets.xcassets */; };
4544
B56DB3D72049BFAA00D4AA8E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B56DB3D52049BFAA00D4AA8E /* LaunchScreen.storyboard */; };
4645
B5A8F8A920B84D3F00D211DE /* ApiCredentials.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A8F8A720B84D3F00D211DE /* ApiCredentials.swift */; };
@@ -161,7 +160,6 @@
161160
B56DB3C62049BFAA00D4AA8E /* WooCommerce.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WooCommerce.app; sourceTree = BUILT_PRODUCTS_DIR; };
162161
B56DB3C92049BFAA00D4AA8E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
163162
B56DB3CE2049BFAA00D4AA8E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
164-
B56DB3D12049BFAA00D4AA8E /* WooCommerce.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WooCommerce.xcdatamodel; sourceTree = "<group>"; };
165163
B56DB3D32049BFAA00D4AA8E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
166164
B56DB3D62049BFAA00D4AA8E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
167165
B56DB3D82049BFAA00D4AA8E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -395,7 +393,6 @@
395393
B56DB3D52049BFAA00D4AA8E /* LaunchScreen.storyboard */,
396394
B59F38DF20D40A24008C1829 /* WooCommerce.debug.entitlements */,
397395
B59F38E020D40A24008C1829 /* WooCommerce.release.entitlements */,
398-
B56DB3D02049BFAA00D4AA8E /* WooCommerce.xcdatamodeld */,
399396
CEE005FF2077CA5A0079161F /* fake data */,
400397
);
401398
path = Resources;
@@ -849,7 +846,6 @@
849846
CE1F51272064345B00C6C810 /* UIColor+Helpers.swift in Sources */,
850847
CE1EC8CA20B479F1009762BF /* TwoColumnLabelView.swift in Sources */,
851848
CE263DE8206ACE3E0015A693 /* MainTabBarController.swift in Sources */,
852-
B56DB3D22049BFAA00D4AA8E /* WooCommerce.xcdatamodeld in Sources */,
853849
CE1EC8EC20B8A3FF009762BF /* AddItemTableViewCell.swift in Sources */,
854850
B50911342049E493007D25DC /* Order.swift in Sources */,
855851
B5D1AFBA20BC515600DB0E8C /* UIColor+Woo.swift in Sources */,
@@ -1166,19 +1162,6 @@
11661162
defaultConfigurationName = Release;
11671163
};
11681164
/* End XCConfigurationList section */
1169-
1170-
/* Begin XCVersionGroup section */
1171-
B56DB3D02049BFAA00D4AA8E /* WooCommerce.xcdatamodeld */ = {
1172-
isa = XCVersionGroup;
1173-
children = (
1174-
B56DB3D12049BFAA00D4AA8E /* WooCommerce.xcdatamodel */,
1175-
);
1176-
currentVersion = B56DB3D12049BFAA00D4AA8E /* WooCommerce.xcdatamodel */;
1177-
path = WooCommerce.xcdatamodeld;
1178-
sourceTree = "<group>";
1179-
versionGroupType = wrapper.xcdatamodel;
1180-
};
1181-
/* End XCVersionGroup section */
11821165
};
11831166
rootObject = B56DB3BE2049BFAA00D4AA8E /* Project object */;
11841167
}

‎Yosemite/Yosemite.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
B546CCF22093636A007CDA5F /* Yosemite.h in Headers */ = {isa = PBXBuildFile; fileRef = B546CCF12093636A007CDA5F /* Yosemite.h */; settings = {ATTRIBUTES = (Public, ); }; };
1717
B57A133220D2C787003D88DF /* StorageAccount+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57A133120D2C787003D88DF /* StorageAccount+Extensions.swift */; };
1818
B5A01CA120D19C4700E3207E /* MockupStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A01CA020D19C4700E3207E /* MockupStorage.swift */; };
19+
B5B19DE020E6A45900899568 /* Storage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5B19DDF20E6A45900899568 /* Storage.framework */; };
20+
B5B19DE220E6A45E00899568 /* Networking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5B19DE120E6A45E00899568 /* Networking.framework */; };
1921
B5B5C797208E49B600642956 /* Action+Internal.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B5C796208E49B600642956 /* Action+Internal.swift */; };
2022
B5BC736520D1A98500B5B6FA /* AccountStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BC736420D1A98500B5B6FA /* AccountStore.swift */; };
2123
B5BC736820D1AA8F00B5B6FA /* AccountStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5BC736720D1AA8F00B5B6FA /* AccountStoreTests.swift */; };
@@ -30,8 +32,6 @@
3032
B5C9DE252087FF20006B910A /* MockupProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C9DE1E2087FF20006B910A /* MockupProcessor.swift */; };
3133
B5C9DE272087FF20006B910A /* MockupAcount.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C9DE202087FF20006B910A /* MockupAcount.swift */; };
3234
B5C9DE282087FF20006B910A /* MockupSite.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C9DE212087FF20006B910A /* MockupSite.swift */; };
33-
B5DC3CAC20D1B3510063AC41 /* Networking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5DC3CAB20D1B3510063AC41 /* Networking.framework */; };
34-
B5DC3CAE20D1B3650063AC41 /* Storage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5DC3CAD20D1B3650063AC41 /* Storage.framework */; };
3535
B5DC3CB120D1B8720063AC41 /* AccountAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5DC3CB020D1B8720063AC41 /* AccountAction.swift */; };
3636
/* End PBXBuildFile section */
3737

@@ -59,13 +59,13 @@
5959
B546CCF12093636A007CDA5F /* Yosemite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Yosemite.h; sourceTree = "<group>"; };
6060
B57A133120D2C787003D88DF /* StorageAccount+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StorageAccount+Extensions.swift"; sourceTree = "<group>"; };
6161
B5A01CA020D19C4700E3207E /* MockupStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockupStorage.swift; sourceTree = "<group>"; };
62+
B5B19DDF20E6A45900899568 /* Storage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Storage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
63+
B5B19DE120E6A45E00899568 /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6264
B5B5C796208E49B600642956 /* Action+Internal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Action+Internal.swift"; sourceTree = "<group>"; };
6365
B5BC736420D1A98500B5B6FA /* AccountStore.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountStore.swift; sourceTree = "<group>"; };
6466
B5BC736720D1AA8F00B5B6FA /* AccountStoreTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountStoreTests.swift; sourceTree = "<group>"; };
6567
B5BC736A20D1AAE900B5B6FA /* me.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = me.json; sourceTree = "<group>"; };
6668
B5BC736D20D1AB3500B5B6FA /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
67-
B5C4EB7820D17329002AC0AF /* Storage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Storage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
68-
B5C4EB7A20D1732E002AC0AF /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6969
B5C9DDF52087FEC0006B910A /* Yosemite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Yosemite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7070
B5C9DDF92087FEC0006B910A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7171
B5C9DDFE2087FEC0006B910A /* YosemiteTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YosemiteTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -78,8 +78,6 @@
7878
B5C9DE1E2087FF20006B910A /* MockupProcessor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockupProcessor.swift; sourceTree = "<group>"; };
7979
B5C9DE202087FF20006B910A /* MockupAcount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockupAcount.swift; sourceTree = "<group>"; };
8080
B5C9DE212087FF20006B910A /* MockupSite.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockupSite.swift; sourceTree = "<group>"; };
81-
B5DC3CAB20D1B3510063AC41 /* Networking.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Networking.framework; sourceTree = BUILT_PRODUCTS_DIR; };
82-
B5DC3CAD20D1B3650063AC41 /* Storage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Storage.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8381
B5DC3CB020D1B8720063AC41 /* AccountAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountAction.swift; sourceTree = "<group>"; };
8482
C25501C7F936D2FD32FAF3F4 /* Pods_Yosemite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Yosemite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8583
/* End PBXFileReference section */
@@ -89,8 +87,8 @@
8987
isa = PBXFrameworksBuildPhase;
9088
buildActionMask = 2147483647;
9189
files = (
92-
B5DC3CAE20D1B3650063AC41 /* Storage.framework in Frameworks */,
93-
B5DC3CAC20D1B3510063AC41 /* Networking.framework in Frameworks */,
90+
B5B19DE220E6A45E00899568 /* Networking.framework in Frameworks */,
91+
B5B19DE020E6A45900899568 /* Storage.framework in Frameworks */,
9492
0E67B79585034C4DD75C8117 /* Pods_Yosemite.framework in Frameworks */,
9593
);
9694
runOnlyForDeploymentPostprocessing = 0;
@@ -154,10 +152,8 @@
154152
B5C4EB7720D17329002AC0AF /* Frameworks */ = {
155153
isa = PBXGroup;
156154
children = (
157-
B5DC3CAD20D1B3650063AC41 /* Storage.framework */,
158-
B5DC3CAB20D1B3510063AC41 /* Networking.framework */,
159-
B5C4EB7A20D1732E002AC0AF /* Networking.framework */,
160-
B5C4EB7820D17329002AC0AF /* Storage.framework */,
155+
B5B19DE120E6A45E00899568 /* Networking.framework */,
156+
B5B19DDF20E6A45900899568 /* Storage.framework */,
161157
C25501C7F936D2FD32FAF3F4 /* Pods_Yosemite.framework */,
162158
991BBCE6E4A92F0A028885D8 /* Pods_YosemiteTests.framework */,
163159
);
@@ -614,7 +610,11 @@
614610
INFOPLIST_FILE = "$(SRCROOT)/Yosemite/Info.plist";
615611
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
616612
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
617-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
613+
LD_RUNPATH_SEARCH_PATHS = (
614+
"$(inherited)",
615+
"@executable_path/Frameworks",
616+
"@loader_path/Frameworks",
617+
);
618618
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.Yosemite;
619619
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
620620
SKIP_INSTALL = YES;
@@ -637,7 +637,11 @@
637637
INFOPLIST_FILE = "$(SRCROOT)/Yosemite/Info.plist";
638638
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
639639
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
640-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
640+
LD_RUNPATH_SEARCH_PATHS = (
641+
"$(inherited)",
642+
"@executable_path/Frameworks",
643+
"@loader_path/Frameworks",
644+
);
641645
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.Yosemite;
642646
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
643647
SKIP_INSTALL = YES;
@@ -653,7 +657,11 @@
653657
CODE_SIGN_STYLE = Automatic;
654658
DEVELOPMENT_TEAM = PZYM8XX95Q;
655659
INFOPLIST_FILE = YosemiteTests/Info.plist;
656-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
660+
LD_RUNPATH_SEARCH_PATHS = (
661+
"$(inherited)",
662+
"@executable_path/Frameworks",
663+
"@loader_path/Frameworks",
664+
);
657665
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.YosemiteTests;
658666
PRODUCT_NAME = "$(TARGET_NAME)";
659667
SWIFT_VERSION = 4.0;
@@ -668,7 +676,11 @@
668676
CODE_SIGN_STYLE = Automatic;
669677
DEVELOPMENT_TEAM = PZYM8XX95Q;
670678
INFOPLIST_FILE = YosemiteTests/Info.plist;
671-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
679+
LD_RUNPATH_SEARCH_PATHS = (
680+
"$(inherited)",
681+
"@executable_path/Frameworks",
682+
"@loader_path/Frameworks",
683+
);
672684
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.YosemiteTests;
673685
PRODUCT_NAME = "$(TARGET_NAME)";
674686
SWIFT_VERSION = 4.0;

0 commit comments

Comments
 (0)