Merge pull request #181 from pusher/starscream-update

Use Starscream instead of StarscreamFork

Author: jameshfisher

Cartfile

@@ -1,6 +1,4 @@
 github "krzyzanowskim/CryptoSwift"
 github "ashleymills/Reachability.swift"
 github "icanzilb/TaskQueue"
-
-# github "daltoniam/Starscream"
-github "hamchapman/Starscream"
+github "daltoniam/Starscream"

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "ashleymills/Reachability.swift" "v4.1.0"
-github "hamchapman/Starscream" "3.0.6"
+github "daltoniam/Starscream" "3.0.5"
 github "icanzilb/TaskQueue" "1.1.1"
 github "krzyzanowskim/CryptoSwift" "0.9.0"

PusherSwift.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.dependency 'CryptoSwift', '~> 0.9.0'
   s.dependency 'ReachabilitySwift', '~> 4.1.0'
   s.dependency 'TaskQueue', '~> 1.1.1'
-  s.dependency 'StarscreamFork', '~> 3.0.6'
+  s.dependency 'Starscream', '~> 3.0.5'
 
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'

PusherSwift.xcodeproj/project.pbxproj

@@ -296,7 +296,7 @@
 			files = (
 			);
 			inputPaths = (
-				StarscreamFork,
+				Starscream,
 				TaskQueue,
 				CryptoSwift,
 				Reachability,

Sources/PusherConnection.swift

@@ -1,6 +1,6 @@
 import Foundation
 import Reachability
-import StarscreamFork
+import Starscream
 import CryptoSwift
 
 public typealias PusherEventJSON = [String: AnyObject]

Sources/PusherSwift.swift

@@ -1,5 +1,5 @@
 import Foundation
-import StarscreamFork
+import Starscream
 
 let PROTOCOL = 7
 let VERSION = "6.0.0"

Sources/PusherWebsocketDelegate.swift

@@ -1,5 +1,5 @@
 import Foundation
-import StarscreamFork
+import Starscream
 
 extension PusherConnection: WebSocketDelegate {
 

Tests/Mocks.swift

@@ -1,5 +1,5 @@
 import PusherSwift
-import StarscreamFork
+import Starscream
 
 open class MockWebSocket: WebSocket {
     let stubber = StubberForMocks()

iOS Example Swift/iOS Example Swift.xcodeproj/project.pbxproj

@@ -13,12 +13,12 @@
 		335AD5AB20569C3C000D4D08 /* TaskQueue.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A720569C3B000D4D08 /* TaskQueue.framework */; };
 		335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A820569C3B000D4D08 /* Reachability.framework */; };
 		335AD5B220569F14000D4D08 /* PusherSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 33CC82EA1D7F16A8003B699F /* PusherSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		3373BF4D2068F201005A61BE /* StarscreamFork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3373BF4C2068F201005A61BE /* StarscreamFork.framework */; };
 		33831CC21A9CFCDB00B124F1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33831CBE1A9CFCDB00B124F1 /* AppDelegate.swift */; };
 		33831CC31A9CFCDB00B124F1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33831CBF1A9CFCDB00B124F1 /* Images.xcassets */; };
 		33831CC41A9CFCDB00B124F1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 33831CC01A9CFCDB00B124F1 /* Main.storyboard */; };
 		33831CC51A9CFCDB00B124F1 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33831CC11A9CFCDB00B124F1 /* ViewController.swift */; };
 		33CC82EB1D7F16A8003B699F /* PusherSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33CC82EA1D7F16A8003B699F /* PusherSwift.framework */; };
+		33E94E7620766DBE0005399D /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A920569C3B000D4D08 /* Starscream.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -88,7 +88,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3373BF4D2068F201005A61BE /* StarscreamFork.framework in Frameworks */,
+				33E94E7620766DBE0005399D /* Starscream.framework in Frameworks */,
 				335AD5AA20569C3C000D4D08 /* CryptoSwift.framework in Frameworks */,
 				335AD5AB20569C3C000D4D08 /* TaskQueue.framework in Frameworks */,
 				335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */,
@@ -282,7 +282,7 @@
 				"$(SRCROOT)/../Carthage/Build/iOS/CryptoSwift.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/TaskQueue.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/Reachability.framework",
-				"$(SRCROOT)/../Carthage/Build/iOS/StarscreamFork.framework",
+				"$(SRCROOT)/../Carthage/Build/iOS/Starscream.framework",
 			);
 			name = "Copy Carthage Frameworks";
 			outputPaths = (