From 3c62a967c97f37e85ebda06de8bf4cfe523cac28 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 6 Sep 2019 23:45:42 +0200 Subject: [PATCH] Use TunnelKit 2.0.3 Had to update CocoaPods 1.6.0 to 1.7.5 --- Gemfile | 2 +- Passepartout.xcodeproj/project.pbxproj | 17 ++--------------- Podfile | 4 ++-- Podfile.lock | 21 ++++++--------------- 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/Gemfile b/Gemfile index b145e5e5..98a178d6 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "fastlane" -gem "cocoapods", "~> 1.6.0" +gem "cocoapods" gem "dotenv" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index d91ed7a6..9206e4d5 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -900,24 +900,11 @@ files = ( ); inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", - "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", - "${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework", - "${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework", - "${BUILT_PRODUCTS_DIR}/TunnelKit/TunnelKit.framework", + "${PODS_ROOT}/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TunnelKit.framework", + "${PODS_ROOT}/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/Podfile b/Podfile index a6187c78..f449b556 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.0.2' - pod_git $tunnelkit_name, $tunnelkit_specs, 'e0ab2a1' + pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.0.3' + #pod_git $tunnelkit_name, $tunnelkit_specs, 'e0ab2a1' #pod_path $tunnelkit_name, $tunnelkit_specs, '..' pod 'SSZipArchive' end diff --git a/Podfile.lock b/Podfile.lock index 543e9848..3ac2414e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -17,8 +17,8 @@ PODS: DEPENDENCIES: - MBProgressHUD - SSZipArchive - - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `e0ab2a1`) - - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `e0ab2a1`) + - TunnelKit/Extra/LZO (~> 2.0.3) + - TunnelKit/Protocols/OpenVPN (~> 2.0.3) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -26,24 +26,15 @@ SPEC REPOS: - OpenSSL-Apple - SSZipArchive - SwiftyBeaver - -EXTERNAL SOURCES: - TunnelKit: - :commit: e0ab2a1 - :git: https://github.com/passepartoutvpn/tunnelkit - -CHECKOUT OPTIONS: - TunnelKit: - :commit: e0ab2a1 - :git: https://github.com/passepartoutvpn/tunnelkit + - TunnelKit SPEC CHECKSUMS: MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 OpenSSL-Apple: e88e1eb314acb4a05e2348069790c4aa49f6d319 SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23 SwiftyBeaver: da5e573ad583586c18236324c36900990afe1733 - TunnelKit: c5068cf6c4296e96df3d359b88528810ed0824cb + TunnelKit: ce2ede930fd464042b4d4efba14ff1fb580d7519 -PODFILE CHECKSUM: 1a8a780b3f54b960fd620b6988914a45a65147ad +PODFILE CHECKSUM: 4af9b46c049c79e708cd982531a5c6cd0b8d3a25 -COCOAPODS: 1.6.2 +COCOAPODS: 1.7.5