From 4ecef0cb6652ef9ee5de2321f0ac029becb94f34 Mon Sep 17 00:00:00 2001 From: Ricardo Pereira Date: Sat, 20 Jun 2015 18:20:20 +0100 Subject: [PATCH 1/4] Copy framework: SwiftWebSocket --- SocketIOKit.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SocketIOKit.xcodeproj/project.pbxproj b/SocketIOKit.xcodeproj/project.pbxproj index e388c87..d641819 100644 --- a/SocketIOKit.xcodeproj/project.pbxproj +++ b/SocketIOKit.xcodeproj/project.pbxproj @@ -390,7 +390,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/local/bin/carthage copy-frameworks"; - shellScript = "$(SRCROOT)/Carthage/Build/Mac/Runes.framework"; + shellScript = "$(SRCROOT)/Carthage/Build/Mac/Runes.framework\n$(SRCROOT)/Carthage/Build/iOS/SwiftWebSocket.framework"; }; D7CC0C7C1B113ADE00D5E036 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -403,7 +403,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/local/bin/carthage copy-frameworks"; - shellScript = "$(SRCROOT)/Carthage/Build/iOS/Runes.framework"; + shellScript = "$(SRCROOT)/Carthage/Build/iOS/Runes.framework\n$(SRCROOT)/Carthage/Build/iOS/SwiftWebSocket.framework"; }; /* End PBXShellScriptBuildPhase section */ From 826cda0b9677d02021308933a6c9ffe1b1e05082 Mon Sep 17 00:00:00 2001 From: Ricardo Pereira Date: Sat, 20 Jun 2015 18:24:24 +0100 Subject: [PATCH 2/4] Copy framework: SwiftWebSocket --- SocketIOKit.xcodeproj/project.pbxproj | 10 +--------- Tests/Tests.swift | 11 ++--------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/SocketIOKit.xcodeproj/project.pbxproj b/SocketIOKit.xcodeproj/project.pbxproj index d641819..a8ee05e 100644 --- a/SocketIOKit.xcodeproj/project.pbxproj +++ b/SocketIOKit.xcodeproj/project.pbxproj @@ -54,10 +54,6 @@ D7904C8A1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; }; D7904C8B1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; }; D7904CA71B1545CB00FF50D1 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C2B1B1539EA00FF50D1 /* Tests.swift */; }; - D7904CA81B15468300FF50D1 /* Nimble.framework in Resources */ = {isa = PBXBuildFile; fileRef = D7904C921B153DF400FF50D1 /* Nimble.framework */; }; - D7904CA91B15468300FF50D1 /* Quick.framework in Resources */ = {isa = PBXBuildFile; fileRef = D7904C931B153DF400FF50D1 /* Quick.framework */; }; - D7904CAA1B15468E00FF50D1 /* Nimble.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7904C921B153DF400FF50D1 /* Nimble.framework */; }; - D7904CAB1B15468E00FF50D1 /* Quick.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7904C931B153DF400FF50D1 /* Quick.framework */; }; D7904CAD1B15BE3900FF50D1 /* SocketIOUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904CAC1B15BE3900FF50D1 /* SocketIOUtilities.swift */; }; D7904CAE1B15BE3900FF50D1 /* SocketIOUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904CAC1B15BE3900FF50D1 /* SocketIOUtilities.swift */; }; /* End PBXBuildFile section */ @@ -116,8 +112,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D7904CAA1B15468E00FF50D1 /* Nimble.framework in Frameworks */, - D7904CAB1B15468E00FF50D1 /* Quick.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -371,8 +365,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - D7904CA81B15468300FF50D1 /* Nimble.framework in Resources */, - D7904CA91B15468300FF50D1 /* Quick.framework in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -390,7 +382,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/local/bin/carthage copy-frameworks"; - shellScript = "$(SRCROOT)/Carthage/Build/Mac/Runes.framework\n$(SRCROOT)/Carthage/Build/iOS/SwiftWebSocket.framework"; + shellScript = "$(SRCROOT)/Carthage/Build/Mac/Runes.framework\n$(SRCROOT)/Carthage/Build/Mac/SwiftWebSocket.framework"; }; D7CC0C7C1B113ADE00D5E036 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; diff --git a/Tests/Tests.swift b/Tests/Tests.swift index b9d73ff..89d00a9 100644 --- a/Tests/Tests.swift +++ b/Tests/Tests.swift @@ -6,15 +6,8 @@ // Copyright (c) 2015 Ricardo Pereira. All rights reserved. // -import Quick -import Nimble import SocketIOKit -class SocketIOKitSpec: QuickSpec { - override func spec() { - it("is 1 + 1 = 2") { - // TODO - expect(1 + 1).to(equal(2)) - } - } +class SocketIOKitSpec { + } \ No newline at end of file From 4473be58d4cb2735c1aa5392ce1706593ec79744 Mon Sep 17 00:00:00 2001 From: Ricardo Pereira Date: Sat, 20 Jun 2015 18:39:54 +0100 Subject: [PATCH 3/4] SwiftWebSocket doesn't have a Mac version --- Source/SocketIOWebSocket.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/SocketIOWebSocket.swift b/Source/SocketIOWebSocket.swift index 4a42f0e..e10efb7 100644 --- a/Source/SocketIOWebSocket.swift +++ b/Source/SocketIOWebSocket.swift @@ -7,7 +7,11 @@ // import Foundation + +// TODO: SwiftWebSocket doesn't have a Mac version! +#if os(iOS) import SwiftWebSocket +#endif private enum WSScheme: String { case WS = "ws" @@ -15,7 +19,8 @@ private enum WSScheme: String { } class SocketIOWebSocket: SocketIOTransport { - + + #if os(iOS) private var ws: WebSocket! private let defaultPort = 80 private var pingTimer: NSTimer? @@ -296,5 +301,6 @@ class SocketIOWebSocket: SocketIOTransport { println("Ping") #endif } + #endif } From 737c8f43b180cba80e1b08223b11fb6d521d5f9f Mon Sep 17 00:00:00 2001 From: Ricardo Pereira Date: Sat, 20 Jun 2015 18:45:56 +0100 Subject: [PATCH 4/4] SwiftWebSocket doesn't have a Mac version --- SocketIOKit.xcodeproj/project.pbxproj | 2 -- Source/SocketIO.swift | 7 +++++++ Source/SocketIOWebSocket.swift | 6 ------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/SocketIOKit.xcodeproj/project.pbxproj b/SocketIOKit.xcodeproj/project.pbxproj index a8ee05e..724af08 100644 --- a/SocketIOKit.xcodeproj/project.pbxproj +++ b/SocketIOKit.xcodeproj/project.pbxproj @@ -52,7 +52,6 @@ D7904C881B153B0B00FF50D1 /* SocketIOTransportDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C561B153B0B00FF50D1 /* SocketIOTransportDelegate.swift */; }; D7904C891B153B0B00FF50D1 /* SocketIOTransportDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C561B153B0B00FF50D1 /* SocketIOTransportDelegate.swift */; }; D7904C8A1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; }; - D7904C8B1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; }; D7904CA71B1545CB00FF50D1 /* Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C2B1B1539EA00FF50D1 /* Tests.swift */; }; D7904CAD1B15BE3900FF50D1 /* SocketIOUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904CAC1B15BE3900FF50D1 /* SocketIOUtilities.swift */; }; D7904CAE1B15BE3900FF50D1 /* SocketIOUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904CAC1B15BE3900FF50D1 /* SocketIOUtilities.swift */; }; @@ -446,7 +445,6 @@ D7904C751B153B0B00FF50D1 /* SocketIOJSONHandshake.swift in Sources */, D7904C891B153B0B00FF50D1 /* SocketIOTransportDelegate.swift in Sources */, D7904C651B153B0B00FF50D1 /* SocketIOCallback.swift in Sources */, - D7904C8B1B153B0B00FF50D1 /* SocketIOWebSocket.swift in Sources */, D7904C7D1B153B0B00FF50D1 /* SocketIOPacket.swift in Sources */, D7904C7B1B153B0B00FF50D1 /* SocketIOOptions.swift in Sources */, D7904C791B153B0B00FF50D1 /* SocketIOObject.swift in Sources */, diff --git a/Source/SocketIO.swift b/Source/SocketIO.swift index 381f248..1409537 100644 --- a/Source/SocketIO.swift +++ b/Source/SocketIO.swift @@ -291,3 +291,10 @@ public class SocketIO: SocketIOReceiver, SocketIOEmitter { } } + +// TODO: SwiftWebSocket doesn't have a Mac version! +#if os(OSX) + class SocketIOWebSocket: SocketIOTransport { + + } +#endif diff --git a/Source/SocketIOWebSocket.swift b/Source/SocketIOWebSocket.swift index e10efb7..a66df7d 100644 --- a/Source/SocketIOWebSocket.swift +++ b/Source/SocketIOWebSocket.swift @@ -7,11 +7,7 @@ // import Foundation - -// TODO: SwiftWebSocket doesn't have a Mac version! -#if os(iOS) import SwiftWebSocket -#endif private enum WSScheme: String { case WS = "ws" @@ -20,7 +16,6 @@ private enum WSScheme: String { class SocketIOWebSocket: SocketIOTransport { - #if os(iOS) private var ws: WebSocket! private let defaultPort = 80 private var pingTimer: NSTimer? @@ -301,6 +296,5 @@ class SocketIOWebSocket: SocketIOTransport { println("Ping") #endif } - #endif }