diff --git a/Gemfile b/Gemfile index 98a73af0..0cf72331 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source "https://rubygems.org" gem "fastlane" -gem "cocoapods", "= 1.5.3" +gem "cocoapods", "~> 1.6" gem "dotenv" diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj index 7acb2514..4f5e0e70 100644 --- a/Passepartout.xcodeproj/project.pbxproj +++ b/Passepartout.xcodeproj/project.pbxproj @@ -704,7 +704,7 @@ inputFileListPaths = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks.sh", + "${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}/SwiftyBeaver/SwiftyBeaver.framework", @@ -721,7 +721,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Passepartout-iOS/Pods-Passepartout-iOS-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/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 = ( - "${SRCROOT}/Pods/Target Support Files/Pods-PassepartoutTests-iOS/Pods-PassepartoutTests-iOS-frameworks.sh", + "${PODS_ROOT}/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 = "\"${SRCROOT}/Pods/Target Support Files/Pods-PassepartoutTests-iOS/Pods-PassepartoutTests-iOS-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/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 6b866ab1..eaa8b7df 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 => '0e891a1' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '8429596' #pod 'TunnelKit', :path => '../../personal/tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index 3a870b7a..5f9f43ee 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ PODS: DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `0e891a1`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `8429596`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -24,20 +24,20 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: 0e891a1 + :commit: '8429596' :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: 0e891a1 + :commit: '8429596' :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 OpenSSL-Apple: 37a8c0b04df4bb8971deef4671cc29222861319c SwiftyBeaver: 8e67ab3cd94389cbbb7a9c7cc02748d98bfee68e - TunnelKit: b7fc176af437efcfed5526e1c496c728c0eeb649 + TunnelKit: 8e287cd252b2f99069741d385f3d54a9687d507d -PODFILE CHECKSUM: e49ff648ed7d9c4db6c52995875f46a0c6edf0da +PODFILE CHECKSUM: 99d314b581d9082f315c39e524ddbdc78b2d3de6 -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.1 diff --git a/README.md b/README.md index a738c309..8dbe8e2e 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.5.3][dep-cocoapods] (see [#34](https://github.com/passepartoutvpn/passepartout-ios/issues/34) for why later versions break) +- [CocoaPods 1.6.0][dep-cocoapods] It's highly recommended to use the Git and Ruby packages provided by [Homebrew][dep-brew].