From 46d90b1112028627c141fee1d4aa742f97c660ae Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 13 Nov 2020 10:17:56 +0100 Subject: [PATCH] Update project - Pods - Target (12.0) - Version (1.13.0) - API --- CHANGELOG.md | 2 ++ Gemfile.lock | 18 +++++------ Passepartout-iOS-Tunnel/Info.plist | 2 +- Passepartout-iOS/AppDelegate.swift | 2 +- Passepartout-iOS/Info.plist | 2 +- PassepartoutCore-iOS/Info.plist | 2 +- Podfile | 6 ++-- Podfile.lock | 48 +++++++++++++++--------------- Submodules/API | 2 +- 9 files changed, 43 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36f66b31..c0807573 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + ## 1.12.1 (2020-11-15) ### Added diff --git a/Gemfile.lock b/Gemfile.lock index 69768b18..6e59d5c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,13 +9,13 @@ GEM tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - algoliasearch (1.27.4) + algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) aws-eventstream (1.1.0) - aws-partitions (1.385.0) - aws-sdk-core (3.109.1) + aws-partitions (1.393.0) + aws-sdk-core (3.109.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -23,7 +23,7 @@ GEM aws-sdk-kms (1.39.0) aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.83.1) + aws-sdk-s3 (1.84.1) aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -80,7 +80,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.0.0) + emoji_regex (3.2.1) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) @@ -94,7 +94,7 @@ GEM faraday_middleware (1.0.0) faraday (~> 1.0) fastimage (2.2.0) - fastlane (2.165.0) + fastlane (2.167.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) aws-sdk-s3 (~> 1.0) @@ -130,7 +130,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-appcenter (1.10.0) + fastlane-plugin-appcenter (1.11.0) ffi (1.13.1) fourflusher (2.3.1) fuzzy_match (2.0.4) @@ -173,7 +173,7 @@ GEM json (2.3.1) jwt (2.2.2) memoist (0.16.2) - mini_magick (4.10.1) + mini_magick (4.11.0) mini_mime (1.0.2) minitest (5.14.2) molinillo (0.6.6) @@ -216,7 +216,7 @@ GEM tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) diff --git a/Passepartout-iOS-Tunnel/Info.plist b/Passepartout-iOS-Tunnel/Info.plist index 87916f42..8dece2cb 100644 --- a/Passepartout-iOS-Tunnel/Info.plist +++ b/Passepartout-iOS-Tunnel/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.12.1 + 1.13.0 CFBundleVersion 1 NSExtension diff --git a/Passepartout-iOS/AppDelegate.swift b/Passepartout-iOS/AppDelegate.swift index 7185b511..693e497f 100644 --- a/Passepartout-iOS/AppDelegate.swift +++ b/Passepartout-iOS/AppDelegate.swift @@ -42,7 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele AppConstants.Log.configure() InfrastructureFactory.shared.preload() #if !targetEnvironment(simulator) - VPN.shared = StandardVPNProvider(bundleIdentifier: AppConstants.App.tunnelBundleId) + VPN.shared = OpenVPNProvider(bundleIdentifier: AppConstants.App.tunnelBundleId) #endif super.init() } diff --git a/Passepartout-iOS/Info.plist b/Passepartout-iOS/Info.plist index 04befe23..9eb7511e 100644 --- a/Passepartout-iOS/Info.plist +++ b/Passepartout-iOS/Info.plist @@ -33,7 +33,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.12.1 + 1.13.0 CFBundleURLTypes diff --git a/PassepartoutCore-iOS/Info.plist b/PassepartoutCore-iOS/Info.plist index 4be24ffd..32cc0316 100644 --- a/PassepartoutCore-iOS/Info.plist +++ b/PassepartoutCore-iOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.12.1 + 1.13.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) diff --git a/Podfile b/Podfile index 35adae4c..8cfa148d 100644 --- a/Podfile +++ b/Podfile @@ -1,15 +1,15 @@ source 'https://github.com/cocoapods/specs.git' -platform :ios, '11.0' +platform :ios, '12.0' use_frameworks! load 'Podfile.include' $tunnelkit_name = 'TunnelKit' -$tunnelkit_specs = ['Protocols/OpenVPN', 'Manager', 'Extra/LZO'] +$tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO'] def shared_pods #pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.2.7' - pod_git $tunnelkit_name, $tunnelkit_specs, '683617d' + pod_git $tunnelkit_name, $tunnelkit_specs, '7433f9d469bd06735d85439693ca284430fb56e4' #pod_path $tunnelkit_name, $tunnelkit_specs, '..' pod 'SSZipArchive' diff --git a/Podfile.lock b/Podfile.lock index 660959e2..75f11df2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -12,30 +12,31 @@ PODS: - Convenience/Tables (0.0.2) - Convenience/WebServices (0.0.2): - SwiftyBeaver - - DTFoundation/Core (1.7.15) - - DTFoundation/DTASN1 (1.7.15): + - DTFoundation/Core (1.7.16) + - DTFoundation/DTASN1 (1.7.16): - DTFoundation/Core - - Kvitto (1.0.4): + - Kvitto (1.0.5): - DTFoundation/DTASN1 (~> 1.7.13) - - Kvitto/Core (= 1.0.4) - - Kvitto/Core (1.0.4): + - Kvitto/Core (= 1.0.5) + - Kvitto/Core (1.0.5): - DTFoundation/DTASN1 (~> 1.7.13) - MBProgressHUD (1.2.0) - - OpenSSL-Apple (1.1.1g.6) + - OpenSSL-Apple (1.1.1h.8) - SSZipArchive (2.2.3) - - SwiftyBeaver (1.9.2) - - TunnelKit/AppExtension (2.3.0): + - SwiftyBeaver (1.9.3) + - TunnelKit/AppExtension (3.0.0): - SwiftyBeaver - TunnelKit/Core - - TunnelKit/Core (2.3.0): + - TunnelKit/Core (3.0.0): - SwiftyBeaver - - TunnelKit/Extra/LZO (2.3.0) - - TunnelKit/Manager (2.3.0): + - TunnelKit/Extra/LZO (3.0.0) + - TunnelKit/Manager (3.0.0): - SwiftyBeaver - - TunnelKit/Protocols/OpenVPN (2.3.0): - - OpenSSL-Apple (~> 1.1.1g.6) + - TunnelKit/Protocols/OpenVPN (3.0.0): + - OpenSSL-Apple (~> 1.1.1h.8) - TunnelKit/AppExtension - TunnelKit/Core + - TunnelKit/Manager DEPENDENCIES: - Convenience/About (from `https://github.com/keeshux/convenience`, commit `0b09b1e`) @@ -51,9 +52,8 @@ DEPENDENCIES: - Kvitto - MBProgressHUD - SSZipArchive - - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `683617d`) - - TunnelKit/Manager (from `https://github.com/passepartoutvpn/tunnelkit`, commit `683617d`) - - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `683617d`) + - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `7433f9d469bd06735d85439693ca284430fb56e4`) + - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `7433f9d469bd06735d85439693ca284430fb56e4`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -69,7 +69,7 @@ EXTERNAL SOURCES: :commit: 0b09b1e :git: https://github.com/keeshux/convenience TunnelKit: - :commit: 683617d + :commit: 7433f9d469bd06735d85439693ca284430fb56e4 :git: https://github.com/passepartoutvpn/tunnelkit CHECKOUT OPTIONS: @@ -77,19 +77,19 @@ CHECKOUT OPTIONS: :commit: 0b09b1e :git: https://github.com/keeshux/convenience TunnelKit: - :commit: 683617d + :commit: 7433f9d469bd06735d85439693ca284430fb56e4 :git: https://github.com/passepartoutvpn/tunnelkit SPEC CHECKSUMS: Convenience: c805c2aff569ff735c5d69c2c2b7a9bd110fa507 - DTFoundation: 767ca882209ef4d5132ec7e702526d5ed5bb71a2 - Kvitto: 2b8a572b0f38890d63227a5062775c8209f8e143 + DTFoundation: e7781d9fd2f202bfd451fbbf8cab71ce83b46498 + Kvitto: e5c903c656cce6bfebbf337d992184cf03cb4853 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 - OpenSSL-Apple: c9c1b9c5b2b1fc4e1758fc5f0836b58ae7fd8183 + OpenSSL-Apple: 70990157548ecf94885310231aff52db698e1077 SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9 - SwiftyBeaver: b8239f6bfe9e1ea3303e6139abc8c24228081d84 - TunnelKit: a4fa4ecc6fc2b9fa74c38609c0e8fc4441d9672e + SwiftyBeaver: 2e8acd6fc90c6d0a27055867a290794926d57c02 + TunnelKit: 231da80bc3ccbcad7cad1e661f8e08cd26703fc0 -PODFILE CHECKSUM: 318a10ca02bd2f890a96f90de37f4f04ac9f80f4 +PODFILE CHECKSUM: 04e59832f41e85849942ea5f35cadf533231e8b6 COCOAPODS: 1.10.0 diff --git a/Submodules/API b/Submodules/API index ccc00bf1..b2ba8362 160000 --- a/Submodules/API +++ b/Submodules/API @@ -1 +1 @@ -Subproject commit ccc00bf1f0f2b497cc68b18be92cc521a78dfb52 +Subproject commit b2ba8362a67322253c41e7d85d22494aea773ed2