Merge pull request #128 from woocommerce/issue/104-avoid-importing-networking

Avoiding Networking Imports

Author: jleandroperez

WooCommerce/Classes/Authentication/AuthenticationManager.swift

@@ -1,7 +1,7 @@
 import Foundation
 import WordPressAuthenticator
 import WordPressUI
-import Networking
+import Yosemite
 
 
 

WooCommerce/Classes/System/CredentialsManager.swift

@@ -1,5 +1,5 @@
 import Foundation
-import Networking
+import Yosemite
 import KeychainAccess
 
 

WooCommerce/Classes/Yosemite/StoresManager.swift

@@ -1,7 +1,6 @@
 import Foundation
 import Yosemite
 import Storage
-import Networking
 
 
 

WooCommerce/WooCommerceTests/System/CredentialsManagerTests.swift

@@ -1,6 +1,6 @@
 import XCTest
 @testable import WooCommerce
-@testable import Networking
+import Yosemite
 
 
 /// CredentialsManager Unit Tests

WooCommerce/WooCommerceTests/Yosemite/StoresManagerTests.swift

@@ -1,6 +1,6 @@
 import XCTest
+import Networking
 @testable import WooCommerce
-@testable import Networking
 
 
 /// StoresManager Unit Tests

Yosemite/Yosemite.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		74A7688E20D45ED400F9D437 /* OrderStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A7688D20D45ED400F9D437 /* OrderStoreTests.swift */; };
 		74A7689020D45F9300F9D437 /* OrderAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74A7688F20D45F9300F9D437 /* OrderAction.swift */; };
 		74A7689220D47F9E00F9D437 /* orders.json in Resources */ = {isa = PBXBuildFile; fileRef = 74A7689120D47F9E00F9D437 /* orders.json */; };
+		B53D89E520E6C22B00F90866 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53D89E420E6C22B00F90866 /* Model.swift */; };
 		B546CCF22093636A007CDA5F /* Yosemite.h in Headers */ = {isa = PBXBuildFile; fileRef = B546CCF12093636A007CDA5F /* Yosemite.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B57A133220D2C787003D88DF /* StorageAccount+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B57A133120D2C787003D88DF /* StorageAccount+Extensions.swift */; };
 		B5A01CA120D19C4700E3207E /* MockupStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5A01CA020D19C4700E3207E /* MockupStorage.swift */; };
@@ -56,6 +57,7 @@
 		93D120F57D5D14A10B3AFFFD /* Pods-Yosemite.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Yosemite.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Yosemite/Pods-Yosemite.release.xcconfig"; sourceTree = "<group>"; };
 		991BBCE6E4A92F0A028885D8 /* Pods_YosemiteTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YosemiteTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		ABE0D84C5393D9EE2CCF2B7E /* Pods-YosemiteTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YosemiteTests.release.xcconfig"; path = "../Pods/Target Support Files/Pods-YosemiteTests/Pods-YosemiteTests.release.xcconfig"; sourceTree = "<group>"; };
+		B53D89E420E6C22B00F90866 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Model.swift; path = Yosemite/Model/Model.swift; sourceTree = SOURCE_ROOT; };
 		B546CCF12093636A007CDA5F /* Yosemite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Yosemite.h; sourceTree = "<group>"; };
 		B57A133120D2C787003D88DF /* StorageAccount+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StorageAccount+Extensions.swift"; sourceTree = "<group>"; };
 		B5A01CA020D19C4700E3207E /* MockupStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockupStorage.swift; sourceTree = "<group>"; };
@@ -105,6 +107,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		B53D89E720E6C7DC00F90866 /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				B53D89E420E6C22B00F90866 /* Model.swift */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
 		B57A133020D2C770003D88DF /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -188,6 +198,7 @@
 				B57A133020D2C770003D88DF /* Extensions */,
 				B5DC3CAF20D1B8660063AC41 /* Actions */,
 				B5BC736320D1A98500B5B6FA /* Stores */,
+				B53D89E720E6C7DC00F90866 /* Model */,
 				B546CCF12093636A007CDA5F /* Yosemite.h */,
 				B5C9DDF92087FEC0006B910A /* Info.plist */,
 			);
@@ -442,6 +453,7 @@
 				B5BC736520D1A98500B5B6FA /* AccountStore.swift in Sources */,
 				B5B5C797208E49B600642956 /* Action+Internal.swift in Sources */,
 				74A7688C20D45EBA00F9D437 /* OrderStore.swift in Sources */,
+				B53D89E520E6C22B00F90866 /* Model.swift in Sources */,
 				74A7689020D45F9300F9D437 /* OrderAction.swift in Sources */,
 				B5C9DE182087FF0E006B910A /* Assert.swift in Sources */,
 				B5C9DE162087FF0E006B910A /* Store.swift in Sources */,

Yosemite/Yosemite/Actions/AccountAction.swift

@@ -3,11 +3,6 @@ import Networking
 
 
 
-// MARK: - Public Aliases
-//
-public typealias Account = Networking.Account
-
-
 // MARK: - AccountAction: Defines all of the Actions supported by the AccountStore.
 //
 public enum AccountAction: Action {

Yosemite/Yosemite/Actions/OrderAction.swift

@@ -3,11 +3,6 @@ import Networking
 
 
 
-// MARK: - Public Aliases
-//
-public typealias Order = Networking.Order
-
-
 // MARK: - OrderAction: Defines all of the Actions supported by the OrderStore.
 //
 public enum OrderAction: Action {

Yosemite/Yosemite/Model/Model.swift

@@ -0,0 +1,13 @@
+import Foundation
+import Networking
+
+
+
+// MARK: - Exported Symbols
+
+public typealias Account = Networking.Account
+public typealias Address = Networking.Address
+public typealias Credentials = Networking.Credentials
+public typealias Order = Networking.Order
+public typealias OrderItem = Networking.OrderItem
+public typealias OrderStatus = Networking.OrderStatus