From c9b60445ca10d240464ee80e17553f990c93e9e9 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Thu, 21 Jul 2016 10:28:20 -0400 Subject: [PATCH 1/4] 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/4] 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 From cc449a49eaef078e5a2f7016e13d1f9a9895374a Mon Sep 17 00:00:00 2001 From: Erik Little Date: Thu, 21 Jul 2016 10:49:32 -0400 Subject: [PATCH 3/4] don't try and start server --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17b777a..6afadee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,4 @@ 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 From af77e984ab8297ceefb2af74aab797430e73c4e2 Mon Sep 17 00:00:00 2001 From: Erik Little Date: Fri, 22 Jul 2016 09:13:03 -0400 Subject: [PATCH 4/4] don't use api extensions only --- Socket.IO-Client-Swift.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj index d005db9..392f9ea 100644 --- a/Socket.IO-Client-Swift.xcodeproj/project.pbxproj +++ b/Socket.IO-Client-Swift.xcodeproj/project.pbxproj @@ -814,7 +814,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -871,7 +870,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES;