From 554cd3065c4d9660ca9ede6bbb3d00cb01e7d556 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 26 Jun 2021 11:08:50 +0200 Subject: [PATCH] Use versioned TunnelKit --- Gemfile.lock | 69 ++++++++++++++++++++++++++-------------------------- Podfile | 4 +-- Podfile.lock | 39 +++++++++++++---------------- 3 files changed, 53 insertions(+), 59 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2def4efd..b078db78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.3) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -15,16 +15,16 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.1.1) - aws-partitions (1.449.0) - aws-sdk-core (3.114.0) + aws-partitions (1.472.0) + aws-sdk-core (3.115.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.43.0) + aws-sdk-kms (1.44.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.0) + aws-sdk-s3 (1.96.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -71,9 +71,9 @@ GEM cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) - concurrent-ruby (1.1.8) + commander (4.6.0) + highline (~> 2.0.0) + concurrent-ruby (1.1.9) declarative (0.0.20) digest-crc (0.6.3) rake (>= 12.0.0, < 14.0.0) @@ -84,8 +84,10 @@ GEM escape (0.0.4) ethon (0.14.0) ffi (>= 1.15.0) - excon (0.81.0) - faraday (1.4.1) + excon (0.82.0) + faraday (1.4.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) @@ -94,13 +96,15 @@ GEM faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) faraday_middleware (1.0.0) faraday (~> 1.0) - fastimage (2.2.3) - fastlane (2.181.0) + fastimage (2.2.4) + fastlane (2.186.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) artifactory (~> 3.0) @@ -108,7 +112,7 @@ GEM babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored - commander-fastlane (>= 4.4.6, < 5.0.0) + commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -117,9 +121,10 @@ GEM faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.37.0, < 0.39.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.1) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-storage (~> 1.31) + highline (~> 2.0) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) @@ -129,7 +134,6 @@ GEM rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (>= 1.4.5, < 2.0.0) tty-screen (>= 0.6.3, < 1.0.0) @@ -138,19 +142,13 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-appcenter (1.11.0) - ffi (1.15.0) + fastlane-plugin-appcenter (1.11.1) + ffi (1.15.3) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - google-api-client (0.38.0) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) + google-apis-androidpublisher_v3 (0.6.0) + google-apis-core (~> 0.1) google-apis-core (0.3.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.14) @@ -161,9 +159,11 @@ GEM rexml signet (~> 0.14) webrick - google-apis-iamcredentials_v1 (0.3.0) + google-apis-iamcredentials_v1 (0.4.0) google-apis-core (~> 0.1) - google-apis-storage_v1 (0.3.0) + google-apis-playcustomapp_v1 (0.3.0) + google-apis-core (~> 0.1) + google-apis-storage_v1 (0.4.0) google-apis-core (~> 0.1) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) @@ -171,13 +171,13 @@ GEM google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) google-cloud-errors (1.1.0) - google-cloud-storage (1.31.0) + google-cloud-storage (1.32.0) addressable (~> 2.5) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) googleauth (0.16.2) faraday (>= 0.17.3, < 2.0) @@ -186,8 +186,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.14) - highline (1.7.10) - http-cookie (1.0.3) + highline (2.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) httpclient (2.8.3) i18n (1.8.10) @@ -229,7 +229,6 @@ GEM simctl (1.6.8) CFPropertyList naturally - slack-notifier (2.3.2) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) diff --git a/Podfile b/Podfile index b1242b75..b595d11b 100644 --- a/Podfile +++ b/Podfile @@ -7,8 +7,8 @@ $tunnelkit_name = 'TunnelKit' $tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO'] def shared_pods - #pod_version $tunnelkit_name, $tunnelkit_specs, '~> 3.3.1' - pod_git $tunnelkit_name, $tunnelkit_specs, 'a658410' + pod_version $tunnelkit_name, $tunnelkit_specs, '~> 3.3.2' + #pod_git $tunnelkit_name, $tunnelkit_specs, 'a658410' #pod_path $tunnelkit_name, $tunnelkit_specs, '..' pod 'SSZipArchive' pod 'Kvitto', :git => 'https://github.com/keeshux/Kvitto', :branch => 'enable-macos-spec' diff --git a/Podfile.lock b/Podfile.lock index 4017eb70..51595196 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -12,8 +12,8 @@ PODS: - Convenience/Tables (0.0.2) - Convenience/WebServices (0.0.2): - SwiftyBeaver - - DTFoundation/Core (1.7.16) - - DTFoundation/DTASN1 (1.7.16): + - DTFoundation/Core (1.7.17) + - DTFoundation/DTASN1 (1.7.17): - DTFoundation/Core - Kvitto (1.0.5): - DTFoundation/DTASN1 (~> 1.7.13) @@ -22,17 +22,17 @@ PODS: - DTFoundation/DTASN1 (~> 1.7.13) - MBProgressHUD (1.2.0) - OpenSSL-Apple (1.1.1k.11) - - SSZipArchive (2.2.3) - - SwiftyBeaver (1.9.3) - - TunnelKit/AppExtension (3.4.0): + - SSZipArchive (2.4.2) + - SwiftyBeaver (1.9.5) + - TunnelKit/AppExtension (3.3.2): - SwiftyBeaver - TunnelKit/Core - - TunnelKit/Core (3.4.0): + - TunnelKit/Core (3.3.2): - SwiftyBeaver - - TunnelKit/Extra/LZO (3.4.0) - - TunnelKit/Manager (3.4.0): + - TunnelKit/Extra/LZO (3.3.2) + - TunnelKit/Manager (3.3.2): - SwiftyBeaver - - TunnelKit/Protocols/OpenVPN (3.4.0): + - TunnelKit/Protocols/OpenVPN (3.3.2): - OpenSSL-Apple (~> 1.1.1h.10) - TunnelKit/AppExtension - TunnelKit/Core @@ -52,8 +52,8 @@ DEPENDENCIES: - Kvitto (from `https://github.com/keeshux/Kvitto`, branch `enable-macos-spec`) - MBProgressHUD - SSZipArchive - - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `a658410`) - - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `a658410`) + - TunnelKit/Extra/LZO (~> 3.3.2) + - TunnelKit/Protocols/OpenVPN (~> 3.3.2) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -62,6 +62,7 @@ SPEC REPOS: - OpenSSL-Apple - SSZipArchive - SwiftyBeaver + - TunnelKit EXTERNAL SOURCES: Convenience: @@ -70,9 +71,6 @@ EXTERNAL SOURCES: Kvitto: :branch: enable-macos-spec :git: https://github.com/keeshux/Kvitto - TunnelKit: - :commit: a658410 - :git: https://github.com/passepartoutvpn/tunnelkit CHECKOUT OPTIONS: Convenience: @@ -81,20 +79,17 @@ CHECKOUT OPTIONS: Kvitto: :commit: e263fcd1f40a6a482a0f1e424ba98009c4ad2b96 :git: https://github.com/keeshux/Kvitto - TunnelKit: - :commit: a658410 - :git: https://github.com/passepartoutvpn/tunnelkit SPEC CHECKSUMS: Convenience: c805c2aff569ff735c5d69c2c2b7a9bd110fa507 - DTFoundation: e7781d9fd2f202bfd451fbbf8cab71ce83b46498 + DTFoundation: 989698be00d3f19438c38a49a8ebb3f6919dcac5 Kvitto: 5511954b22d6c710e1a04dcbdee44ae7b3d1caeb MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 OpenSSL-Apple: 3104e6d32de21815b68aeba31edaa6a78d90e7e0 - SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9 - SwiftyBeaver: 2e8acd6fc90c6d0a27055867a290794926d57c02 - TunnelKit: 9733bb3d8b911b8dfa3cb1363bc82bb3f4204038 + SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2 + SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82 + TunnelKit: efebe7db85bdb4ea89fb3af569d4bb7321e7b65d -PODFILE CHECKSUM: 240f988c205fbbd465571409d4d6ea67de3b7bb6 +PODFILE CHECKSUM: 419def201d8bed7d3cb5854165369a1eb039ddac COCOAPODS: 1.10.1