Skip to content
This repository has been archived by the owner on Jun 22, 2021. It is now read-only.

Commit

Permalink
Merge pull request #17 from ricardopereira/v2.0.1
Browse files Browse the repository at this point in the history
2.0.1 - SwiftWebSocket with OSX version
  • Loading branch information
ricardopereira committed Jun 20, 2015
2 parents 2c416e9 + 650d641 commit b0d918d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "thoughtbot/runes" == 2.0.0
github "tidwall/SwiftWebSocket" == 0.1.18
github "ricardopereira/SwiftWebSocket" "rp-osx-v0.1.18"
2 changes: 1 addition & 1 deletion SocketIOKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'SocketIOKit'
spec.version = '2.0.0'
spec.version = '2.0.1'
spec.summary = 'Socket.io iOS and OSX Client compatible with v1.0 and later'
spec.homepage = 'https://github.com/ricardopereira/SocketIO-Kit'
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
Expand Down
2 changes: 2 additions & 0 deletions SocketIOKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
D70F6DDC1B0F3F1F007DDF31 /* SocketIOKit.h in Headers */ = {isa = PBXBuildFile; fileRef = D70F6DDB1B0F3F1F007DDF31 /* SocketIOKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
D719491D1B35EACD0015C529 /* SocketIOWebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C571B153B0B00FF50D1 /* SocketIOWebSocket.swift */; };
D7904C291B15339A00FF50D1 /* SocketIOKit.h in Headers */ = {isa = PBXBuildFile; fileRef = D70F6DDB1B0F3F1F007DDF31 /* SocketIOKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
D7904C581B153B0B00FF50D1 /* NSURL+TrailingSlash.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C3D1B153B0B00FF50D1 /* NSURL+TrailingSlash.swift */; };
D7904C591B153B0B00FF50D1 /* NSURL+TrailingSlash.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7904C3D1B153B0B00FF50D1 /* NSURL+TrailingSlash.swift */; };
Expand Down Expand Up @@ -450,6 +451,7 @@
D7904C791B153B0B00FF50D1 /* SocketIOObject.swift in Sources */,
D7904C6F1B153B0B00FF50D1 /* SocketIOEventHandler.swift in Sources */,
D7904C731B153B0B00FF50D1 /* SocketIOJSON.swift in Sources */,
D719491D1B35EACD0015C529 /* SocketIOWebSocket.swift in Sources */,
D7904C671B153B0B00FF50D1 /* SocketIOConnection.swift in Sources */,
D7904C591B153B0B00FF50D1 /* NSURL+TrailingSlash.swift in Sources */,
D7904C691B153B0B00FF50D1 /* SocketIOEmitter.swift in Sources */,
Expand Down
7 changes: 0 additions & 7 deletions Source/SocketIO.swift
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,3 @@ public class SocketIO<T: Printable>: SocketIOReceiver, SocketIOEmitter {
}

}

// TODO: SwiftWebSocket doesn't have a Mac version!
#if os(OSX)
class SocketIOWebSocket: SocketIOTransport {

}
#endif

0 comments on commit b0d918d

Please sign in to comment.