diff --git a/Podfile b/Podfile index e522491..7e6e45a 100644 --- a/Podfile +++ b/Podfile @@ -36,12 +36,12 @@ post_install do |installer| end end -target 'pass' do - pod 'ObjectivePGP', :git => 'https://github.com/mssun/ObjectivePGP.git' - target 'passKit' do - inherit! :search_paths - end - target 'passextension' do - inherit! :search_paths - end +target 'passKit' do + pod 'ObjectivePGP', :git => 'https://github.com/mssun/ObjectivePGP.git' + target 'pass' do + inherit! :search_paths + end + target 'passextension' do + inherit! :search_paths + end end diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj index 78d3021..297d95a 100644 --- a/pass.xcodeproj/project.pbxproj +++ b/pass.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 1473B150643891727EB85DFE /* libPods-pass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7592A214C22CEBBEF4596CC1 /* libPods-pass.a */; }; 398A8F69C2230A8117820BB7 /* libPods-passKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45BAA15189E80AA544EAF7AD /* libPods-passKit.a */; }; + 6930A9D26085DE7CA1A7AACC /* libPods-passextension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B240CA444AC9172F3053651 /* libPods-passextension.a */; }; A217ACE21E9AB17C00A1A6CF /* OTPScannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A217ACE11E9AB17C00A1A6CF /* OTPScannerController.swift */; }; A217ACE41E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A217ACE31E9BBBBD00A1A6CF /* GitConfigSettingTableViewController.swift */; }; A26075811EEC6F34005DB03E /* passKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A26075781EEC6F34005DB03E /* passKit.framework */; }; @@ -43,7 +44,6 @@ A2F4E2211EED80160011986E /* NotificationNames.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2F4E21B1EED80160011986E /* NotificationNames.swift */; }; A2F4E2221EED80160011986E /* UITextFieldExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2F4E21C1EED80160011986E /* UITextFieldExtension.swift */; }; A2F4E2231EED80160011986E /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2F4E21D1EED80160011986E /* Utils.swift */; }; - B87896CC4725EE267C66D891 /* libPods-passextension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B240CA444AC9172F3053651 /* libPods-passextension.a */; }; DC037CA61E4B883900609409 /* OpenSourceComponentsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC037CA51E4B883900609409 /* OpenSourceComponentsTableViewController.swift */; }; DC037CA81E4B898100609409 /* BasicStaticTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC037CA71E4B898100609409 /* BasicStaticTableViewController.swift */; }; DC037CAA1E4B8EAE00609409 /* SpecialThanksTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC037CA91E4B8EAE00609409 /* SpecialThanksTableViewController.swift */; }; @@ -201,6 +201,7 @@ A2F4E21B1EED80160011986E /* NotificationNames.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NotificationNames.swift; path = Helpers/NotificationNames.swift; sourceTree = ""; }; A2F4E21C1EED80160011986E /* UITextFieldExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UITextFieldExtension.swift; path = Helpers/UITextFieldExtension.swift; sourceTree = ""; }; A2F4E21D1EED80160011986E /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Utils.swift; path = Helpers/Utils.swift; sourceTree = ""; }; + B714FCC4AB231C45BE800C1C /* libPods-passKit-passextension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-passKit-passextension.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CF68FFBE116027CB625ABD45 /* Pods-passKit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-passKit.release.xcconfig"; path = "Pods/Target Support Files/Pods-passKit/Pods-passKit.release.xcconfig"; sourceTree = ""; }; DC037CA51E4B883900609409 /* OpenSourceComponentsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenSourceComponentsTableViewController.swift; sourceTree = ""; }; DC037CA71E4B898100609409 /* BasicStaticTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicStaticTableViewController.swift; sourceTree = ""; }; @@ -278,13 +279,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + A2A61C2A1EEFDCA700CFE063 /* SwiftyUserDefaults.framework in Frameworks */, A2A61C131EEF90CB00CFE063 /* Base32.framework in Frameworks */, A2A61C151EEF90CB00CFE063 /* KeychainAccess.framework in Frameworks */, A2A61C161EEF90CB00CFE063 /* ObjectiveGit.framework in Frameworks */, A2A61C171EEF90CB00CFE063 /* OneTimePassword.framework in Frameworks */, - A2A61C1A1EEF90CB00CFE063 /* SwiftyUserDefaults.framework in Frameworks */, A26075961EEC6F8C005DB03E /* passKit.framework in Frameworks */, - B87896CC4725EE267C66D891 /* libPods-passextension.a in Frameworks */, + 6930A9D26085DE7CA1A7AACC /* libPods-passextension.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -525,6 +526,7 @@ 7592A214C22CEBBEF4596CC1 /* libPods-pass.a */, 45BAA15189E80AA544EAF7AD /* libPods-passKit.a */, 1B240CA444AC9172F3053651 /* libPods-passextension.a */, + B714FCC4AB231C45BE800C1C /* libPods-passKit-passextension.a */, ); name = Frameworks; sourceTree = ""; @@ -586,11 +588,11 @@ isa = PBXNativeTarget; buildConfigurationList = A267002F1EEC466A00176B8A /* Build configuration list for PBXNativeTarget "passextension" */; buildPhases = ( - 833CCF07B581A19455BFF5A2 /* [CP] Check Pods Manifest.lock */, + 2DC56C1FCF814F89B7C46015 /* [CP] Check Pods Manifest.lock */, A26700201EEC466A00176B8A /* Sources */, A26700211EEC466A00176B8A /* Frameworks */, A26700221EEC466A00176B8A /* Resources */, - E5679233A0ECC12219075B5C /* [CP] Copy Pods Resources */, + 7FCFE5D7F8EC0AA1014367B8 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -767,6 +769,21 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2DC56C1FCF814F89B7C46015 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_ROOT}/../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"; + showEnvVarsInLog = 0; + }; 3D4E80016BEE92B70CE75405 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -827,19 +844,19 @@ shellScript = "diff \"${PODS_ROOT}/../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"; showEnvVarsInLog = 0; }; - 833CCF07B581A19455BFF5A2 /* [CP] Check Pods Manifest.lock */ = { + 7FCFE5D7F8EC0AA1014367B8 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-passextension/Pods-passextension-resources.sh\"\n"; showEnvVarsInLog = 0; }; DC917BEC1E2F3659000FDF54 /* Run Script */ = { @@ -864,21 +881,6 @@ shellPath = /bin/sh; shellScript = "/usr/local/bin/carthage copy-frameworks"; }; - E5679233A0ECC12219075B5C /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-passextension/Pods-passextension-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; FF64BAA847392A8690167C10 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1066,12 +1068,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/build/Debug-iphoneos/ObjectivePGP", - "$(PROJECT_DIR)/build/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MODULEMAP_FILE = ""; + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passKit; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1113,12 +1112,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 10.2; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/build/Debug-iphoneos/ObjectivePGP", - "$(PROJECT_DIR)/build/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; MODULEMAP_FILE = ""; + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passKit; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1182,6 +1178,8 @@ INFOPLIST_FILE = passextension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_CFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passextension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1209,6 +1207,8 @@ INFOPLIST_FILE = passextension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_CFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios.passextension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1357,18 +1357,12 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/ObjectivePGP\"", - "\"${PODS_ROOT}/Headers/Public/OpenSSL-Universal\"", "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers/", ); INFOPLIST_FILE = pass/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$PODS_CONFIGURATION_BUILD_DIR/ObjectivePGP\"", - "\"${PODS_ROOT}/OpenSSL-Universal/lib-ios\"", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "${inherited}"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1399,20 +1393,12 @@ ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/ObjectivePGP\"", - "\"${PODS_ROOT}/Headers/Public/OpenSSL-Universal\"", "$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers/", ); INFOPLIST_FILE = pass/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$PODS_CONFIGURATION_BUILD_DIR/ObjectivePGP\"", - "\"${PODS_ROOT}/OpenSSL-Universal/lib-ios\"", - "$(PROJECT_DIR)/build/Debug-iphoneos/ObjectivePGP", - "$(PROJECT_DIR)/build/Debug-iphoneos", - ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + OTHER_CFLAGS = "$(inherited)"; OTHER_LDFLAGS = "${inherited}"; PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios; PRODUCT_NAME = "$(TARGET_NAME)";