Skip to content

Commit 402700f

Browse files
committed
Starscream -> StarscreamFork
1 parent 5a95637 commit 402700f

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "ashleymills/Reachability.swift" "v4.1.0"
2-
github "hamchapman/Starscream" "f28d93cc1b3b012eee5de8e8d99c38a09cf58975"
2+
github "hamchapman/Starscream" "bfc884d67838079075e4ab816e6a0eafa257b2d6"
33
github "icanzilb/TaskQueue" "1.1.0"
44
github "krzyzanowskim/CryptoSwift" "0.8.3"

PusherSwift.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
files = (
297297
);
298298
inputPaths = (
299-
Starscream,
299+
StarscreamFork,
300300
TaskQueue,
301301
CryptoSwift,
302302
Reachability,

Sources/PusherConnection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Foundation
22
import Reachability
3-
import Starscream
3+
import StarscreamFork
44
import CryptoSwift
55

66
public typealias PusherEventJSON = [String: AnyObject]

Sources/PusherSwift.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Foundation
2-
import Starscream
2+
import StarscreamFork
33

44
let PROTOCOL = 7
55
let VERSION = "5.1.1"

Sources/PusherWebsocketDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Foundation
2-
import Starscream
2+
import StarscreamFork
33

44
extension PusherConnection: WebSocketDelegate {
55

Tests/Mocks.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import PusherSwift
10-
import Starscream
10+
import StarscreamFork
1111

1212
open class MockWebSocket: WebSocket {
1313
let stubber = StubberForMocks()

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
335AD5AA20569C3C000D4D08 /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A620569C3B000D4D08 /* CryptoSwift.framework */; };
1313
335AD5AB20569C3C000D4D08 /* TaskQueue.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A720569C3B000D4D08 /* TaskQueue.framework */; };
1414
335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A820569C3B000D4D08 /* Reachability.framework */; };
15-
335AD5AD20569C3C000D4D08 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 335AD5A920569C3B000D4D08 /* Starscream.framework */; };
1615
335AD5B020569DC3000D4D08 /* Carthage.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 335AD5AF20569DC3000D4D08 /* Carthage.xcconfig */; };
1716
335AD5B220569F14000D4D08 /* PusherSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 33CC82EA1D7F16A8003B699F /* PusherSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
17+
3373BF4D2068F201005A61BE /* StarscreamFork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3373BF4C2068F201005A61BE /* StarscreamFork.framework */; };
1818
33831CC21A9CFCDB00B124F1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33831CBE1A9CFCDB00B124F1 /* AppDelegate.swift */; };
1919
33831CC31A9CFCDB00B124F1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33831CBF1A9CFCDB00B124F1 /* Images.xcassets */; };
2020
33831CC41A9CFCDB00B124F1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 33831CC01A9CFCDB00B124F1 /* Main.storyboard */; };
@@ -66,6 +66,7 @@
6666
335AD5A820569C3B000D4D08 /* Reachability.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reachability.framework; path = ../Carthage/Build/iOS/Reachability.framework; sourceTree = "<group>"; };
6767
335AD5A920569C3B000D4D08 /* Starscream.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Starscream.framework; path = ../Carthage/Build/iOS/Starscream.framework; sourceTree = "<group>"; };
6868
335AD5AF20569DC3000D4D08 /* Carthage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Carthage.xcconfig; sourceTree = "<group>"; };
69+
3373BF4C2068F201005A61BE /* StarscreamFork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StarscreamFork.framework; path = ../Carthage/Build/iOS/StarscreamFork.framework; sourceTree = "<group>"; };
6970
337642911D81BAA60078EEFB /* iOS Example.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "iOS Example.entitlements"; sourceTree = "<group>"; };
7071
33831C5E1A9CEEE900B124F1 /* iOS Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iOS Example.app"; sourceTree = BUILT_PRODUCTS_DIR; };
7172
33831CBC1A9CFCD000B124F1 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = "iOS Example Swift/Info.plist"; sourceTree = SOURCE_ROOT; };
@@ -88,10 +89,10 @@
8889
isa = PBXFrameworksBuildPhase;
8990
buildActionMask = 2147483647;
9091
files = (
92+
3373BF4D2068F201005A61BE /* StarscreamFork.framework in Frameworks */,
9193
335AD5AA20569C3C000D4D08 /* CryptoSwift.framework in Frameworks */,
9294
335AD5AB20569C3C000D4D08 /* TaskQueue.framework in Frameworks */,
9395
335AD5AC20569C3C000D4D08 /* Reachability.framework in Frameworks */,
94-
335AD5AD20569C3C000D4D08 /* Starscream.framework in Frameworks */,
9596
33CC82EB1D7F16A8003B699F /* PusherSwift.framework in Frameworks */,
9697
);
9798
runOnlyForDeploymentPostprocessing = 0;
@@ -153,6 +154,7 @@
153154
E0B29E04C3C064CEE6120CF2 /* Frameworks */ = {
154155
isa = PBXGroup;
155156
children = (
157+
3373BF4C2068F201005A61BE /* StarscreamFork.framework */,
156158
335AD5A620569C3B000D4D08 /* CryptoSwift.framework */,
157159
335AD5A820569C3B000D4D08 /* Reachability.framework */,
158160
335AD5A920569C3B000D4D08 /* Starscream.framework */,
@@ -282,7 +284,7 @@
282284
"$(SRCROOT)/../Carthage/Build/iOS/CryptoSwift.framework",
283285
"$(SRCROOT)/../Carthage/Build/iOS/TaskQueue.framework",
284286
"$(SRCROOT)/../Carthage/Build/iOS/Reachability.framework",
285-
"$(SRCROOT)/../Carthage/Build/iOS/Starscream.framework",
287+
"$(SRCROOT)/../Carthage/Build/iOS/StarscreamFork.framework",
286288
);
287289
name = "Copy Carthage Frameworks";
288290
outputPaths = (

0 commit comments

Comments
 (0)