Skip to content

Commit 2de8eec

Browse files
garrettmoongarrettmoon
authored
Upgrade Xcode and Cocoapods (TextureGroup#1552)
* Upgrade Xcode * Update examples for new cocoapods / swift * Fix carthage mode in build.sh
1 parent ef06cfe commit 2de8eec

File tree

30 files changed

+83
-652
lines changed

30 files changed

+83
-652
lines changed

‎build.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
PLATFORM="${TEXTURE_BUILD_PLATFORM:-platform=iOS Simulator,OS=10.2,name=iPhone 7}"
4-
SDK="${TEXTURE_BUILD_SDK:-iphonesimulator11.4}"
4+
SDK="${TEXTURE_BUILD_SDK:-iphonesimulator12.2}"
55
DERIVED_DATA_PATH="~/ASDKDerivedData"
66

77
# It is pitch black.
@@ -159,7 +159,7 @@ fi
159159

160160
# Support building a specific example: sh build.sh example examples/ASDKLayoutTransition
161161
if [ "$MODE" = "example" ]; then
162-
echo "Verifying that all AsyncDisplayKit examples compile."
162+
echo "Verifying $2 compiles."
163163
#Update cocoapods repo
164164
pod repo update master
165165

@@ -202,6 +202,7 @@ if [ "$MODE" = "carthage" -o "$MODE" = "all" ]; then
202202
echo "Verifying carthage works."
203203

204204
set -o pipefail && carthage update && carthage build --no-skip-current
205+
success="1"
205206
fi
206207

207208
if [ "$success" = "1" ]; then

‎examples/ASCollectionView/Sample.xcodeproj/project.pbxproj

-48
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,6 @@
131131
AC3C4A5A1A11F47200143C57 /* Sources */,
132132
AC3C4A5B1A11F47200143C57 /* Frameworks */,
133133
AC3C4A5C1A11F47200143C57 /* Resources */,
134-
A6902C454C7661D0D277AC62 /* [CP] Copy Pods Resources */,
135-
79E97C651F7D1ECDBE6B4793 /* [CP] Embed Pods Frameworks */,
136-
8C4782EECEE7F1205007D6DB /* Embed Pods Frameworks */,
137134
);
138135
buildRules = (
139136
);
@@ -189,51 +186,6 @@
189186
/* End PBXResourcesBuildPhase section */
190187

191188
/* Begin PBXShellScriptBuildPhase section */
192-
79E97C651F7D1ECDBE6B4793 /* [CP] Embed Pods Frameworks */ = {
193-
isa = PBXShellScriptBuildPhase;
194-
buildActionMask = 2147483647;
195-
files = (
196-
);
197-
inputPaths = (
198-
);
199-
name = "[CP] Embed Pods Frameworks";
200-
outputPaths = (
201-
);
202-
runOnlyForDeploymentPostprocessing = 0;
203-
shellPath = /bin/sh;
204-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
205-
showEnvVarsInLog = 0;
206-
};
207-
8C4782EECEE7F1205007D6DB /* Embed Pods Frameworks */ = {
208-
isa = PBXShellScriptBuildPhase;
209-
buildActionMask = 2147483647;
210-
files = (
211-
);
212-
inputPaths = (
213-
);
214-
name = "Embed Pods Frameworks";
215-
outputPaths = (
216-
);
217-
runOnlyForDeploymentPostprocessing = 0;
218-
shellPath = /bin/sh;
219-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
220-
showEnvVarsInLog = 0;
221-
};
222-
A6902C454C7661D0D277AC62 /* [CP] Copy Pods Resources */ = {
223-
isa = PBXShellScriptBuildPhase;
224-
buildActionMask = 2147483647;
225-
files = (
226-
);
227-
inputPaths = (
228-
);
229-
name = "[CP] Copy Pods Resources";
230-
outputPaths = (
231-
);
232-
runOnlyForDeploymentPostprocessing = 0;
233-
shellPath = /bin/sh;
234-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
235-
showEnvVarsInLog = 0;
236-
};
237189
F868CFBB21824CC9521B6588 /* [CP] Check Pods Manifest.lock */ = {
238190
isa = PBXShellScriptBuildPhase;
239191
buildActionMask = 2147483647;

‎examples/ASDKLayoutTransition/Sample.xcodeproj/project.pbxproj

-32
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@
117117
05E2127D19D4DB510098F589 /* Sources */,
118118
05E2127E19D4DB510098F589 /* Frameworks */,
119119
05E2127F19D4DB510098F589 /* Resources */,
120-
F012A6F39E0149F18F564F50 /* [CP] Copy Pods Resources */,
121-
6E05308BEF86AD80AEB4EEE7 /* [CP] Embed Pods Frameworks */,
122120
);
123121
buildRules = (
124122
);
@@ -175,21 +173,6 @@
175173
/* End PBXResourcesBuildPhase section */
176174

177175
/* Begin PBXShellScriptBuildPhase section */
178-
6E05308BEF86AD80AEB4EEE7 /* [CP] Embed Pods Frameworks */ = {
179-
isa = PBXShellScriptBuildPhase;
180-
buildActionMask = 2147483647;
181-
files = (
182-
);
183-
inputPaths = (
184-
);
185-
name = "[CP] Embed Pods Frameworks";
186-
outputPaths = (
187-
);
188-
runOnlyForDeploymentPostprocessing = 0;
189-
shellPath = /bin/sh;
190-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
191-
showEnvVarsInLog = 0;
192-
};
193176
E080B80F89C34A25B3488E26 /* [CP] Check Pods Manifest.lock */ = {
194177
isa = PBXShellScriptBuildPhase;
195178
buildActionMask = 2147483647;
@@ -208,21 +191,6 @@
208191
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";
209192
showEnvVarsInLog = 0;
210193
};
211-
F012A6F39E0149F18F564F50 /* [CP] Copy Pods Resources */ = {
212-
isa = PBXShellScriptBuildPhase;
213-
buildActionMask = 2147483647;
214-
files = (
215-
);
216-
inputPaths = (
217-
);
218-
name = "[CP] Copy Pods Resources";
219-
outputPaths = (
220-
);
221-
runOnlyForDeploymentPostprocessing = 0;
222-
shellPath = /bin/sh;
223-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
224-
showEnvVarsInLog = 0;
225-
};
226194
/* End PBXShellScriptBuildPhase section */
227195

228196
/* Begin PBXSourcesBuildPhase section */

‎examples/ASDKTube/Sample.xcodeproj/project.pbxproj

-32
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@
192192
05E2127D19D4DB510098F589 /* Sources */,
193193
05E2127E19D4DB510098F589 /* Frameworks */,
194194
05E2127F19D4DB510098F589 /* Resources */,
195-
F012A6F39E0149F18F564F50 /* [CP] Copy Pods Resources */,
196-
93B7780A33739EF25F20366B /* [CP] Embed Pods Frameworks */,
197195
);
198196
buildRules = (
199197
);
@@ -256,21 +254,6 @@
256254
/* End PBXResourcesBuildPhase section */
257255

258256
/* Begin PBXShellScriptBuildPhase section */
259-
93B7780A33739EF25F20366B /* [CP] Embed Pods Frameworks */ = {
260-
isa = PBXShellScriptBuildPhase;
261-
buildActionMask = 2147483647;
262-
files = (
263-
);
264-
inputPaths = (
265-
);
266-
name = "[CP] Embed Pods Frameworks";
267-
outputPaths = (
268-
);
269-
runOnlyForDeploymentPostprocessing = 0;
270-
shellPath = /bin/sh;
271-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
272-
showEnvVarsInLog = 0;
273-
};
274257
E080B80F89C34A25B3488E26 /* [CP] Check Pods Manifest.lock */ = {
275258
isa = PBXShellScriptBuildPhase;
276259
buildActionMask = 2147483647;
@@ -289,21 +272,6 @@
289272
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";
290273
showEnvVarsInLog = 0;
291274
};
292-
F012A6F39E0149F18F564F50 /* [CP] Copy Pods Resources */ = {
293-
isa = PBXShellScriptBuildPhase;
294-
buildActionMask = 2147483647;
295-
files = (
296-
);
297-
inputPaths = (
298-
);
299-
name = "[CP] Copy Pods Resources";
300-
outputPaths = (
301-
);
302-
runOnlyForDeploymentPostprocessing = 0;
303-
shellPath = /bin/sh;
304-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
305-
showEnvVarsInLog = 0;
306-
};
307275
/* End PBXShellScriptBuildPhase section */
308276

309277
/* Begin PBXSourcesBuildPhase section */

‎examples/ASMapNode/Sample.xcodeproj/project.pbxproj

-32
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@
121121
694993C91C8B334F00491CA5 /* Sources */,
122122
694993CA1C8B334F00491CA5 /* Frameworks */,
123123
694993CB1C8B334F00491CA5 /* Resources */,
124-
06EE2E0ABEB6289D4775A867 /* [CP] Copy Pods Resources */,
125-
23FC03B282CBD9014D868DF6 /* [CP] Embed Pods Frameworks */,
126124
);
127125
buildRules = (
128126
);
@@ -178,36 +176,6 @@
178176
/* End PBXResourcesBuildPhase section */
179177

180178
/* Begin PBXShellScriptBuildPhase section */
181-
06EE2E0ABEB6289D4775A867 /* [CP] Copy Pods Resources */ = {
182-
isa = PBXShellScriptBuildPhase;
183-
buildActionMask = 2147483647;
184-
files = (
185-
);
186-
inputPaths = (
187-
);
188-
name = "[CP] Copy Pods Resources";
189-
outputPaths = (
190-
);
191-
runOnlyForDeploymentPostprocessing = 0;
192-
shellPath = /bin/sh;
193-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
194-
showEnvVarsInLog = 0;
195-
};
196-
23FC03B282CBD9014D868DF6 /* [CP] Embed Pods Frameworks */ = {
197-
isa = PBXShellScriptBuildPhase;
198-
buildActionMask = 2147483647;
199-
files = (
200-
);
201-
inputPaths = (
202-
);
203-
name = "[CP] Embed Pods Frameworks";
204-
outputPaths = (
205-
);
206-
runOnlyForDeploymentPostprocessing = 0;
207-
shellPath = /bin/sh;
208-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
209-
showEnvVarsInLog = 0;
210-
};
211179
80035273449C25F4B2E1454F /* [CP] Check Pods Manifest.lock */ = {
212180
isa = PBXShellScriptBuildPhase;
213181
buildActionMask = 2147483647;

‎examples/ASViewController/Sample.xcodeproj/project.pbxproj

-32
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@
126126
694993C91C8B334F00491CA5 /* Sources */,
127127
694993CA1C8B334F00491CA5 /* Frameworks */,
128128
694993CB1C8B334F00491CA5 /* Resources */,
129-
06EE2E0ABEB6289D4775A867 /* [CP] Copy Pods Resources */,
130-
23FC03B282CBD9014D868DF6 /* [CP] Embed Pods Frameworks */,
131129
);
132130
buildRules = (
133131
);
@@ -183,36 +181,6 @@
183181
/* End PBXResourcesBuildPhase section */
184182

185183
/* Begin PBXShellScriptBuildPhase section */
186-
06EE2E0ABEB6289D4775A867 /* [CP] Copy Pods Resources */ = {
187-
isa = PBXShellScriptBuildPhase;
188-
buildActionMask = 2147483647;
189-
files = (
190-
);
191-
inputPaths = (
192-
);
193-
name = "[CP] Copy Pods Resources";
194-
outputPaths = (
195-
);
196-
runOnlyForDeploymentPostprocessing = 0;
197-
shellPath = /bin/sh;
198-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
199-
showEnvVarsInLog = 0;
200-
};
201-
23FC03B282CBD9014D868DF6 /* [CP] Embed Pods Frameworks */ = {
202-
isa = PBXShellScriptBuildPhase;
203-
buildActionMask = 2147483647;
204-
files = (
205-
);
206-
inputPaths = (
207-
);
208-
name = "[CP] Embed Pods Frameworks";
209-
outputPaths = (
210-
);
211-
runOnlyForDeploymentPostprocessing = 0;
212-
shellPath = /bin/sh;
213-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
214-
showEnvVarsInLog = 0;
215-
};
216184
80035273449C25F4B2E1454F /* [CP] Check Pods Manifest.lock */ = {
217185
isa = PBXShellScriptBuildPhase;
218186
buildActionMask = 2147483647;

‎examples/AnimatedGIF/Sample.xcodeproj/project.pbxproj

-32
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@
118118
683ADB9A1CA19883005863A4 /* Sources */,
119119
683ADB9B1CA19883005863A4 /* Frameworks */,
120120
683ADB9C1CA19883005863A4 /* Resources */,
121-
26A96BEEF893B1FA39F144CF /* [CP] Embed Pods Frameworks */,
122-
2ADE0E7B5309A9CD043DDB3E /* [CP] Copy Pods Resources */,
123121
);
124122
buildRules = (
125123
);
@@ -178,36 +176,6 @@
178176
/* End PBXResourcesBuildPhase section */
179177

180178
/* Begin PBXShellScriptBuildPhase section */
181-
26A96BEEF893B1FA39F144CF /* [CP] Embed Pods Frameworks */ = {
182-
isa = PBXShellScriptBuildPhase;
183-
buildActionMask = 2147483647;
184-
files = (
185-
);
186-
inputPaths = (
187-
);
188-
name = "[CP] Embed Pods Frameworks";
189-
outputPaths = (
190-
);
191-
runOnlyForDeploymentPostprocessing = 0;
192-
shellPath = /bin/sh;
193-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
194-
showEnvVarsInLog = 0;
195-
};
196-
2ADE0E7B5309A9CD043DDB3E /* [CP] Copy Pods Resources */ = {
197-
isa = PBXShellScriptBuildPhase;
198-
buildActionMask = 2147483647;
199-
files = (
200-
);
201-
inputPaths = (
202-
);
203-
name = "[CP] Copy Pods Resources";
204-
outputPaths = (
205-
);
206-
runOnlyForDeploymentPostprocessing = 0;
207-
shellPath = /bin/sh;
208-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
209-
showEnvVarsInLog = 0;
210-
};
211179
694B306B43ED1C3916B0D909 /* [CP] Check Pods Manifest.lock */ = {
212180
isa = PBXShellScriptBuildPhase;
213181
buildActionMask = 2147483647;

‎examples/AsyncDisplayKitOverview/Sample.xcodeproj/project.pbxproj

-32
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@
139139
6972162C1CCD8FB300122312 /* Sources */,
140140
6972162D1CCD8FB300122312 /* Frameworks */,
141141
6972162E1CCD8FB300122312 /* Resources */,
142-
267658CA53A0F4A2D24A8438 /* [CP] Embed Pods Frameworks */,
143-
84F93825AFB1CA7FBB116BA4 /* [CP] Copy Pods Resources */,
144142
);
145143
buildRules = (
146144
);
@@ -196,21 +194,6 @@
196194
/* End PBXResourcesBuildPhase section */
197195

198196
/* Begin PBXShellScriptBuildPhase section */
199-
267658CA53A0F4A2D24A8438 /* [CP] Embed Pods Frameworks */ = {
200-
isa = PBXShellScriptBuildPhase;
201-
buildActionMask = 2147483647;
202-
files = (
203-
);
204-
inputPaths = (
205-
);
206-
name = "[CP] Embed Pods Frameworks";
207-
outputPaths = (
208-
);
209-
runOnlyForDeploymentPostprocessing = 0;
210-
shellPath = /bin/sh;
211-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-frameworks.sh\"\n";
212-
showEnvVarsInLog = 0;
213-
};
214197
78A0D09A94A74B3737920EA7 /* [CP] Check Pods Manifest.lock */ = {
215198
isa = PBXShellScriptBuildPhase;
216199
buildActionMask = 2147483647;
@@ -229,21 +212,6 @@
229212
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";
230213
showEnvVarsInLog = 0;
231214
};
232-
84F93825AFB1CA7FBB116BA4 /* [CP] Copy Pods Resources */ = {
233-
isa = PBXShellScriptBuildPhase;
234-
buildActionMask = 2147483647;
235-
files = (
236-
);
237-
inputPaths = (
238-
);
239-
name = "[CP] Copy Pods Resources";
240-
outputPaths = (
241-
);
242-
runOnlyForDeploymentPostprocessing = 0;
243-
shellPath = /bin/sh;
244-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Sample/Pods-Sample-resources.sh\"\n";
245-
showEnvVarsInLog = 0;
246-
};
247215
/* End PBXShellScriptBuildPhase section */
248216

249217
/* Begin PBXSourcesBuildPhase section */

0 commit comments

Comments
 (0)