lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'develop' of https://github.com/mssun/passforios into develop

Browse source
This commit is contained in:
Bob Sun 2017-06-14 16:27:53 -07:00
commit df75dc9d6a
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
2 changed files with 69 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Podfile
View file

@ -44,4 +44,7 @@ target 'passKit' do
target 'passextension' do target 'passextension' do
inherit! :search_paths inherit! :search_paths
end end
target 'passKitTests' do
inherit! :search_paths
end
end end

66
pass.xcodeproj/project.pbxproj
View file

@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
1473B150643891727EB85DFE /* libPods-pass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7592A214C22CEBBEF4596CC1 /* libPods-pass.a */; }; 1473B150643891727EB85DFE /* libPods-pass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7592A214C22CEBBEF4596CC1 /* libPods-pass.a */; };
2C58F31EECC494C7A7F00A98 /* libPods-passKitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB6C63FA1652F925B5C9F0B5 /* libPods-passKitTests.a */; };
398A8F69C2230A8117820BB7 /* libPods-passKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45BAA15189E80AA544EAF7AD /* libPods-passKit.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 */; }; 6930A9D26085DE7CA1A7AACC /* libPods-passextension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B240CA444AC9172F3053651 /* libPods-passextension.a */; };
A217ACE21E9AB17C00A1A6CF /* OTPScannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A217ACE11E9AB17C00A1A6CF /* OTPScannerController.swift */; }; A217ACE21E9AB17C00A1A6CF /* OTPScannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A217ACE11E9AB17C00A1A6CF /* OTPScannerController.swift */; };
@ -154,6 +155,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
03A0A50C14E42B1A07ADA64E /* Pods-passKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-passKitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-passKitTests/Pods-passKitTests.debug.xcconfig"; sourceTree = "<group>"; };
1B240CA444AC9172F3053651 /* libPods-passextension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-passextension.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1B240CA444AC9172F3053651 /* libPods-passextension.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-passextension.a"; sourceTree = BUILT_PRODUCTS_DIR; };
37527F98FA7BD9E603FAB2BE /* Pods-passextension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-passextension.release.xcconfig"; path = "Pods/Target Support Files/Pods-passextension/Pods-passextension.release.xcconfig"; sourceTree = "<group>"; }; 37527F98FA7BD9E603FAB2BE /* Pods-passextension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-passextension.release.xcconfig"; path = "Pods/Target Support Files/Pods-passextension/Pods-passextension.release.xcconfig"; sourceTree = "<group>"; };
45BAA15189E80AA544EAF7AD /* libPods-passKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-passKit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 45BAA15189E80AA544EAF7AD /* libPods-passKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-passKit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@ -259,6 +261,8 @@
DCFB77A81E502FF6008DE471 /* PasswordEditorTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordEditorTableViewController.swift; sourceTree = "<group>"; }; DCFB77A81E502FF6008DE471 /* PasswordEditorTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordEditorTableViewController.swift; sourceTree = "<group>"; };
DCFB77AA1E503729008DE471 /* ContentTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentTableViewCell.swift; sourceTree = "<group>"; }; DCFB77AA1E503729008DE471 /* ContentTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentTableViewCell.swift; sourceTree = "<group>"; };
E8E62D313271E34D1145C29D /* Pods-pass.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-pass.release.xcconfig"; path = "Pods/Target Support Files/Pods-pass/Pods-pass.release.xcconfig"; sourceTree = "<group>"; }; E8E62D313271E34D1145C29D /* Pods-pass.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-pass.release.xcconfig"; path = "Pods/Target Support Files/Pods-pass/Pods-pass.release.xcconfig"; sourceTree = "<group>"; };
FB6C63FA1652F925B5C9F0B5 /* libPods-passKitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-passKitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
FFEDFD25DAA394C3420042DD /* Pods-passKitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-passKitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-passKitTests/Pods-passKitTests.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@ -276,6 +280,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
A26075811EEC6F34005DB03E /* passKit.framework in Frameworks */, A26075811EEC6F34005DB03E /* passKit.framework in Frameworks */,
2C58F31EECC494C7A7F00A98 /* libPods-passKitTests.a in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@ -385,6 +390,8 @@
E8E62D313271E34D1145C29D /* Pods-pass.release.xcconfig */, E8E62D313271E34D1145C29D /* Pods-pass.release.xcconfig */,
6A8CB4D4311C90B380B99491 /* Pods-passextension.debug.xcconfig */, 6A8CB4D4311C90B380B99491 /* Pods-passextension.debug.xcconfig */,
37527F98FA7BD9E603FAB2BE /* Pods-passextension.release.xcconfig */, 37527F98FA7BD9E603FAB2BE /* Pods-passextension.release.xcconfig */,
03A0A50C14E42B1A07ADA64E /* Pods-passKitTests.debug.xcconfig */,
FFEDFD25DAA394C3420042DD /* Pods-passKitTests.release.xcconfig */,
); );
name = Pods; name = Pods;
sourceTree = "<group>"; sourceTree = "<group>";
@ -533,6 +540,7 @@
45BAA15189E80AA544EAF7AD /* libPods-passKit.a */, 45BAA15189E80AA544EAF7AD /* libPods-passKit.a */,
1B240CA444AC9172F3053651 /* libPods-passextension.a */, 1B240CA444AC9172F3053651 /* libPods-passextension.a */,
B714FCC4AB231C45BE800C1C /* libPods-passKit-passextension.a */, B714FCC4AB231C45BE800C1C /* libPods-passKit-passextension.a */,
FB6C63FA1652F925B5C9F0B5 /* libPods-passKitTests.a */,
); );
name = Frameworks; name = Frameworks;
sourceTree = "<group>"; sourceTree = "<group>";
@ -575,9 +583,12 @@
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = A26075931EEC6F34005DB03E /* Build configuration list for PBXNativeTarget "passKitTests" */; buildConfigurationList = A26075931EEC6F34005DB03E /* Build configuration list for PBXNativeTarget "passKitTests" */;
buildPhases = ( buildPhases = (
2B4541871CE9949BDEC4E540 /* [CP] Check Pods Manifest.lock */,
A260757C1EEC6F34005DB03E /* Sources */, A260757C1EEC6F34005DB03E /* Sources */,
A260757D1EEC6F34005DB03E /* Frameworks */, A260757D1EEC6F34005DB03E /* Frameworks */,
A260757E1EEC6F34005DB03E /* Resources */, A260757E1EEC6F34005DB03E /* Resources */,
ED88B30DCD09627572134F0A /* [CP] Embed Pods Frameworks */,
D1CFB37FD9C587F1E9EC3972 /* [CP] Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );
@ -780,6 +791,21 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
2B4541871CE9949BDEC4E540 /* [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;
};
2DC56C1FCF814F89B7C46015 /* [CP] Check Pods Manifest.lock */ = { 2DC56C1FCF814F89B7C46015 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -870,6 +896,21 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-passextension/Pods-passextension-resources.sh\"\n"; shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-passextension/Pods-passextension-resources.sh\"\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
D1CFB37FD9C587F1E9EC3972 /* [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-passKitTests/Pods-passKitTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
DC917BEC1E2F3659000FDF54 /* Run Script */ = { DC917BEC1E2F3659000FDF54 /* Run Script */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 12; buildActionMask = 12;
@ -892,6 +933,21 @@
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "/usr/local/bin/carthage copy-frameworks"; shellScript = "/usr/local/bin/carthage copy-frameworks";
}; };
ED88B30DCD09627572134F0A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-passKitTests/Pods-passKitTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
FF64BAA847392A8690167C10 /* [CP] Copy Pods Resources */ = { FF64BAA847392A8690167C10 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
@ -1145,9 +1201,14 @@
}; };
A26075941EEC6F34005DB03E /* Debug */ = { A26075941EEC6F34005DB03E /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 03A0A50C14E42B1A07ADA64E /* Pods-passKitTests.debug.xcconfig */;
buildSettings = { buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers/",
);
INFOPLIST_FILE = passKitTests/Info.plist; INFOPLIST_FILE = passKitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3; IPHONEOS_DEPLOYMENT_TARGET = 10.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@ -1160,9 +1221,14 @@
}; };
A26075951EEC6F34005DB03E /* Release */ = { A26075951EEC6F34005DB03E /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = FFEDFD25DAA394C3420042DD /* Pods-passKitTests.release.xcconfig */;
buildSettings = { buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/Carthage/Build/iOS/ObjectiveGit.framework/Headers/",
);
INFOPLIST_FILE = passKitTests/Info.plist; INFOPLIST_FILE = passKitTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3; IPHONEOS_DEPLOYMENT_TARGET = 10.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";