diff --git a/Podfile b/Podfile index 956622c7..e1c8cb35 100644 --- a/Podfile +++ b/Podfile @@ -8,8 +8,8 @@ $tunnelkit_name = 'TunnelKit' $tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO'] def shared_pods - #pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.1.0' - pod_git $tunnelkit_name, $tunnelkit_specs, 'aabdf83' + pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.2.0' + #pod_git $tunnelkit_name, $tunnelkit_specs, 'aabdf83' #pod_path $tunnelkit_name, $tunnelkit_specs, '..' pod 'SSZipArchive' diff --git a/Podfile.lock b/Podfile.lock index 78a3a7cb..d4d13f68 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -49,8 +49,8 @@ DEPENDENCIES: - Kvitto - MBProgressHUD - SSZipArchive - - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `aabdf83`) - - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `aabdf83`) + - TunnelKit/Extra/LZO (~> 2.2.0) + - TunnelKit/Protocols/OpenVPN (~> 2.2.0) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -60,22 +60,17 @@ SPEC REPOS: - OpenSSL-Apple - SSZipArchive - SwiftyBeaver + - TunnelKit EXTERNAL SOURCES: Convenience: :commit: 3a191e8 :git: https://github.com/keeshux/convenience - TunnelKit: - :commit: aabdf83 - :git: https://github.com/passepartoutvpn/tunnelkit CHECKOUT OPTIONS: Convenience: :commit: 3a191e8 :git: https://github.com/keeshux/convenience - TunnelKit: - :commit: aabdf83 - :git: https://github.com/passepartoutvpn/tunnelkit SPEC CHECKSUMS: Convenience: 230739dd640bb826b640765d93715744721726be @@ -87,6 +82,6 @@ SPEC CHECKSUMS: SwiftyBeaver: 3d3e93a12d648bd400b6f2948a7ef128b5b183c7 TunnelKit: 67d819c4a545d3f95a81bfb6627834d786a5b4d5 -PODFILE CHECKSUM: d74de0bd78856bde29729b65799a511847d95347 +PODFILE CHECKSUM: 051cf9b2df3d76ced1a3b6dd6bdd0f9f7dc1a36d COCOAPODS: 1.8.4 diff --git a/README.md b/README.md index de8a2b03..a65e737d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # [Passepartout][about-website] ![iOS 11+](https://img.shields.io/badge/ios-11+-green.svg) -[![TunnelKit 2.1](https://img.shields.io/badge/tunnelkit-2.1-d69c68.svg)][dep-tunnelkit] +[![TunnelKit 2.2](https://img.shields.io/badge/tunnelkit-2.2-d69c68.svg)][dep-tunnelkit] [![License GPLv3](https://img.shields.io/badge/license-GPLv3-lightgray.svg)](LICENSE) [![Join Reddit](https://img.shields.io/badge/discuss-Reddit-orange.svg)][about-reddit] [![Join Telegram](https://img.shields.io/badge/chat-Telegram-blue.svg)][about-telegram] diff --git a/Submodules/API b/Submodules/API index 75117bc8..5cd0ec88 160000 --- a/Submodules/API +++ b/Submodules/API @@ -1 +1 @@ -Subproject commit 75117bc84612d2615dade4293afd46b34bdaa444 +Subproject commit 5cd0ec88447dd4f30fc5669a713f75646b46f421 diff --git a/Submodules/Core b/Submodules/Core index 93db0a37..e30c8066 160000 --- a/Submodules/Core +++ b/Submodules/Core @@ -1 +1 @@ -Subproject commit 93db0a37b475ba4c3727af021af1d93d861f5a5c +Subproject commit e30c8066928eb259319a11ab0574c679d7c8a050