From ab050c6c001a18e220756ef4836fbb26f81503e5 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 6 Oct 2018 14:33:17 +0200 Subject: [PATCH] Upgrade/fix demo project - Target - Pods - Entitlements - Swift 4.2 - License headers --- Demo/BasicTunnel-iOS/AppDelegate.swift | 2 +- .../BasicTunnel-iOS.entitlements | 2 +- Demo/BasicTunnel-iOS/ViewController.swift | 43 ++++++++--- Demo/BasicTunnel-macOS/ViewController.swift | 43 ++++++++--- .../BasicTunnelExtension-iOS.entitlements | 2 +- Demo/Demo.xcodeproj/project.pbxproj | 74 ++++++++++--------- Demo/Podfile | 2 +- Demo/Podfile.lock | 14 ++-- Podfile.lock | 7 +- TunnelKit.xcodeproj/project.pbxproj | 64 +--------------- 10 files changed, 125 insertions(+), 128 deletions(-) diff --git a/Demo/BasicTunnel-iOS/AppDelegate.swift b/Demo/BasicTunnel-iOS/AppDelegate.swift index f570550..a1a4f85 100644 --- a/Demo/BasicTunnel-iOS/AppDelegate.swift +++ b/Demo/BasicTunnel-iOS/AppDelegate.swift @@ -47,7 +47,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { let logDestination = ConsoleDestination() logDestination.minLevel = .debug logDestination.format = "$DHH:mm:ss$d $L $N.$F:$l - $M" diff --git a/Demo/BasicTunnel-iOS/BasicTunnel-iOS.entitlements b/Demo/BasicTunnel-iOS/BasicTunnel-iOS.entitlements index 180c780..f89deed 100644 --- a/Demo/BasicTunnel-iOS/BasicTunnel-iOS.entitlements +++ b/Demo/BasicTunnel-iOS/BasicTunnel-iOS.entitlements @@ -12,7 +12,7 @@ keychain-access-groups - $(AppIdentifierPrefix)group.com.privateinternetaccess.ios.demo.BasicTunnel + $(AppIdentifierPrefix)group.com.algoritmico.ios.demo.BasicTunnel diff --git a/Demo/BasicTunnel-iOS/ViewController.swift b/Demo/BasicTunnel-iOS/ViewController.swift index 1e003a4..c5ae0cc 100644 --- a/Demo/BasicTunnel-iOS/ViewController.swift +++ b/Demo/BasicTunnel-iOS/ViewController.swift @@ -3,7 +3,36 @@ // BasicTunnel-iOS // // Created by Davide De Rosa on 2/11/17. -// Copyright © 2018 Davide De Rosa. All rights reserved. +// Copyright (c) 2018 Davide De Rosa. All rights reserved. +// +// https://github.com/keeshux +// +// This file is part of TunnelKit. +// +// TunnelKit is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TunnelKit is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TunnelKit. If not, see . +// +// This file incorporates work covered by the following copyright and +// permission notice: +// +// Copyright (c) 2018-Present Private Internet Access +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// // import UIKit @@ -21,14 +50,7 @@ extension ViewController { let hostname = ((domain == "") ? server : [server, domain].joined(separator: ".")) let port = UInt16(textPort.text!)! - let username = textUsername.text! - let password = textPassword.text! - - let endpoint = TunnelKitProvider.AuthenticatedEndpoint( - hostname: hostname, - username: username, - password: password - ) + let credentials = SessionProxy.Credentials(textUsername.text!, textPassword.text!) var builder = TunnelKitProvider.ConfigurationBuilder() let socketType: TunnelKitProvider.SocketType = switchTCP.isOn ? .tcp : .udp @@ -45,7 +67,8 @@ extension ViewController { return try! configuration.generatedTunnelProtocol( withBundleIdentifier: ViewController.bundleIdentifier, appGroup: ViewController.appGroup, - endpoint: endpoint + hostname: hostname, + credentials: credentials ) } } diff --git a/Demo/BasicTunnel-macOS/ViewController.swift b/Demo/BasicTunnel-macOS/ViewController.swift index 08a269a..cd32217 100644 --- a/Demo/BasicTunnel-macOS/ViewController.swift +++ b/Demo/BasicTunnel-macOS/ViewController.swift @@ -3,7 +3,36 @@ // BasicTunnel-macOS // // Created by Davide De Rosa on 10/15/17. -// Copyright © 2018 Davide De Rosa. All rights reserved. +// Copyright (c) 2018 Davide De Rosa. All rights reserved. +// +// https://github.com/keeshux +// +// This file is part of TunnelKit. +// +// TunnelKit is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TunnelKit is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TunnelKit. If not, see . +// +// This file incorporates work covered by the following copyright and +// permission notice: +// +// Copyright (c) 2018-Present Private Internet Access +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// // import Cocoa @@ -21,14 +50,7 @@ extension ViewController { let hostname = ((domain == "") ? server : [server, domain].joined(separator: ".")) let port = UInt16(textPort.stringValue)! - let username = textUsername.stringValue - let password = textPassword.stringValue - - let endpoint = TunnelKitProvider.AuthenticatedEndpoint( - hostname: hostname, - username: username, - password: password - ) + let credentials = SessionProxy.Credentials(textUsername.stringValue, textPassword.stringValue) var builder = TunnelKitProvider.ConfigurationBuilder() // let socketType: TunnelKitProvider.SocketType = isTCP ? .tcp : .udp @@ -46,7 +68,8 @@ extension ViewController { return try! configuration.generatedTunnelProtocol( withBundleIdentifier: ViewController.bundleIdentifier, appGroup: ViewController.appGroup, - endpoint: endpoint + hostname: hostname, + credentials: credentials ) } } diff --git a/Demo/BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements b/Demo/BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements index 180c780..f89deed 100644 --- a/Demo/BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements +++ b/Demo/BasicTunnelExtension-iOS/BasicTunnelExtension-iOS.entitlements @@ -12,7 +12,7 @@ keychain-access-groups - $(AppIdentifierPrefix)group.com.privateinternetaccess.ios.demo.BasicTunnel + $(AppIdentifierPrefix)group.com.algoritmico.ios.demo.BasicTunnel diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj index 30c98ca..cc5698f 100644 --- a/Demo/Demo.xcodeproj/project.pbxproj +++ b/Demo/Demo.xcodeproj/project.pbxproj @@ -289,7 +289,7 @@ 0EB39FE31F7424F80023AFFC /* Frameworks */, 0EB39FE41F7424F80023AFFC /* Resources */, 0EB3A0091F7425140023AFFC /* Embed App Extensions */, - A3C198CD449DD5434CB4A22E /* [CP] Embed Pods Frameworks */, + B144DFB36177A29B7E1B0DA4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -365,11 +365,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0900; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Davide De Rosa"; TargetAttributes = { 0EB39FE51F7424F80023AFFC = { CreatedOnToolsVersion = 9.0; + LastSwiftMigration = 1000; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -382,6 +383,7 @@ }; 0EB39FFB1F7425140023AFFC = { CreatedOnToolsVersion = 9.0; + LastSwiftMigration = 1000; ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -532,32 +534,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - A3C198CD449DD5434CB4A22E /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh", - "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", - "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", - "${BUILT_PRODUCTS_DIR}/TunnelKit-iOS/TunnelKit.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TunnelKit.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; AC2C3BCB219270755C04C726 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -566,7 +542,7 @@ inputFileListPaths = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/MacOSX/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-macOS/SwiftyBeaver.framework", "${BUILT_PRODUCTS_DIR}/TunnelKit-macOS/TunnelKit.framework", @@ -581,7 +557,33 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-macOS-BasicTunnel-macOS/Pods-macOS-BasicTunnel-macOS-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + B144DFB36177A29B7E1B0DA4 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh", + "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", + "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", + "${BUILT_PRODUCTS_DIR}/TunnelKit-iOS/TunnelKit.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + ); + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/openssl.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyBeaver.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TunnelKit.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iOS-BasicTunnel-iOS/Pods-iOS-BasicTunnel-iOS-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; C772E0EE406756CD998F1DFD /* [CP] Check Pods Manifest.lock */ = { @@ -722,6 +724,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -729,6 +732,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -756,14 +760,14 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -781,6 +785,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -788,6 +793,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -809,12 +815,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/Demo/Podfile b/Demo/Podfile index 981bbe1..073e9c9 100644 --- a/Demo/Podfile +++ b/Demo/Podfile @@ -2,7 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! abstract_target 'iOS' do - platform :ios, '9.0' + platform :ios, '11.0' target 'BasicTunnelExtension-iOS' do pod 'TunnelKit', :path => '..' diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 1dbf718..c02ca3f 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,6 +1,6 @@ PODS: - - OpenSSL-Apple (1.1.0h) - - SwiftyBeaver (1.6.0) + - OpenSSL-Apple (1.1.0i-v2) + - SwiftyBeaver (1.6.1) - TunnelKit (1.1.0): - TunnelKit/AppExtension (= 1.1.0) - TunnelKit/Core (= 1.1.0) @@ -24,10 +24,10 @@ EXTERNAL SOURCES: :path: ".." SPEC CHECKSUMS: - OpenSSL-Apple: cd153d705ef350eb834ae7ff5f21f792b51ed208 - SwiftyBeaver: e45759613e50b522b0e6f53b1f0f14389b45ca34 - TunnelKit: 4c10192ab76e9b03bf5bde5b70f38e38ae6d4568 + OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c + SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a + TunnelKit: 21af89c08aadfa81d25835a1faa46ddf12374772 -PODFILE CHECKSUM: dbd445ce3249028c60f04276181924bb9bfc726d +PODFILE CHECKSUM: f66dfaaa92a8d04ab2743f3caeab0ac9f9f25859 -COCOAPODS: 1.5.3 +COCOAPODS: 1.6.0.beta.1 diff --git a/Podfile.lock b/Podfile.lock index 71b1c03..731515c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -6,10 +6,15 @@ DEPENDENCIES: - OpenSSL-Apple (~> 1.1.0i) - SwiftyBeaver +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - OpenSSL-Apple + - SwiftyBeaver + SPEC CHECKSUMS: OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a PODFILE CHECKSUM: 7cd71c5bc177daedf9933b9428b39c0c9ffae5a6 -COCOAPODS: 1.4.0 +COCOAPODS: 1.6.0.beta.1 diff --git a/TunnelKit.xcodeproj/project.pbxproj b/TunnelKit.xcodeproj/project.pbxproj index 591b1f5..3b42990 100644 --- a/TunnelKit.xcodeproj/project.pbxproj +++ b/TunnelKit.xcodeproj/project.pbxproj @@ -604,7 +604,6 @@ 0E1108A61F77B9F900A92462 /* Frameworks */, 0E1108A71F77B9F900A92462 /* Resources */, B90665BB6148F76EE6C7B876 /* [CP] Embed Pods Frameworks */, - CB8BC028A305D776BF99051F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -625,7 +624,6 @@ 0E17D7F51F730D9F009EE129 /* Frameworks */, 0E17D7F61F730D9F009EE129 /* Headers */, 0E17D7F71F730D9F009EE129 /* Resources */, - D908F7F68DFAC49339D3642D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -645,7 +643,6 @@ 0E3251C11F95770D00C108D9 /* Frameworks */, 0E3251C21F95770D00C108D9 /* Headers */, 0E3251C31F95770D00C108D9 /* Resources */, - 4D0B460E051C7982B3C6766D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -770,25 +767,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 4D0B460E051C7982B3C6766D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKit-macOS/Pods-TunnelKit-TunnelKit-macOS-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 94AA64A70C6BF0AD8E5BA279 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -831,7 +809,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh", "${PODS_ROOT}/OpenSSL-Apple/frameworks/iPhone/openssl.framework", "${BUILT_PRODUCTS_DIR}/SwiftyBeaver-iOS/SwiftyBeaver.framework", ); @@ -842,45 +820,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - CB8BC028A305D776BF99051F /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - D908F7F68DFAC49339D3642D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TunnelKit-TunnelKit-iOS/Pods-TunnelKit-TunnelKit-iOS-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-TunnelKit-TunnelKitHost/Pods-TunnelKit-TunnelKitHost-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */