Merge branch 'socketio/swift-2'

This commit is contained in:
Lukas Schmidt 2015-09-03 07:57:37 +02:00
commit 530e6f8f9d
7 changed files with 12 additions and 5 deletions

5
.travis.yml Normal file
View File

@ -0,0 +1,5 @@
language: objective-c
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
xcode_scheme: SocketIO-iOS
osx_image: xcode7
script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-iOS -sdk iphonesimulator build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

View File

@ -535,6 +535,7 @@
572EF2121B51F12F00EEBB58 /* Debug */ = { 572EF2121B51F12F00EEBB58 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "Developer ID Application";
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
PRODUCT_NAME = SocketIO; PRODUCT_NAME = SocketIO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@ -544,6 +545,7 @@
572EF2131B51F12F00EEBB58 /* Release */ = { 572EF2131B51F12F00EEBB58 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "Developer ID Application";
PRODUCT_NAME = SocketIO; PRODUCT_NAME = SocketIO;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
}; };

View File

@ -1,5 +1,5 @@
var app = require('express')() var app = require('express')()
var server = app.listen(8080) var server = app.listen(6979)
var io = require('socket.io')(server) var io = require('socket.io')(server)
var acknowledgementsEvents = require("./acknowledgementEvents.js") var acknowledgementsEvents = require("./acknowledgementEvents.js")
var emitEvents = require("./emitEvents.js") var emitEvents = require("./emitEvents.js")

View File

@ -13,7 +13,7 @@ class SocketAcknowledgementTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Acknowledgement testKind = TestKind.Acknowledgement
socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10

View File

@ -13,7 +13,7 @@ class SocketEmitTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Emit testKind = TestKind.Emit
socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10

View File

@ -13,7 +13,7 @@ class SocketNamespaceAcknowledgementTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Acknowledgement testKind = TestKind.Acknowledgement
socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10

View File

@ -13,7 +13,7 @@ class SocketNamespaceEmitTest: AbstractSocketTest {
override func setUp() { override func setUp() {
super.setUp() super.setUp()
testKind = TestKind.Emit testKind = TestKind.Emit
socket = SocketIOClient(socketURL: "127.0.0.1:8080", opts: [ socket = SocketIOClient(socketURL: "milkbartube.com:6979", opts: [
"reconnects": true, // default true "reconnects": true, // default true
"reconnectAttempts": -1, // default -1 "reconnectAttempts": -1, // default -1
"reconnectWait": 5, // default 10 "reconnectWait": 5, // default 10