From c9b60445ca10d240464ee80e17553f990c93e9e9 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Thu, 21 Jul 2016 10:28:20 -0400 Subject: [PATCH 1/2] remove log for dorequest --- Source/SocketEnginePollable.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/SocketEnginePollable.swift b/Source/SocketEnginePollable.swift index 77dc7f6..b4c5f57 100644 --- a/Source/SocketEnginePollable.swift +++ b/Source/SocketEnginePollable.swift @@ -97,7 +97,6 @@ extension SocketEnginePollable { func doRequest(req: NSURLRequest, withCallback callback: (NSData?, NSURLResponse?, NSError?) -> Void) { if !polling || closed || invalidated || fastUpgrade { - DefaultSocketLogger.Logger.error("Tried to do polling request when not supposed to", type: "SocketEnginePolling") return } From 87c86f8aeb39d02453beb1e0cee0ce13eda79ff8 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Thu, 21 Jul 2016 10:42:14 -0400 Subject: [PATCH 2/2] change travis config --- .travis.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c37d53c..17b777a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,9 @@ language: objective-c xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_scheme: SocketIO-iOS osx_image: xcode7.3 -before_install: - - cd Socket.IO-Test-Server/ - - npm install - - cd .. +branches: + only: + - master + - development install: node Socket.IO-Test-Server/main.js & script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize -cache: - directories: - - Socket.IO-Test-Server/node_modules