diff --git a/Gemfile b/Gemfile index e1075020..98a73af0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" gem "fastlane" -gem "cocoapods", ">= 1.6.0.beta" +gem "cocoapods", "= 1.5.3" gem "dotenv" diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index 4f5e0e70..7acb2514 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -704,7 +704,7 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks.sh", + "${SRCROOT}/Pods/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}/SwiftyBeaver/SwiftyBeaver.framework", @@ -721,7 +721,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; 9C7DFA86B13FF0B80CFED9EF /* [CP] Embed Pods Frameworks */ = { @@ -732,7 +732,7 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-PassepartoutTests-iOS/Pods-PassepartoutTests-iOS-frameworks.sh", + "${SRCROOT}/Pods/Target Support Files/Pods-PassepartoutTests-iOS/Pods-PassepartoutTests-iOS-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/TunnelKit/TunnelKit.framework", @@ -747,7 +747,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PassepartoutTests-iOS/Pods-PassepartoutTests-iOS-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PassepartoutTests-iOS/Pods-PassepartoutTests-iOS-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; A5984A2DF2C43505FA7E4866 /* [CP] Check Pods Manifest.lock */ = { diff --git a/Podfile b/Podfile index 91effbec..6b866ab1 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! def shared_pods #pod 'TunnelKit', '~> 1.4.0' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '52c30b5' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '0e891a1' #pod 'TunnelKit', :path => '../../personal/tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index 9284cb8c..3a870b7a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,7 +1,7 @@ PODS: - MBProgressHUD (1.1.0) - - OpenSSL-Apple (1.1.0i-v2) - - SwiftyBeaver (1.6.1) + - OpenSSL-Apple (1.1.0i.2) + - SwiftyBeaver (1.6.2) - TunnelKit (1.4.1): - TunnelKit/AppExtension (= 1.4.1) - TunnelKit/Core (= 1.4.1) @@ -9,12 +9,12 @@ PODS: - SwiftyBeaver - TunnelKit/Core - TunnelKit/Core (1.4.1): - - OpenSSL-Apple (~> 1.1.0h) + - OpenSSL-Apple (~> 1.1.0i.2) - SwiftyBeaver DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `52c30b5`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `0e891a1`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -24,20 +24,20 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: 52c30b5 + :commit: 0e891a1 :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: 52c30b5 + :commit: 0e891a1 :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 - OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c - SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a - TunnelKit: 2056113dfb0ed8d18e93dad11a703e40d382b5a8 + OpenSSL-Apple: 37a8c0b04df4bb8971deef4671cc29222861319c + SwiftyBeaver: 8e67ab3cd94389cbbb7a9c7cc02748d98bfee68e + TunnelKit: b7fc176af437efcfed5526e1c496c728c0eeb649 -PODFILE CHECKSUM: abf4884eb3ba1a9b771a5d1b8a57e5bad98aa0ed +PODFILE CHECKSUM: e49ff648ed7d9c4db6c52995875f46a0c6edf0da -COCOAPODS: 1.6.0.beta.2 +COCOAPODS: 1.5.3 diff --git a/README.md b/README.md index c3b590df..4bf494af 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ You can find details on what may or may not work in the related section of the [ - Xcode 10+ (Swift 4.2) - Git (preinstalled with Xcode Command Line Tools) - Ruby (preinstalled with macOS) -- [CocoaPods 1.4.0][dep-cocoapods] +- [CocoaPods = 1.5.3][dep-cocoapods] (see #34 for why later versions break) It's highly recommended to use the Git and Ruby packages provided by [Homebrew][dep-brew].