Skip to content

Commit 76ac74b

Browse files
authored
Updates to the manual build process for CocoaPods 1.3.1 (#204)
1 parent 728dec2 commit 76ac74b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

BuildFrameworks/FrameworkMaker.xcodeproj/project.pbxproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,16 @@
224224
files = (
225225
);
226226
inputPaths = (
227+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
228+
"${PODS_ROOT}/Manifest.lock",
227229
);
228230
name = "[CP] Check Pods Manifest.lock";
229231
outputPaths = (
232+
"$(DERIVED_FILE_DIR)/Pods-FrameworkMaker_macOS-checkManifestLockResult.txt",
230233
);
231234
runOnlyForDeploymentPostprocessing = 0;
232235
shellPath = /bin/sh;
233-
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";
236+
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";
234237
showEnvVarsInLog = 0;
235238
};
236239
83F5D2024D97A1D542B7932F /* [CP] Embed Pods Frameworks */ = {
@@ -254,13 +257,16 @@
254257
files = (
255258
);
256259
inputPaths = (
260+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
261+
"${PODS_ROOT}/Manifest.lock",
257262
);
258263
name = "[CP] Check Pods Manifest.lock";
259264
outputPaths = (
265+
"$(DERIVED_FILE_DIR)/Pods-FrameworkMaker_iOS-checkManifestLockResult.txt",
260266
);
261267
runOnlyForDeploymentPostprocessing = 0;
262268
shellPath = /bin/sh;
263-
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";
269+
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";
264270
showEnvVarsInLog = 0;
265271
};
266272
C712E44DB1FAE1B023552B35 /* [CP] Copy Pods Resources */ = {

BuildFrameworks/build.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func buildThin(framework: String, multiplatform: Bool, arch: String, multisdk: B
124124
if !multiplatform {
125125
schemeSuffix = ""
126126
} else if sdk.hasPrefix("mac") {
127-
schemeSuffix = "-OSX"
127+
schemeSuffix = "-macOS"
128128
} else if sdk.hasPrefix("iphone") {
129129
schemeSuffix = "-iOS"
130130
} else {

0 commit comments

Comments
 (0)