|
828 | 828 | 61091CB31CDAF563008B7EA3 /* CYShareSDK */ = { |
829 | 829 | isa = PBXGroup; |
830 | 830 | children = ( |
831 | | -<<<<<<< HEAD |
832 | | - 61091CB71CDAF563008B7EA3 /* CYShare.h */, |
833 | | - 61091CB81CDAF563008B7EA3 /* CYShare.m */, |
834 | | - 61091CB41CDAF563008B7EA3 /* CYQQ */, |
835 | | - 61091CB91CDAF563008B7EA3 /* CYShareBase */, |
836 | | - 61091CBC1CDAF563008B7EA3 /* CYSinaWeibo */, |
837 | | - 61091CBF1CDAF563008B7EA3 /* CYSMS */, |
838 | | - 61091CC21CDAF563008B7EA3 /* CYWechat */, |
839 | | -======= |
840 | 831 | A3A81D5E1F972AD100C26475 /* CustomShare */, |
841 | 832 | 61091CB71CDAF563008B7EA3 /* CYShare.h */, |
842 | 833 | 61091CB81CDAF563008B7EA3 /* CYShare.m */, |
|
845 | 836 | A36F4F0F1F9091D100E7F4B6 /* CYShareModel.h */, |
846 | 837 | A36F4F101F9091D100E7F4B6 /* CYShareModel.m */, |
847 | 838 | A3A81D591F95EDAA00C26475 /* CYShareCtrlFlag.h */, |
848 | | ->>>>>>> 36863ad57a8d49d4e07b6aae27803eff09653aad |
849 | 839 | 61091CC51CDAF563008B7EA3 /* Readme */, |
850 | 840 | ); |
851 | 841 | path = CYShareSDK; |
|
942 | 932 | A307B6431D080FD900DE9B9E /* CYSegmented */, |
943 | 933 | A307B6421D080FBA00DE9B9E /* CYPageView */, |
944 | 934 | A330B0AB1CF6F53000C8639D /* CYSecurity */, |
945 | | - A311A1611CEC3A13001C64C9 /* CYPath */, |
946 | 935 | A32601F31CE9B4A10032E21C /* CYIPUtils */, |
947 | 936 | A3271D511CE585F7005DE1A1 /* CYExceptionUtils */, |
948 | 937 | 61091C1B1CDAF563008B7EA3 /* CYActionSheet */, |
|
1095 | 1084 | path = CYSegmented; |
1096 | 1085 | sourceTree = SOURCE_ROOT; |
1097 | 1086 | }; |
1098 | | - A311A1611CEC3A13001C64C9 /* CYPath */ = { |
1099 | | - isa = PBXGroup; |
1100 | | - children = ( |
1101 | | - ); |
1102 | | - path = CYPath; |
1103 | | - sourceTree = SOURCE_ROOT; |
1104 | | - }; |
1105 | 1087 | A32601F31CE9B4A10032E21C /* CYIPUtils */ = { |
1106 | 1088 | isa = PBXGroup; |
1107 | 1089 | children = ( |
|
1468 | 1450 | files = ( |
1469 | 1451 | ); |
1470 | 1452 | inputPaths = ( |
| 1453 | + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", |
| 1454 | + "${PODS_ROOT}/Manifest.lock", |
1471 | 1455 | ); |
1472 | 1456 | name = "[CP] Check Pods Manifest.lock"; |
1473 | 1457 | outputPaths = ( |
| 1458 | + "$(DERIVED_FILE_DIR)/Pods-CYUtilProject-checkManifestLockResult.txt", |
1474 | 1459 | ); |
1475 | 1460 | runOnlyForDeploymentPostprocessing = 0; |
1476 | 1461 | shellPath = /bin/sh; |
1477 | | - 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"; |
| 1462 | + 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"; |
1478 | 1463 | showEnvVarsInLog = 0; |
1479 | 1464 | }; |
1480 | 1465 | /* End PBXShellScriptBuildPhase section */ |
|
0 commit comments