Skip to content

Commit 1a3e66b

Browse files
author
garenwang
committed
修改配置
1 parent 322e961 commit 1a3e66b

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ PODS:
1717
- QCloudTrack/Cls (6.4.5):
1818
- TencentCloudLogProducer
1919
- QCloudTrack/Default (6.4.5)
20-
- TencentCloudLogProducer (1.1.0):
21-
- TencentCloudLogProducer/Core (= 1.1.0)
22-
- TencentCloudLogProducer/Core (1.1.0):
20+
- TencentCloudLogProducer (1.1.1):
21+
- TencentCloudLogProducer/Core (= 1.1.1)
22+
- TencentCloudLogProducer/Core (1.1.1):
2323
- GMOpenSSL (~> 2.2.6)
2424

2525
DEPENDENCIES:
@@ -51,7 +51,7 @@ SPEC CHECKSUMS:
5151
QCloudCOSXML: 8185a7a51c7dce6ff1a25c725907f6beb270cd01
5252
QCloudQuic: 81e2c29fa8122c1d5e8323a90349683e52c8e101
5353
QCloudTrack: 6bf7aaa7e870d72fb4c9c88455dc63c7c65073b7
54-
TencentCloudLogProducer: 4ccf2eb45c432180351564b1447b98d9b23ca37a
54+
TencentCloudLogProducer: 564e944491e6396c81df4c9c51470784752ff3ab
5555

5656
PODFILE CHECKSUM: 469848875513aa1180afa1e3751e2d873841a154
5757

QCloudCOSXMLDemo.xcodeproj/project.pbxproj

+16-13
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@
464464
1AB143E91E601E0500830F93 /* Frameworks */,
465465
1AB143EA1E601E0500830F93 /* Resources */,
466466
5531753F06D2602A23691AE3 /* [CP] Copy Pods Resources */,
467-
905E623E0EDCB9F5095F7201 /* [CP] Embed Pods Frameworks */,
467+
B59841545FCAFF722181206F /* [CP] Embed Pods Frameworks */,
468468
);
469469
buildRules = (
470470
);
@@ -601,40 +601,40 @@
601601
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-resources.sh\"\n";
602602
showEnvVarsInLog = 0;
603603
};
604-
905E623E0EDCB9F5095F7201 /* [CP] Embed Pods Frameworks */ = {
604+
9985684AE5A7F7B42D827A19 /* [CP] Check Pods Manifest.lock */ = {
605605
isa = PBXShellScriptBuildPhase;
606606
buildActionMask = 2147483647;
607607
files = (
608608
);
609609
inputPaths = (
610-
"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh",
611-
"${PODS_ROOT}/../QCloudQuic/Classes/QuicFramework/Tquic.framework",
610+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
611+
"${PODS_ROOT}/Manifest.lock",
612612
);
613-
name = "[CP] Embed Pods Frameworks";
613+
name = "[CP] Check Pods Manifest.lock";
614614
outputPaths = (
615-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Tquic.framework",
615+
"$(DERIVED_FILE_DIR)/Pods-QCloudCOSXMLDemo-checkManifestLockResult.txt",
616616
);
617617
runOnlyForDeploymentPostprocessing = 0;
618618
shellPath = /bin/sh;
619-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh\"\n";
619+
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";
620620
showEnvVarsInLog = 0;
621621
};
622-
9985684AE5A7F7B42D827A19 /* [CP] Check Pods Manifest.lock */ = {
622+
B59841545FCAFF722181206F /* [CP] Embed Pods Frameworks */ = {
623623
isa = PBXShellScriptBuildPhase;
624624
buildActionMask = 2147483647;
625625
files = (
626626
);
627627
inputPaths = (
628-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
629-
"${PODS_ROOT}/Manifest.lock",
628+
"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh",
629+
"${PODS_ROOT}/../QCloudQuic/Classes/QuicFramework/Tquic.framework",
630630
);
631-
name = "[CP] Check Pods Manifest.lock";
631+
name = "[CP] Embed Pods Frameworks";
632632
outputPaths = (
633-
"$(DERIVED_FILE_DIR)/Pods-QCloudCOSXMLDemo-checkManifestLockResult.txt",
633+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Tquic.framework",
634634
);
635635
runOnlyForDeploymentPostprocessing = 0;
636636
shellPath = /bin/sh;
637-
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";
637+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QCloudCOSXMLDemo/Pods-QCloudCOSXMLDemo-frameworks.sh\"\n";
638638
showEnvVarsInLog = 0;
639639
};
640640
/* End PBXShellScriptBuildPhase section */
@@ -818,6 +818,7 @@
818818
CODE_SIGN_STYLE = Automatic;
819819
DEVELOPMENT_TEAM = 6RL39LH4U4;
820820
ENABLE_BITCODE = NO;
821+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
821822
GCC_PRECOMPILE_PREFIX_HEADER = YES;
822823
GCC_PREFIX_HEADER = "$(SRCROOT)/QCloudCOSXMLDemo/PrefixHeader.pch";
823824
INFOPLIST_FILE = QCloudCOSXMLDemo/Info.plist;
@@ -826,6 +827,7 @@
826827
"$(inherited)",
827828
"@executable_path/Frameworks",
828829
);
830+
ONLY_ACTIVE_ARCH = NO;
829831
OTHER_LDFLAGS = (
830832
"$(inherited)",
831833
"-ObjC",
@@ -846,6 +848,7 @@
846848
CODE_SIGN_STYLE = Automatic;
847849
DEVELOPMENT_TEAM = 6RL39LH4U4;
848850
ENABLE_BITCODE = NO;
851+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
849852
GCC_PRECOMPILE_PREFIX_HEADER = YES;
850853
GCC_PREFIX_HEADER = "$(SRCROOT)/QCloudCOSXMLDemo/PrefixHeader.pch";
851854
INFOPLIST_FILE = QCloudCOSXMLDemo/Info.plist;

0 commit comments

Comments
 (0)