Remove pod dependency on ReachabilitySwift and Starscream and include…

… manually
pusher · May 9, 2016 · 2c57afb · 2c57afb
1 parent d0358c2
commit 2c57afb
Show file tree

Hide file tree

Showing 12 changed files with 1,504 additions and 30 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +0,0 @@
-github "ashleymills/Reachability.swift"
-github "daltoniam/Starscream"

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +0,0 @@
-github "ashleymills/Reachability.swift" "v2.3.3"
-github "daltoniam/Starscream" "1.1.3"

diff --git a/Podfile b/Podfile
@@ -6,8 +6,6 @@ use_frameworks!
 
 def import_pods
   pod 'PusherSwift', path: './'
-  pod 'Starscream', '~> 1.1.3'
-  pod 'ReachabilitySwift', '~> 2.3.3'
 end
 
 def import_test_pods

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,30 +1,22 @@
 PODS:
   - Nimble (3.2.0)
-  - PusherSwift (0.3.0):
-    - ReachabilitySwift (~> 2.3.3)
-    - Starscream (~> 1.1.3)
+  - PusherSwift (0.3.0)
   - Quick (0.9.1)
-  - ReachabilitySwift (2.3.3)
-  - Starscream (1.1.3)
 
 DEPENDENCIES:
   - Nimble (= 3.2.0)
   - PusherSwift (from `./`)
   - Quick (= 0.9.1)
-  - ReachabilitySwift (~> 2.3.3)
-  - Starscream (~> 1.1.3)
 
 EXTERNAL SOURCES:
   PusherSwift:
     :path: "./"
 
 SPEC CHECKSUMS:
   Nimble: 703854335d181df169bbca9c97117b5cf8c47c1d
-  PusherSwift: da5e5d2a63468b921213a329d6265f6141af1588
+  PusherSwift: 2d5ea972aa7a13f88f9046190cdbbfba1735f7e2
   Quick: a5221fc21788b6aeda934805e68b061839bc3165
-  ReachabilitySwift: e0f6b6f280effb47731acfaaa2d5ffe223703793
-  Starscream: d662732354b40dd19ed1ece3e3c44c80b536b83c
 
-PODFILE CHECKSUM: 5ed154d480166d467d1645e0ad2494200b5e5e8a
+PODFILE CHECKSUM: ec3f8aad41d4b69ceb20f0b68614e7726c36a781
 
 COCOAPODS: 1.0.0.beta.6
diff --git a/PusherSwift.podspec b/PusherSwift.podspec
@@ -14,7 +14,4 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '9.0'
-
-  s.dependency 'Starscream', '~> 1.1.3'
-  s.dependency 'ReachabilitySwift', '~> 2.3.3'
 end
diff --git a/PusherSwift.xcodeproj/project.pbxproj b/PusherSwift.xcodeproj/project.pbxproj
@@ -44,6 +44,12 @@
 		33C0D2D51CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2D41CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift */; };
 		33C0D2D61CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2D41CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift */; };
 		33C0D2D71CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2D41CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift */; };
+		33C0D2DB1CB5C364003FE13E /* Starscream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2DA1CB5C364003FE13E /* Starscream.swift */; };
+		33C0D2DC1CB5C364003FE13E /* Starscream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2DA1CB5C364003FE13E /* Starscream.swift */; };
+		33C0D2DD1CB5C364003FE13E /* Starscream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2DA1CB5C364003FE13E /* Starscream.swift */; };
+		33C0D2E41CB5C539003FE13E /* Reachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2E31CB5C539003FE13E /* Reachability.swift */; };
+		33C0D2E51CB5C539003FE13E /* Reachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2E31CB5C539003FE13E /* Reachability.swift */; };
+		33C0D2E61CB5C539003FE13E /* Reachability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C0D2E31CB5C539003FE13E /* Reachability.swift */; };
 		33C40CB91C1DFC9C008A54E3 /* PusherSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 33831CD61A9CFFF200B124F1 /* PusherSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		880A672D74CCC1EAE32C7233 /* Pods_PusherSwift_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B9BA07EA25D94B5EDC04F1B /* Pods_PusherSwift_OSX.framework */; };
 		9AF0AE2899725CA479C40F3C /* Pods_PusherSwiftTests_OSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9187A66014F4DC5126D41AF6 /* Pods_PusherSwiftTests_OSX.framework */; settings = {ATTRIBUTES = (Required, ); }; };
@@ -112,6 +118,8 @@
 		33999D2D1C401F9600AFED30 /* PusherSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PusherSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		33999D3F1C4020A300AFED30 /* PusherSwiftTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PusherSwiftTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		33C0D2D41CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CryptoSwiftHMACModule.swift; sourceTree = "<group>"; };
+		33C0D2DA1CB5C364003FE13E /* Starscream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Starscream.swift; sourceTree = "<group>"; };
+		33C0D2E31CB5C539003FE13E /* Reachability.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reachability.swift; sourceTree = "<group>"; };
 		36A2F88A174BAE49C1A78CAD /* Pods_Builds_PusherSwift_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Builds_PusherSwift_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D194D886863B00A69F18B93 /* Pods-PusherSwiftTests-tvOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PusherSwiftTests-tvOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-PusherSwiftTests-tvOS/Pods-PusherSwiftTests-tvOS.release.xcconfig"; sourceTree = "<group>"; };
 		453D0A4BB2E30972E26203E2 /* Pods_PusherSwiftTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PusherSwiftTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -226,9 +234,9 @@
 				3389F56D1CAEDDD800563F49 /* PusherPresenceChannel.swift */,
 				3389F5751CAEDE2800563F49 /* PusherGlobalChannel.swift */,
 				3389F5711CAEDDF300563F49 /* PusherChannels.swift */,
-				33C0D2D41CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift */,
-				33831C981A9CF61600B124F1 /* Tests */,
+				33C0D2E71CB5C54C003FE13E /* Dependencies */,
 				33831CD61A9CFFF200B124F1 /* PusherSwift.h */,
+				33831C981A9CF61600B124F1 /* Tests */,
 				33831C8C1A9CF61600B124F1 /* Supporting Files */,
 			);
 			path = Source;
@@ -260,6 +268,16 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		33C0D2E71CB5C54C003FE13E /* Dependencies */ = {
+			isa = PBXGroup;
+			children = (
+				33C0D2D41CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift */,
+				33C0D2DA1CB5C364003FE13E /* Starscream.swift */,
+				33C0D2E31CB5C539003FE13E /* Reachability.swift */,
+			);
+			name = Dependencies;
+			sourceTree = "<group>";
+		};
 		42D29A655054030A9B238900 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -867,7 +885,9 @@
 				3389F5771CAEDE2800563F49 /* PusherGlobalChannel.swift in Sources */,
 				3389F57B1CAEDEC800563F49 /* PusherClientOptions.swift in Sources */,
 				3389F56F1CAEDDD800563F49 /* PusherPresenceChannel.swift in Sources */,
+				33C0D2E51CB5C539003FE13E /* Reachability.swift in Sources */,
 				33C0D2D61CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift in Sources */,
+				33C0D2DC1CB5C364003FE13E /* Starscream.swift in Sources */,
 				330D7A691CAEDA6B0032FF2C /* PusherSwift.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -883,7 +903,9 @@
 				3389F5781CAEDE2800563F49 /* PusherGlobalChannel.swift in Sources */,
 				3389F57C1CAEDEC800563F49 /* PusherClientOptions.swift in Sources */,
 				3389F5701CAEDDD800563F49 /* PusherPresenceChannel.swift in Sources */,
+				33C0D2E61CB5C539003FE13E /* Reachability.swift in Sources */,
 				33C0D2D71CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift in Sources */,
+				33C0D2DD1CB5C364003FE13E /* Starscream.swift in Sources */,
 				330D7A681CAEDA6A0032FF2C /* PusherSwift.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -899,7 +921,9 @@
 				3389F5761CAEDE2800563F49 /* PusherGlobalChannel.swift in Sources */,
 				3389F57A1CAEDEC800563F49 /* PusherClientOptions.swift in Sources */,
 				3389F56E1CAEDDD800563F49 /* PusherPresenceChannel.swift in Sources */,
+				33C0D2E41CB5C539003FE13E /* Reachability.swift in Sources */,
 				33C0D2D51CB5C1F2003FE13E /* CryptoSwiftHMACModule.swift in Sources */,
+				33C0D2DB1CB5C364003FE13E /* Starscream.swift in Sources */,
 				330D7A6A1CAEDA6C0032FF2C /* PusherSwift.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/Source/PusherConnection.swift b/Source/PusherConnection.swift
@@ -6,9 +6,6 @@
 //
 //
 
-import Starscream
-import ReachabilitySwift
-
 public class PusherConnection {
     public let url: String
     public let key: String

diff --git a/Source/PusherSwift.swift b/Source/PusherSwift.swift
@@ -6,8 +6,6 @@
 //
 
 import Foundation
-import Starscream
-import ReachabilitySwift
 
 public typealias PusherEventJSON = Dictionary<String, AnyObject>
 public typealias PusherUserInfoObject = Dictionary<String, AnyObject>

diff --git a/Source/PusherWebsocketDelegate.swift b/Source/PusherWebsocketDelegate.swift
@@ -6,8 +6,6 @@
 //
 //
 
-import Starscream
-
 extension PusherConnection: WebSocketDelegate {
     // MARK: WebSocketDelegate Implementation
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		github "ashleymills/Reachability.swift"
		github "daltoniam/Starscream"
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		github "ashleymills/Reachability.swift" "v2.3.3"
		github "daltoniam/Starscream" "1.1.3"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,8 +6,6 @@ @@
     //
     //
-    import Starscream
     extension PusherConnection: WebSocketDelegate {
         // MARK: WebSocketDelegate Implementation
@@ Expand Down @@