Merge branch 'iOS' into iOS_1596

thaliproject · Dec 12, 2016 · b781cc1 · b781cc1
2 parents 1a0d67d + f67220e
commit b781cc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/ios/ThaliCore/ThaliCoreTests/SocketConnectionTests/BrowserRelayTests.swift b/lib/ios/ThaliCore/ThaliCoreTests/SocketConnectionTests/BrowserRelayTests.swift
@@ -163,7 +163,7 @@ class BrowserRelayTests: XCTestCase {
     relay.closeRelay()
 
     let clientMock = TCPClientMock(didReadData: unexpectedReadDataHandler,
-                                   didConnect: unexpectedConnectHandler,
+                                   didConnect: {},
                                    didDisconnect: {
                                      clientCantConnectToListener?.fulfill()
                                    })

diff --git a/thali/package.json b/thali/package.json
@@ -36,7 +36,7 @@
       "buildToolsVersion": "25.0.0",
       "compileSdkVersion": "android-23"
     },
-    "btconnectorlib2": "0.3.6-alpha",
+    "btconnectorlib2": "0.3.7-alpha",
     "jxcore-cordova": "0.1.7",
     "jxcore-cordova-url": "http://jxcore.azureedge.net/jxcore-cordova/0.1.7/release/io.jxcore.node.jx"
   },