Skip to content

Commit b2b30f7

Browse files
moozzykmoozzyk
committed
Temporarily replacing SwiftWebSocket pod with SwiftWebSocket source
This is because of tidwall/SwiftWebSocket#118 which prevents porjects depending on SwiftWebSocket from being pushed to CocoaPods Opened tidwall/SwiftWebSocket#122. Once the PR is merged and a new version is released this change should be reversed.
1 parent 6e6a31d commit b2b30f7

File tree

6 files changed

+1850
-94
lines changed

6 files changed

+1850
-94
lines changed

‎Podfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ end
1111
target 'iOS SignalRClient' do
1212
use_frameworks!
1313
platform :ios, '9.0'
14-
pod 'SwiftWebSocket', '~> 2.7'
14+
# pod 'SwiftWebSocket', '~> 2.7'
1515
end
1616

1717
target 'macOS SignalRClient' do
1818
use_frameworks!
1919
platform :osx, '10.13'
20-
pod 'SwiftWebSocket', '~> 2.7'
20+
# pod 'SwiftWebSocket', '~> 2.7'
2121
end
2222

2323
target 'SocketsSample' do

‎Podfile.lock‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
PODS:
2-
- SwiftWebSocket (2.7.0)
3-
4-
DEPENDENCIES:
5-
- SwiftWebSocket (~> 2.7)
6-
7-
SPEC REPOS:
8-
https://github.com/CocoaPods/Specs.git:
9-
- SwiftWebSocket
10-
11-
SPEC CHECKSUMS:
12-
SwiftWebSocket: 612c9729fd503cb6b0b8b45390c788686dac306f
13-
14-
PODFILE CHECKSUM: 9c66a5c5568d403b205b561306afa348593a412b
1+
PODFILE CHECKSUM: bb2f3edb1650e977e46a2a5f1b1dc67cd3e6fb3c
152

163
COCOAPODS: 1.5.0

‎SignalRClient.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
5A406F542030F65F0055671E /* HubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82D1F52A774003EEC55 /* HubProtocol.swift */; };
3737
5A406F552030F6620055671E /* JSONHubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82F1F53392E003EEC55 /* JSONHubProtocol.swift */; };
3838
5A406F562030F6660055671E /* ServerInvocationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A004A032028293400A26C0B /* ServerInvocationHandler.swift */; };
39+
5A4292F4208D2945008B30EF /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4292F3208D2945008B30EF /* WebSocket.swift */; };
40+
5A4292F5208D2945008B30EF /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4292F3208D2945008B30EF /* WebSocket.swift */; };
41+
5A4292F7208D2A4A008B30EF /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A4292F6208D2A4A008B30EF /* libz.tbd */; };
42+
5A4292F9208D2A59008B30EF /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A4292F8208D2A59008B30EF /* libz.tbd */; };
3943
5A45C82E1F52A774003EEC55 /* HubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82D1F52A774003EEC55 /* HubProtocol.swift */; };
4044
5A45C8301F53392E003EEC55 /* JSONHubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82F1F53392E003EEC55 /* JSONHubProtocol.swift */; };
4145
5A45C8321F5AFDB6003EEC55 /* JSONHubProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C8311F5AFDB6003EEC55 /* JSONHubProtocolTests.swift */; };
@@ -175,6 +179,9 @@
175179
5A32F4EF2084195A0091C185 /* HubProtocolFake.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HubProtocolFake.swift; sourceTree = "<group>"; };
176180
5A341EB71E7CDCA400F6D41D /* TypeConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeConverter.swift; sourceTree = "<group>"; };
177181
5A406F3E2030F4960055671E /* SignalRClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SignalRClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
182+
5A4292F3208D2945008B30EF /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = "<group>"; };
183+
5A4292F6208D2A4A008B30EF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
184+
5A4292F8208D2A59008B30EF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/usr/lib/libz.tbd; sourceTree = DEVELOPER_DIR; };
178185
5A45C82D1F52A774003EEC55 /* HubProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HubProtocol.swift; sourceTree = "<group>"; };
179186
5A45C82F1F53392E003EEC55 /* JSONHubProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONHubProtocol.swift; sourceTree = "<group>"; };
180187
5A45C8311F5AFDB6003EEC55 /* JSONHubProtocolTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONHubProtocolTests.swift; sourceTree = "<group>"; };
@@ -236,6 +243,7 @@
236243
isa = PBXFrameworksBuildPhase;
237244
buildActionMask = 2147483647;
238245
files = (
246+
5A4292F9208D2A59008B30EF /* libz.tbd in Frameworks */,
239247
B78FA54D0EE70533533B492A /* Pods_iOS_SignalRClient.framework in Frameworks */,
240248
);
241249
runOnlyForDeploymentPostprocessing = 0;
@@ -244,6 +252,7 @@
244252
isa = PBXFrameworksBuildPhase;
245253
buildActionMask = 2147483647;
246254
files = (
255+
5A4292F7208D2A4A008B30EF /* libz.tbd in Frameworks */,
247256
3EE477C9B88482D1A4CDC1BB /* Pods_macOS_SignalRClient.framework in Frameworks */,
248257
);
249258
runOnlyForDeploymentPostprocessing = 0;
@@ -313,6 +322,7 @@
313322
5A9803541E5FE60E00BFFB0A /* SignalRClient */ = {
314323
isa = PBXGroup;
315324
children = (
325+
5A4292F3208D2945008B30EF /* WebSocket.swift */,
316326
5A32F4EA20829F700091C185 /* HandshakeProtocol.swift */,
317327
5A9803551E5FE60E00BFFB0A /* SignalRClient.h */,
318328
5A9803561E5FE60E00BFFB0A /* Info.plist */,
@@ -379,6 +389,8 @@
379389
5AD455E21E5FECC200732962 /* Frameworks */ = {
380390
isa = PBXGroup;
381391
children = (
392+
5A4292F6208D2A4A008B30EF /* libz.tbd */,
393+
5A4292F8208D2A59008B30EF /* libz.tbd */,
382394
A3A31D118C1F95EC1324A8D9 /* Pods_HubSample.framework */,
383395
CB121666480B08D75CA1E67A /* Pods_HubSamplePhone.framework */,
384396
43B143695FF3720D7A42DB7D /* Pods_SocketsSample.framework */,
@@ -490,7 +502,6 @@
490502
5A9803581E5FE60E00BFFB0A /* Frameworks */,
491503
5A9803591E5FE60E00BFFB0A /* Resources */,
492504
5A9A81131E5FF98100FE62A6 /* CopyFiles */,
493-
58289E49FE78FD7DB124281D /* [CP] Embed Pods Frameworks */,
494505
);
495506
buildRules = (
496507
);
@@ -511,7 +522,6 @@
511522
5A9A81581E63CAE100FE62A6 /* Frameworks */,
512523
5A9A81591E63CAE100FE62A6 /* Resources */,
513524
5A73DFE51E63E2CF007F3913 /* Embed Frameworks */,
514-
6FA5F404FC0798A286023685 /* [CP] Embed Pods Frameworks */,
515525
);
516526
buildRules = (
517527
);
@@ -532,7 +542,6 @@
532542
5AA9EFFB1E835AC200C5E248 /* Frameworks */,
533543
5AA9EFFC1E835AC200C5E248 /* Resources */,
534544
5AA9F0111E8381DD00C5E248 /* Embed Frameworks */,
535-
4BCEE3EBA86F19ED445D7D2A /* [CP] Embed Pods Frameworks */,
536545
);
537546
buildRules = (
538547
);
@@ -553,7 +562,6 @@
553562
5AEC70EA20310E3E00616DD2 /* Frameworks */,
554563
5AEC70EB20310E3E00616DD2 /* Resources */,
555564
5AEC7103203111F900616DD2 /* Embed Frameworks */,
556-
C75F95C6637064505799D5B6 /* [CP] Embed Pods Frameworks */,
557565
);
558566
buildRules = (
559567
);
@@ -699,42 +707,6 @@
699707
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
700708
showEnvVarsInLog = 0;
701709
};
702-
4BCEE3EBA86F19ED445D7D2A /* [CP] Embed Pods Frameworks */ = {
703-
isa = PBXShellScriptBuildPhase;
704-
buildActionMask = 2147483647;
705-
files = (
706-
);
707-
inputPaths = (
708-
"${SRCROOT}/Pods/Target Support Files/Pods-HubSample/Pods-HubSample-frameworks.sh",
709-
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-macOS/SwiftWebSocket.framework",
710-
);
711-
name = "[CP] Embed Pods Frameworks";
712-
outputPaths = (
713-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
714-
);
715-
runOnlyForDeploymentPostprocessing = 0;
716-
shellPath = /bin/sh;
717-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HubSample/Pods-HubSample-frameworks.sh\"\n";
718-
showEnvVarsInLog = 0;
719-
};
720-
58289E49FE78FD7DB124281D /* [CP] Embed Pods Frameworks */ = {
721-
isa = PBXShellScriptBuildPhase;
722-
buildActionMask = 2147483647;
723-
files = (
724-
);
725-
inputPaths = (
726-
"${SRCROOT}/Pods/Target Support Files/Pods-SignalRClientTests/Pods-SignalRClientTests-frameworks.sh",
727-
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-macOS/SwiftWebSocket.framework",
728-
);
729-
name = "[CP] Embed Pods Frameworks";
730-
outputPaths = (
731-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
732-
);
733-
runOnlyForDeploymentPostprocessing = 0;
734-
shellPath = /bin/sh;
735-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalRClientTests/Pods-SignalRClientTests-frameworks.sh\"\n";
736-
showEnvVarsInLog = 0;
737-
};
738710
5CD905B189219788E6F400CA /* [CP] Check Pods Manifest.lock */ = {
739711
isa = PBXShellScriptBuildPhase;
740712
buildActionMask = 2147483647;
@@ -753,24 +725,6 @@
753725
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
754726
showEnvVarsInLog = 0;
755727
};
756-
6FA5F404FC0798A286023685 /* [CP] Embed Pods Frameworks */ = {
757-
isa = PBXShellScriptBuildPhase;
758-
buildActionMask = 2147483647;
759-
files = (
760-
);
761-
inputPaths = (
762-
"${SRCROOT}/Pods/Target Support Files/Pods-SocketsSample/Pods-SocketsSample-frameworks.sh",
763-
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-macOS/SwiftWebSocket.framework",
764-
);
765-
name = "[CP] Embed Pods Frameworks";
766-
outputPaths = (
767-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
768-
);
769-
runOnlyForDeploymentPostprocessing = 0;
770-
shellPath = /bin/sh;
771-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SocketsSample/Pods-SocketsSample-frameworks.sh\"\n";
772-
showEnvVarsInLog = 0;
773-
};
774728
75D3869AEC191660116EC962 /* [CP] Check Pods Manifest.lock */ = {
775729
isa = PBXShellScriptBuildPhase;
776730
buildActionMask = 2147483647;
@@ -843,24 +797,6 @@
843797
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
844798
showEnvVarsInLog = 0;
845799
};
846-
C75F95C6637064505799D5B6 /* [CP] Embed Pods Frameworks */ = {
847-
isa = PBXShellScriptBuildPhase;
848-
buildActionMask = 2147483647;
849-
files = (
850-
);
851-
inputPaths = (
852-
"${SRCROOT}/Pods/Target Support Files/Pods-HubSamplePhone/Pods-HubSamplePhone-frameworks.sh",
853-
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-iOS/SwiftWebSocket.framework",
854-
);
855-
name = "[CP] Embed Pods Frameworks";
856-
outputPaths = (
857-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
858-
);
859-
runOnlyForDeploymentPostprocessing = 0;
860-
shellPath = /bin/sh;
861-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HubSamplePhone/Pods-HubSamplePhone-frameworks.sh\"\n";
862-
showEnvVarsInLog = 0;
863-
};
864800
/* End PBXShellScriptBuildPhase section */
865801

866802
/* Begin PBXSourcesBuildPhase section */
@@ -881,6 +817,7 @@
881817
5A406F512030F6540055671E /* TypeConverter.swift in Sources */,
882818
5A406F532030F65B0055671E /* Util.swift in Sources */,
883819
5A406F522030F6580055671E /* Transport.swift in Sources */,
820+
5A4292F5208D2945008B30EF /* WebSocket.swift in Sources */,
884821
5A406F4B2030F63D0055671E /* DefaultHttpClient.swift in Sources */,
885822
5A406F4D2030F6450055671E /* HubConnection.swift in Sources */,
886823
5A406F472030F6240055671E /* WebsocketsTransport.swift in Sources */,
@@ -906,6 +843,7 @@
906843
5A9A813B1E6397BE00FE62A6 /* Connection.swift in Sources */,
907844
5A004A042028293400A26C0B /* ServerInvocationHandler.swift in Sources */,
908845
5A4F86C51E71A54900D9A13F /* SignalRError.swift in Sources */,
846+
5A4292F4208D2945008B30EF /* WebSocket.swift in Sources */,
909847
5A9A813D1E63982400FE62A6 /* SocketConnectionDelegate.swift in Sources */,
910848
5A9A81431E63B0E900FE62A6 /* DefaultHttpClient.swift in Sources */,
911849
5A73DFEB1E6B8867007F3913 /* HubConnection.swift in Sources */,

0 commit comments

Comments
 (0)