Commit 26b35f09 authored by Davide De Rosa's avatar Davide De Rosa
Browse files

Merge branch '14-openvpn-reconnection-may-be-slow-due-to-dns-timeout' into 'develop'

Resolve "OpenVPN reconnection may be slow due to DNS timeout"
parents 616513a1 227864a8
......@@ -1155,6 +1155,7 @@
"${BUILT_PRODUCTS_DIR}/PIALibrary/PIALibrary.framework",
"${BUILT_PRODUCTS_DIR}/PIATunnel/PIATunnel.framework",
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SBObjectiveCWrapper/SBObjectiveCWrapper.framework",
"${BUILT_PRODUCTS_DIR}/SideMenu/SideMenu.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework",
"${BUILT_PRODUCTS_DIR}/TPKeyboardAvoiding/TPKeyboardAvoiding.framework",
......@@ -1171,6 +1172,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIALibrary.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIATunnel.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SBObjectiveCWrapper.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SideMenu.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TPKeyboardAvoiding.framework",
......@@ -1197,6 +1199,7 @@
"${BUILT_PRODUCTS_DIR}/PIALibrary/PIALibrary.framework",
"${BUILT_PRODUCTS_DIR}/PIATunnel/PIATunnel.framework",
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/SBObjectiveCWrapper/SBObjectiveCWrapper.framework",
"${BUILT_PRODUCTS_DIR}/SideMenu/SideMenu.framework",
"${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework",
"${BUILT_PRODUCTS_DIR}/TPKeyboardAvoiding/TPKeyboardAvoiding.framework",
......@@ -1213,6 +1216,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIALibrary.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIATunnel.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SBObjectiveCWrapper.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SideMenu.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TPKeyboardAvoiding.framework",
......
......@@ -66,7 +66,7 @@ end
def tunnel_pods
#tunnel_by_path('..')
tunnel_by_git('b976f5e')
tunnel_by_git('c3550d7')
#tunnel_by_version('1.0')
end
......
PODS:
- Alamofire (4.7.1)
- Alamofire (4.7.2)
- AlamofireImage (3.3.1):
- Alamofire (~> 4.5)
- FXPageControl (1.5)
......@@ -37,10 +37,13 @@ PODS:
- SwiftyBeaver
- PIATunnel/Core (1.1):
- OpenSSL-Apple (~> 1.1.0h)
- SBObjectiveCWrapper
- SwiftyBeaver
- ReachabilitySwift (4.1.0)
- SBObjectiveCWrapper (1.4.0):
- SwiftyBeaver (~> 1.4.0)
- SideMenu (3.1.5)
- SwiftyBeaver (1.5.2)
- SwiftyBeaver (1.4.4)
- TPKeyboardAvoiding (1.3.2)
DEPENDENCIES:
......@@ -53,7 +56,7 @@ DEPENDENCIES:
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `89185a0`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `89185a0`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `89185a0`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `b976f5e`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `c3550d7`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -68,6 +71,7 @@ SPEC REPOS:
- MBProgressHUD
- OpenSSL-Apple
- ReachabilitySwift
- SBObjectiveCWrapper
- SideMenu
- SwiftyBeaver
- TPKeyboardAvoiding
......@@ -77,7 +81,7 @@ EXTERNAL SOURCES:
:commit: 89185a0
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: b976f5e
:commit: c3550d7
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
......@@ -85,11 +89,11 @@ CHECKOUT OPTIONS:
:commit: 89185a0
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: b976f5e
:commit: c3550d7
:git: https://github.com/pia-foss/tunnel-apple
SPEC CHECKSUMS:
Alamofire: 68d7d521118d49c615a8d2214d87cdf525599d30
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
AlamofireImage: 3b35b586853abaf94ca1250f4e94cff3c21a4c0d
FXPageControl: 97620412515365d10a3282ec0660f49f6401a8f0
Gloss: b67617f327406adfd47adf20172d00680a3a31bd
......@@ -98,12 +102,13 @@ SPEC CHECKSUMS:
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
PIALibrary: 46793b4820c4e0d0a1a5ff463c60271dd20d4221
PIATunnel: 2d5ce6aa731037103dd5f7db0b816833a4f447c1
PIATunnel: e7599084a0402dae220f67a9b1aebe609aa40a34
ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
SBObjectiveCWrapper: 854ea56b37cd0031af2b1d6e12c2f965fc4ff86d
SideMenu: 47dbf9e4d878062d8994aed43f6e4bf6c1fea30b
SwiftyBeaver: 85daaaa2b3ae6e31b7b55c99430e8b91dac088af
SwiftyBeaver: 25bd76281f49ca989ec2e3cbde9af89c15bc1432
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: 13fc99447590a6d2400d2f7453ee069dfe18e4e4
PODFILE CHECKSUM: f628f3ea426939c8239b6cffaae9075245919708
COCOAPODS: 1.5.2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment