[ci-skip] Merge branch 'develop' into 'master'

Apple review 2.6

Podfile

@@ -4,27 +4,29 @@ use_frameworks!
 
 # Libraries
 
+$git_root = "https://github.com/pia-foss"
+
 $library_pod = 'PIALibrary'
+$library_repo = 'client-library-apple'
 $library_subspecs = [
     'Library',
     'UI',
     'Mock',
     'VPN'
 ]
-$library_url = "https://github.com/pia-foss/client-library-apple"
 
 $tunnel_pod = 'PIATunnel'
-$tunnel_url = "https://github.com/pia-foss/tunnel-apple"
+$tunnel_repo = 'tunnel-apple'
 
 def library_by_path(root)
     $library_subspecs.each { |name|
-        pod "#{$library_pod}/#{name}", :path => "#{root}/client-library-apple"
+        pod "#{$library_pod}/#{name}", :path => "#{root}/#{$library_repo}"
     }
 end
 
 def library_by_git(sha)
     $library_subspecs.each { |name|
-        pod "#{$library_pod}/#{name}", :git => $library_url, :commit => sha
+        pod "#{$library_pod}/#{name}", :git => "#{$git_root}/#{$library_repo}", :commit => sha
     }
 end
 
@@ -35,11 +37,11 @@ def library_by_version(version)
 end
 
 def tunnel_by_path(root)
-    pod $tunnel_pod, :path => "#{root}/tunnel-apple"
+    pod $tunnel_pod, :path => "#{root}/#{$tunnel_repo}"
 end
 
 def tunnel_by_git(sha)
-    pod $tunnel_pod, :git => $tunnel_url, :commit => sha
+    pod $tunnel_pod, :git => "#{$git_root}/#{$tunnel_repo}", :commit => sha
 end
 
 def tunnel_by_version(version)
@@ -51,8 +53,8 @@ end
 def shared_main_pods
     pod 'AlamofireImage'
     #library_by_path('..')
-    library_by_git('7feb16e')
-    #library_by_version('1.0')
+    #library_by_git('7feb16e')
+    library_by_version('1.1.0')
 end
 
 def app_pods
@@ -66,8 +68,8 @@ end
 
 def tunnel_pods
     #tunnel_by_path('..')
-    tunnel_by_git('216ef12')
-    #tunnel_by_version('1.0')
+    #tunnel_by_git('216ef12')
+    tunnel_by_version('1.1.0')
 end
 
 # Targets

Podfile.lock

@@ -10,32 +10,32 @@ PODS:
   - iRate (1.12.2)
   - MBProgressHUD (1.1.0)
   - OpenSSL-Apple (1.1.0h)
-  - PIALibrary/Core (1.1)
-  - PIALibrary/Library (1.1):
+  - PIALibrary/Core (1.1.0)
+  - PIALibrary/Library (1.1.0):
     - Alamofire (~> 4)
     - Gloss (~> 2)
     - PIALibrary/Core
     - PIALibrary/Util
     - ReachabilitySwift
     - SwiftyBeaver
-  - PIALibrary/Mock (1.1):
+  - PIALibrary/Mock (1.1.0):
     - PIALibrary/Library
-  - PIALibrary/UI (1.1):
+  - PIALibrary/UI (1.1.0):
     - PIALibrary/Library
     - SwiftyBeaver
     - TPKeyboardAvoiding
-  - PIALibrary/Util (1.1):
+  - PIALibrary/Util (1.1.0):
     - PIALibrary/Core
-  - PIALibrary/VPN (1.1):
+  - PIALibrary/VPN (1.1.0):
     - PIALibrary/Library
     - PIATunnel (~> 1.1)
-  - PIATunnel (1.1):
-    - PIATunnel/AppExtension (= 1.1)
-    - PIATunnel/Core (= 1.1)
-  - PIATunnel/AppExtension (1.1):
+  - PIATunnel (1.1.0):
+    - PIATunnel/AppExtension (= 1.1.0)
+    - PIATunnel/Core (= 1.1.0)
+  - PIATunnel/AppExtension (1.1.0):
     - PIATunnel/Core
     - SwiftyBeaver
-  - PIATunnel/Core (1.1):
+  - PIATunnel/Core (1.1.0):
     - OpenSSL-Apple (~> 1.1.0h)
     - SBObjectiveCWrapper
     - SwiftyBeaver
@@ -52,11 +52,11 @@ DEPENDENCIES:
   - HockeySDK
   - iRate
   - MBProgressHUD
-  - PIALibrary/Library (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
-  - PIALibrary/Mock (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
-  - PIALibrary/UI (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
-  - PIALibrary/VPN (from `https://github.com/pia-foss/client-library-apple`, commit `7feb16e`)
-  - PIATunnel (from `https://github.com/pia-foss/tunnel-apple`, commit `216ef12`)
+  - PIALibrary/Library (~> 1.1.0)
+  - PIALibrary/Mock (~> 1.1.0)
+  - PIALibrary/UI (~> 1.1.0)
+  - PIALibrary/VPN (~> 1.1.0)
+  - PIATunnel (~> 1.1.0)
   - SideMenu (= 3.1.5)
   - TPKeyboardAvoiding
 
@@ -70,28 +70,14 @@ SPEC REPOS:
     - iRate
     - MBProgressHUD
     - OpenSSL-Apple
+    - PIALibrary
+    - PIATunnel
     - ReachabilitySwift
     - SBObjectiveCWrapper
     - SideMenu
     - SwiftyBeaver
     - TPKeyboardAvoiding
 
-EXTERNAL SOURCES:
-  PIALibrary:
-    :commit: 7feb16e
-    :git: https://github.com/pia-foss/client-library-apple
-  PIATunnel:
-    :commit: 216ef12
-    :git: https://github.com/pia-foss/tunnel-apple
-
-CHECKOUT OPTIONS:
-  PIALibrary:
-    :commit: 7feb16e
-    :git: https://github.com/pia-foss/client-library-apple
-  PIATunnel:
-    :commit: 216ef12
-    :git: https://github.com/pia-foss/tunnel-apple
-
 SPEC CHECKSUMS:
   Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
   AlamofireImage: 3b35b586853abaf94ca1250f4e94cff3c21a4c0d
@@ -101,14 +87,14 @@ SPEC CHECKSUMS:
   iRate: 4fc69958788624545e5d050c8ffd20884013c3f1
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208
-  PIALibrary: 46793b4820c4e0d0a1a5ff463c60271dd20d4221
-  PIATunnel: e7599084a0402dae220f67a9b1aebe609aa40a34
+  PIALibrary: b3f713941ab9a4cffc197eb460d014fd61a4d1b6
+  PIATunnel: b88e689038402f01f0514e53e29829d6d76995ac
   ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
   SBObjectiveCWrapper: 854ea56b37cd0031af2b1d6e12c2f965fc4ff86d
   SideMenu: 47dbf9e4d878062d8994aed43f6e4bf6c1fea30b
   SwiftyBeaver: 25bd76281f49ca989ec2e3cbde9af89c15bc1432
   TPKeyboardAvoiding: cb69d5ddbe90ce0170e4bc2db1e5e41d4a3ad9a4
 
-PODFILE CHECKSUM: b115770c5cd4c3df7e12e2c633647bc13cdd435e
+PODFILE CHECKSUM: 5507f1cba50869c9fd77017bc7bbbf2523f81afd
 
 COCOAPODS: 1.5.2