From 2471c888b33269bafb43f37074825a76b59872d2 Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Wed, 4 Jul 2018 14:55:44 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=AB=20Integrate=20CocoaPods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- Podfile | 22 +++++ Podfile.lock | 38 +++++++++ mas-cli.xcodeproj/project.pbxproj | 90 ++++++++++++++++++++ mas-cli.xcworkspace/contents.xcworkspacedata | 3 + 5 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 Podfile create mode 100644 Podfile.lock diff --git a/.gitignore b/.gitignore index 14e22d5..8227e62 100644 --- a/.gitignore +++ b/.gitignore @@ -38,7 +38,7 @@ xcuserdata # you should judge for yourself, the pros and cons are mentioned at: # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control # -# Pods/ +Pods/ # Carthage # diff --git a/Podfile b/Podfile new file mode 100644 index 0000000..e7e3176 --- /dev/null +++ b/Podfile @@ -0,0 +1,22 @@ +# +# Podfile +# mas-cli +# + +platform :osx, '10.13' + +target 'mas' do + use_frameworks! + + pod 'Commandant', git: "https://github.com/phatblat/Commandant.git", branch: "cocoapods" + pod 'Result' + + target 'mas-tests' do + inherit! :search_paths + + pod 'Quick' + pod 'Nimble' + + end + +end diff --git a/Podfile.lock b/Podfile.lock new file mode 100644 index 0000000..cb8f95a --- /dev/null +++ b/Podfile.lock @@ -0,0 +1,38 @@ +PODS: + - Commandant (0.14.0): + - Result (~> 4.0) + - Nimble (7.1.2) + - Quick (1.3.0) + - Result (4.0.0) + +DEPENDENCIES: + - Commandant (from `https://github.com/phatblat/Commandant.git`, branch `cocoapods`) + - Nimble + - Quick + - Result + +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Nimble + - Quick + - Result + +EXTERNAL SOURCES: + Commandant: + :branch: cocoapods + :git: https://github.com/phatblat/Commandant.git + +CHECKOUT OPTIONS: + Commandant: + :commit: 17619c56d175a11c8df492688291be4e6ca77326 + :git: https://github.com/phatblat/Commandant.git + +SPEC CHECKSUMS: + Commandant: 8f874fdba6a1e75126e4555fa12c4c818db9e922 + Nimble: 3835ba9f459daa6b347f8a8e110aaae8ca1920a8 + Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f + Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713 + +PODFILE CHECKSUM: f574a9b5903a28c63252361352a4bac6a1b227a0 + +COCOAPODS: 1.5.3 diff --git a/mas-cli.xcodeproj/project.pbxproj b/mas-cli.xcodeproj/project.pbxproj index 9b391b3..0252550 100644 --- a/mas-cli.xcodeproj/project.pbxproj +++ b/mas-cli.xcodeproj/project.pbxproj @@ -7,11 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 2E92A3D91BCE26B74A4B6818 /* Pods_mas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E07314D3137EE7D56A2AB781 /* Pods_mas.framework */; }; 4913269B1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4913269A1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift */; }; 693A98991CBFFA760004D3B4 /* Search.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693A98981CBFFA760004D3B4 /* Search.swift */; }; 693A989B1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift in Sources */ = {isa = PBXBuildFile; fileRef = 693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */; }; 8078FAA81EC4F2FB004B5B3F /* Lucky.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8078FAA71EC4F2FB004B5B3F /* Lucky.swift */; }; 900A1E811DBAC8CB0069B1A8 /* Info.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900A1E801DBAC8CB0069B1A8 /* Info.swift */; }; + BC00291E36C9BC974B3C6E59 /* Pods_mas_tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EEB31E76970252A017510D3 /* Pods_mas_tests.framework */; }; ED031A7C1B5127C00097692E /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED031A7B1B5127C00097692E /* main.swift */; }; ED0F237F1B87522400AE40CD /* Install.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0F237E1B87522400AE40CD /* Install.swift */; }; ED0F23831B87533A00AE40CD /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0F23821B87533A00AE40CD /* List.swift */; }; @@ -58,10 +60,15 @@ /* Begin PBXFileReference section */ 4913269A1F48921D0010EB86 /* CKSoftwareMap+AppLookup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CKSoftwareMap+AppLookup.swift"; sourceTree = ""; }; + 522981647B3556C75610CED6 /* Pods-mas-tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mas-tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-mas-tests/Pods-mas-tests.debug.xcconfig"; sourceTree = ""; }; + 5EEB31E76970252A017510D3 /* Pods_mas_tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_mas_tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 693A98981CBFFA760004D3B4 /* Search.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Search.swift; sourceTree = ""; }; 693A989A1CBFFAAA0004D3B4 /* NSURLSession+Synchronous.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSURLSession+Synchronous.swift"; sourceTree = ""; }; 8078FAA71EC4F2FB004B5B3F /* Lucky.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Lucky.swift; sourceTree = ""; }; + 8C36D6578FD2B2CF3254B9FE /* Pods-mas-tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mas-tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-mas-tests/Pods-mas-tests.release.xcconfig"; sourceTree = ""; }; 900A1E801DBAC8CB0069B1A8 /* Info.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Info.swift; sourceTree = ""; }; + 93F48CA44E5C9A0F55515D2F /* Pods-mas.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mas.release.xcconfig"; path = "Pods/Target Support Files/Pods-mas/Pods-mas.release.xcconfig"; sourceTree = ""; }; + E07314D3137EE7D56A2AB781 /* Pods_mas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_mas.framework; sourceTree = BUILT_PRODUCTS_DIR; }; ED031A781B5127C00097692E /* mas */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mas; sourceTree = BUILT_PRODUCTS_DIR; }; ED031A7B1B5127C00097692E /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; ED0F237E1B87522400AE40CD /* Install.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Install.swift; sourceTree = ""; }; @@ -106,6 +113,7 @@ EDEAA1551B5C576D00F2FC3F /* CKUpdateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CKUpdateController.h; sourceTree = ""; }; EDEAA1661B5C576D00F2FC3F /* ISStoreURLOperationDelegate-Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ISStoreURLOperationDelegate-Protocol.h"; sourceTree = ""; }; EDEAA17C1B5C579100F2FC3F /* CommerceKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CommerceKit.framework; path = /System/Library/PrivateFrameworks/CommerceKit.framework; sourceTree = ""; }; + F0503AD4FF25D07C99DDBDB7 /* Pods-mas.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-mas.debug.xcconfig"; path = "Pods/Target Support Files/Pods-mas/Pods-mas.debug.xcconfig"; sourceTree = ""; }; F8233C87201EBDF000268278 /* mas-tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "mas-tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; F8233C8B201EBDF100268278 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; F865880A2030F6DE0093DE57 /* MASErrorTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MASErrorTestCase.swift; sourceTree = ""; }; @@ -118,6 +126,7 @@ files = ( EDEAA17D1B5C579100F2FC3F /* CommerceKit.framework in Frameworks */, EDEAA0C01B51CE6200F2FC3F /* StoreFoundation.framework in Frameworks */, + 2E92A3D91BCE26B74A4B6818 /* Pods_mas.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -125,12 +134,24 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + BC00291E36C9BC974B3C6E59 /* Pods_mas_tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + A3502A46D447CE2467D0874C /* Pods */ = { + isa = PBXGroup; + children = ( + F0503AD4FF25D07C99DDBDB7 /* Pods-mas.debug.xcconfig */, + 93F48CA44E5C9A0F55515D2F /* Pods-mas.release.xcconfig */, + 522981647B3556C75610CED6 /* Pods-mas-tests.debug.xcconfig */, + 8C36D6578FD2B2CF3254B9FE /* Pods-mas-tests.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; ED031A6F1B5127C00097692E = { isa = PBXGroup; children = ( @@ -139,6 +160,7 @@ EDFC76381B642A2E00D0DBD7 /* Frameworks */, EDEAA0C11B51CEBD00F2FC3F /* PrivateHeaders */, ED031A791B5127C00097692E /* Products */, + A3502A46D447CE2467D0874C /* Pods */, ); sourceTree = ""; }; @@ -250,6 +272,8 @@ children = ( EDEAA17C1B5C579100F2FC3F /* CommerceKit.framework */, EDEAA0BF1B51CE6200F2FC3F /* StoreFoundation.framework */, + E07314D3137EE7D56A2AB781 /* Pods_mas.framework */, + 5EEB31E76970252A017510D3 /* Pods_mas_tests.framework */, ); name = Frameworks; sourceTree = ""; @@ -270,6 +294,7 @@ isa = PBXNativeTarget; buildConfigurationList = ED031A7F1B5127C00097692E /* Build configuration list for PBXNativeTarget "mas" */; buildPhases = ( + 05B8B496C481137D8FFE9D9F /* [CP] Check Pods Manifest.lock */, ED031A741B5127C00097692E /* Sources */, ED031A751B5127C00097692E /* Frameworks */, ED031A761B5127C00097692E /* CopyFiles */, @@ -288,9 +313,11 @@ isa = PBXNativeTarget; buildConfigurationList = F8233C8C201EBDF100268278 /* Build configuration list for PBXNativeTarget "mas-tests" */; buildPhases = ( + F80181D9642BE508913BCCF7 /* [CP] Check Pods Manifest.lock */, F8233C83201EBDF000268278 /* Sources */, F8233C84201EBDF000268278 /* Frameworks */, F8233C85201EBDF000268278 /* Resources */, + CFC34CABD32D3AA79CAB6C32 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -358,6 +385,65 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 05B8B496C481137D8FFE9D9F /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-mas-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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; + }; + CFC34CABD32D3AA79CAB6C32 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-mas-tests/Pods-mas-tests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", + "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-mas-tests/Pods-mas-tests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + F80181D9642BE508913BCCF7 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-mas-tests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + 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; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ ED031A741B5127C00097692E /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -531,6 +617,7 @@ }; ED031A801B5127C00097692E /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F0503AD4FF25D07C99DDBDB7 /* Pods-mas.debug.xcconfig */; buildSettings = { PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -540,6 +627,7 @@ }; ED031A811B5127C00097692E /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 93F48CA44E5C9A0F55515D2F /* Pods-mas.release.xcconfig */; buildSettings = { CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build"; PRODUCT_BUNDLE_IDENTIFIER = "com.mphys.mas-cli"; @@ -551,6 +639,7 @@ }; F8233C8D201EBDF100268278 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 522981647B3556C75610CED6 /* Pods-mas-tests.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -575,6 +664,7 @@ }; F8233C8E201EBDF100268278 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 8C36D6578FD2B2CF3254B9FE /* Pods-mas-tests.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; diff --git a/mas-cli.xcworkspace/contents.xcworkspacedata b/mas-cli.xcworkspace/contents.xcworkspacedata index 239c1e8..06669f2 100644 --- a/mas-cli.xcworkspace/contents.xcworkspacedata +++ b/mas-cli.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + +