Use StarscreamFork and update TaskQueue depedency

pusher · Mar 23, 2018 · 56149a7 · 56149a7
1 parent 6b43396
commit 56149a7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,4 +1,6 @@
-github "daltoniam/Starscream"
 github "krzyzanowskim/CryptoSwift"
 github "ashleymills/Reachability.swift"
-github "hamchapman/TaskQueue" "master"
+github "icanzilb/TaskQueue"
+
+# github "daltoniam/Starscream"
+github "hamchapman/Starscream" "cleanup-pod-fork"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,4 @@
 github "ashleymills/Reachability.swift" "v4.1.0"
-github "daltoniam/Starscream" "3.0.4"
-github "daltoniam/common-crypto-spm" "1.1.0"
-github "daltoniam/zlib-spm" "1.1.0"
-github "hamchapman/TaskQueue" "6310f970766e490bb210d14a4700e5f51caecab0"
+github "hamchapman/Starscream" "f28d93cc1b3b012eee5de8e8d99c38a09cf58975"
+github "icanzilb/TaskQueue" "1.1.0"
 github "krzyzanowskim/CryptoSwift" "0.8.3"
diff --git a/PusherSwift.podspec b/PusherSwift.podspec
@@ -12,10 +12,9 @@ Pod::Spec.new do |s|
   s.source_files = 'Sources/*.swift'
 
   s.dependency 'CryptoSwift', '~> 0.8.3'
-  s.dependency 'Starscream', '~> 3.0.4'
   s.dependency 'Reachability', '~> 4.1.0'
-
-  s.dependency 'TaskQueue', '~> 1.0.3' # TODO: FIXME
+  s.dependency 'TaskQueue', '~> 1.1.0'
+  s.dependency 'StarscreamFork', '~> 3.0.5'
 
   s.ios.deployment_target = '8.0'
   s.osx.deployment_target = '10.10'

diff --git a/iOS Example Swift/iOS Example Swift/Carthage.xcconfig b/iOS Example Swift/iOS Example Swift/Carthage.xcconfig
@@ -0,0 +1,7 @@
+//
+//  Carthage.xcconfig
+//  iOS Example
+//
+//  Created by Hamilton Chapman on 12/03/2018.
+//  Copyright © 2018 Pusher. All rights reserved.
+//