Skip to content

Commit

Permalink
Temporarily replacing SwiftWebSocket pod with SwiftWebSocket source
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@moozzyk
moozzyk committed Apr 22, 2018
1 parent 6e6a31d commit b2b30f7
Show file tree
Hide file tree
Showing 6 changed files with 1,850 additions and 94 deletions.
4 changes: 2 additions & 2 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ end
target 'iOS SignalRClient' do
use_frameworks!
platform :ios, '9.0'
pod 'SwiftWebSocket', '~> 2.7'
# pod 'SwiftWebSocket', '~> 2.7'
end

target 'macOS SignalRClient' do
use_frameworks!
platform :osx, '10.13'
pod 'SwiftWebSocket', '~> 2.7'
# pod 'SwiftWebSocket', '~> 2.7'
end

target 'SocketsSample' do
Expand Down
15 changes: 1 addition & 14 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
PODS:
- SwiftWebSocket (2.7.0)

DEPENDENCIES:
- SwiftWebSocket (~> 2.7)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- SwiftWebSocket

SPEC CHECKSUMS:
SwiftWebSocket: 612c9729fd503cb6b0b8b45390c788686dac306f

PODFILE CHECKSUM: 9c66a5c5568d403b205b561306afa348593a412b
PODFILE CHECKSUM: bb2f3edb1650e977e46a2a5f1b1dc67cd3e6fb3c

COCOAPODS: 1.5.0
90 changes: 14 additions & 76 deletions SignalRClient.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
5A406F542030F65F0055671E /* HubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82D1F52A774003EEC55 /* HubProtocol.swift */; };
5A406F552030F6620055671E /* JSONHubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82F1F53392E003EEC55 /* JSONHubProtocol.swift */; };
5A406F562030F6660055671E /* ServerInvocationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A004A032028293400A26C0B /* ServerInvocationHandler.swift */; };
5A4292F4208D2945008B30EF /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4292F3208D2945008B30EF /* WebSocket.swift */; };
5A4292F5208D2945008B30EF /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A4292F3208D2945008B30EF /* WebSocket.swift */; };
5A4292F7208D2A4A008B30EF /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A4292F6208D2A4A008B30EF /* libz.tbd */; };
5A4292F9208D2A59008B30EF /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A4292F8208D2A59008B30EF /* libz.tbd */; };
5A45C82E1F52A774003EEC55 /* HubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82D1F52A774003EEC55 /* HubProtocol.swift */; };
5A45C8301F53392E003EEC55 /* JSONHubProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C82F1F53392E003EEC55 /* JSONHubProtocol.swift */; };
5A45C8321F5AFDB6003EEC55 /* JSONHubProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A45C8311F5AFDB6003EEC55 /* JSONHubProtocolTests.swift */; };
Expand Down Expand Up @@ -175,6 +179,9 @@
5A32F4EF2084195A0091C185 /* HubProtocolFake.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HubProtocolFake.swift; sourceTree = "<group>"; };
5A341EB71E7CDCA400F6D41D /* TypeConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TypeConverter.swift; sourceTree = "<group>"; };
5A406F3E2030F4960055671E /* SignalRClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SignalRClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5A4292F3208D2945008B30EF /* WebSocket.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = "<group>"; };
5A4292F6208D2A4A008B30EF /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
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; };
5A45C82D1F52A774003EEC55 /* HubProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HubProtocol.swift; sourceTree = "<group>"; };
5A45C82F1F53392E003EEC55 /* JSONHubProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONHubProtocol.swift; sourceTree = "<group>"; };
5A45C8311F5AFDB6003EEC55 /* JSONHubProtocolTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONHubProtocolTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -236,6 +243,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5A4292F9208D2A59008B30EF /* libz.tbd in Frameworks */,
B78FA54D0EE70533533B492A /* Pods_iOS_SignalRClient.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -244,6 +252,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5A4292F7208D2A4A008B30EF /* libz.tbd in Frameworks */,
3EE477C9B88482D1A4CDC1BB /* Pods_macOS_SignalRClient.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -313,6 +322,7 @@
5A9803541E5FE60E00BFFB0A /* SignalRClient */ = {
isa = PBXGroup;
children = (
5A4292F3208D2945008B30EF /* WebSocket.swift */,
5A32F4EA20829F700091C185 /* HandshakeProtocol.swift */,
5A9803551E5FE60E00BFFB0A /* SignalRClient.h */,
5A9803561E5FE60E00BFFB0A /* Info.plist */,
Expand Down Expand Up @@ -379,6 +389,8 @@
5AD455E21E5FECC200732962 /* Frameworks */ = {
isa = PBXGroup;
children = (
5A4292F6208D2A4A008B30EF /* libz.tbd */,
5A4292F8208D2A59008B30EF /* libz.tbd */,
A3A31D118C1F95EC1324A8D9 /* Pods_HubSample.framework */,
CB121666480B08D75CA1E67A /* Pods_HubSamplePhone.framework */,
43B143695FF3720D7A42DB7D /* Pods_SocketsSample.framework */,
Expand Down Expand Up @@ -490,7 +502,6 @@
5A9803581E5FE60E00BFFB0A /* Frameworks */,
5A9803591E5FE60E00BFFB0A /* Resources */,
5A9A81131E5FF98100FE62A6 /* CopyFiles */,
58289E49FE78FD7DB124281D /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -511,7 +522,6 @@
5A9A81581E63CAE100FE62A6 /* Frameworks */,
5A9A81591E63CAE100FE62A6 /* Resources */,
5A73DFE51E63E2CF007F3913 /* Embed Frameworks */,
6FA5F404FC0798A286023685 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -532,7 +542,6 @@
5AA9EFFB1E835AC200C5E248 /* Frameworks */,
5AA9EFFC1E835AC200C5E248 /* Resources */,
5AA9F0111E8381DD00C5E248 /* Embed Frameworks */,
4BCEE3EBA86F19ED445D7D2A /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand All @@ -553,7 +562,6 @@
5AEC70EA20310E3E00616DD2 /* Frameworks */,
5AEC70EB20310E3E00616DD2 /* Resources */,
5AEC7103203111F900616DD2 /* Embed Frameworks */,
C75F95C6637064505799D5B6 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -699,42 +707,6 @@
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";
showEnvVarsInLog = 0;
};
4BCEE3EBA86F19ED445D7D2A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-HubSample/Pods-HubSample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-macOS/SwiftWebSocket.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HubSample/Pods-HubSample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
58289E49FE78FD7DB124281D /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-SignalRClientTests/Pods-SignalRClientTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-macOS/SwiftWebSocket.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SignalRClientTests/Pods-SignalRClientTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
5CD905B189219788E6F400CA /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -753,24 +725,6 @@
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";
showEnvVarsInLog = 0;
};
6FA5F404FC0798A286023685 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-SocketsSample/Pods-SocketsSample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-macOS/SwiftWebSocket.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-SocketsSample/Pods-SocketsSample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
75D3869AEC191660116EC962 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -843,24 +797,6 @@
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";
showEnvVarsInLog = 0;
};
C75F95C6637064505799D5B6 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-HubSamplePhone/Pods-HubSamplePhone-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/SwiftWebSocket-iOS/SwiftWebSocket.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftWebSocket.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-HubSamplePhone/Pods-HubSamplePhone-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -881,6 +817,7 @@
5A406F512030F6540055671E /* TypeConverter.swift in Sources */,
5A406F532030F65B0055671E /* Util.swift in Sources */,
5A406F522030F6580055671E /* Transport.swift in Sources */,
5A4292F5208D2945008B30EF /* WebSocket.swift in Sources */,
5A406F4B2030F63D0055671E /* DefaultHttpClient.swift in Sources */,
5A406F4D2030F6450055671E /* HubConnection.swift in Sources */,
5A406F472030F6240055671E /* WebsocketsTransport.swift in Sources */,
Expand All @@ -906,6 +843,7 @@
5A9A813B1E6397BE00FE62A6 /* Connection.swift in Sources */,
5A004A042028293400A26C0B /* ServerInvocationHandler.swift in Sources */,
5A4F86C51E71A54900D9A13F /* SignalRError.swift in Sources */,
5A4292F4208D2945008B30EF /* WebSocket.swift in Sources */,
5A9A813D1E63982400FE62A6 /* SocketConnectionDelegate.swift in Sources */,
5A9A81431E63B0E900FE62A6 /* DefaultHttpClient.swift in Sources */,
5A73DFEB1E6B8867007F3913 /* HubConnection.swift in Sources */,
Expand Down
Loading

0 comments on commit b2b30f7

Please sign in to comment.