Skip to content

Commit 604c30b

Browse files
committed
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
* 'development' of https://github.com/socketio/socket.io-client-swift: don't use api extensions only don't try and start server change travis config remove log for dorequest
2 parents 1d56759 + af77e98 commit 604c30b

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ language: objective-c
22
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
33
xcode_scheme: SocketIO-iOS
44
osx_image: xcode7.3
5-
before_install:
6-
- cd Socket.IO-Test-Server/
7-
- npm install
8-
- cd ..
9-
install: node Socket.IO-Test-Server/main.js &
5+
branches:
6+
only:
7+
- master
8+
- development
109
script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize
11-
cache:
12-
directories:
13-
- Socket.IO-Test-Server/node_modules

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,6 @@
814814
isa = XCBuildConfiguration;
815815
buildSettings = {
816816
ALWAYS_SEARCH_USER_PATHS = NO;
817-
APPLICATION_EXTENSION_API_ONLY = YES;
818817
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
819818
CLANG_CXX_LIBRARY = "libc++";
820819
CLANG_ENABLE_MODULES = YES;
@@ -871,7 +870,6 @@
871870
isa = XCBuildConfiguration;
872871
buildSettings = {
873872
ALWAYS_SEARCH_USER_PATHS = NO;
874-
APPLICATION_EXTENSION_API_ONLY = YES;
875873
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
876874
CLANG_CXX_LIBRARY = "libc++";
877875
CLANG_ENABLE_MODULES = YES;

Source/SocketEnginePollable.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ extension SocketEnginePollable {
9797

9898
func doRequest(req: NSURLRequest, withCallback callback: (NSData?, NSURLResponse?, NSError?) -> Void) {
9999
if !polling || closed || invalidated || fastUpgrade {
100-
DefaultSocketLogger.Logger.error("Tried to do polling request when not supposed to", type: "SocketEnginePolling")
101100
return
102101
}
103102

0 commit comments

Comments
 (0)