Commit 99cdb421 authored by Davide De Rosa's avatar Davide De Rosa
Browse files

Merge branch 'develop'

QA: 2.6.1 Beta 4
parents 3e18e098 7bcd3210
......@@ -1155,7 +1155,6 @@
"${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",
......@@ -1172,7 +1171,6 @@
"${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",
......@@ -1199,7 +1197,6 @@
"${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",
......@@ -1216,7 +1213,6 @@
"${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",
......
......@@ -68,7 +68,7 @@ end
def tunnel_pods
#tunnel_by_path('..')
tunnel_by_git('182612e')
tunnel_by_git('9ed3842')
#tunnel_by_version('1.1.1')
end
......
......@@ -37,13 +37,10 @@ PODS:
- SwiftyBeaver
- PIATunnel/Core (1.1.2):
- 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.4.4)
- SwiftyBeaver (1.6.0)
- TPKeyboardAvoiding (1.3.2)
DEPENDENCIES:
......@@ -56,7 +53,7 @@ DEPENDENCIES:
- PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `070ca58`)
- PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `070ca58`)
- PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `070ca58`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `182612e`)
- PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `9ed3842`)
- SideMenu (= 3.1.5)
- TPKeyboardAvoiding
......@@ -71,7 +68,6 @@ SPEC REPOS:
- MBProgressHUD
- OpenSSL-Apple
- ReachabilitySwift
- SBObjectiveCWrapper
- SideMenu
- SwiftyBeaver
- TPKeyboardAvoiding
......@@ -81,7 +77,7 @@ EXTERNAL SOURCES:
:commit: 070ca58
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: 182612e
:commit: 9ed3842
:git: https://github.com/pia-foss/tunnel-apple
CHECKOUT OPTIONS:
......@@ -89,7 +85,7 @@ CHECKOUT OPTIONS:
:commit: 070ca58
:git: https://github.com/pia-foss/client-library-apple
PIATunnel:
:commit: 182612e
:commit: 9ed3842
:git: https://github.com/pia-foss/tunnel-apple
SPEC CHECKSUMS:
......@@ -102,13 +98,12 @@ SPEC CHECKSUMS:
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
PIALibrary: 1575ba514507cdbff905e9dcd8c3b718a86176c4
PIATunnel: 1b9b4957c1fd7e9295bbe8a364bfe396f500c803
PIATunnel: c86cb855e2fb5ad217e6123884ec61fae736636f
ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
SBObjectiveCWrapper: 854ea56b37cd0031af2b1d6e12c2f965fc4ff86d
SideMenu: 47dbf9e4d878062d8994aed43f6e4bf6c1fea30b
SwiftyBeaver: 25bd76281f49ca989ec2e3cbde9af89c15bc1432
SwiftyBeaver: e45759613e50b522b0e6f53b1f0f14389b45ca34
TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
PODFILE CHECKSUM: f0d9d0f6d3121a41deb6fa0109e65fd82d438729
PODFILE CHECKSUM: a14b2aedad8b1540b2a627365c5a76e9dfa2c735
COCOAPODS: 1.5.3
Markdown is supported
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