Merge pull request #16 from ricardopereira/v2.0

V2.0
ricardopereira · Jun 20, 2015 · 2c416e9 · 2c416e9
2 parents 7d0b1a5 + 737c8f4
commit 2c416e9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/SocketIOKit.xcodeproj/project.pbxproj b/SocketIOKit.xcodeproj/project.pbxproj
@@ -52,12 +52,7 @@
 		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 */; };
-		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 +111,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D7904CAA1B15468E00FF50D1 /* Nimble.framework in Frameworks */,
-				D7904CAB1B15468E00FF50D1 /* Quick.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -371,8 +364,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D7904CA81B15468300FF50D1 /* Nimble.framework in Resources */,
-				D7904CA91B15468300FF50D1 /* Quick.framework in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -390,7 +381,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/Mac/SwiftWebSocket.framework";
 		};
 		D7CC0C7C1B113ADE00D5E036 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -403,7 +394,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 */
 
@@ -454,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
@@ -291,3 +291,10 @@ public class SocketIO<T: Printable>: 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
@@ -15,7 +15,7 @@ private enum WSScheme: String {
 }
 
 class SocketIOWebSocket: SocketIOTransport {
-    
+
     private var ws: WebSocket!
     private let defaultPort = 80
     private var pingTimer: NSTimer?

diff --git 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 {
+
 }