Skip to content

Commit e22e0b8

Browse files
author
Max Meyers
committed
Update Podfile to support CocoaPods 1.0.
1 parent 7f195b9 commit e22e0b8

File tree

3 files changed

+83
-50
lines changed

3 files changed

+83
-50
lines changed

‎Example/FastttCamera.xcodeproj/project.pbxproj‎

Lines changed: 71 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
51862F434E7883F39F12B059 /* libPods-FastttCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0DFFC49FDE42DF3F0DC25CCE /* libPods-FastttCamera.a */; };
11-
86A312B9D5A7F65E2C40BAC6 /* libPods-FastttCameraTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 681900DCC8097FD462E46556 /* libPods-FastttCameraTests.a */; };
10+
4C919A752452D6B889592318 /* libPods-FastttCamera.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D67EFF1504E0A50EB57D1275 /* libPods-FastttCamera.a */; };
11+
DC0A33DB4A0EE2F1F41FA5B0 /* libPods-FastttCamera-FastttCameraTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F9AB7CE82B7818B5AD9623F /* libPods-FastttCamera-FastttCameraTests.a */; };
1212
FA1916571AA68D1F00C51681 /* FastttFocusSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA1916561AA68D1F00C51681 /* FastttFocusSpec.m */; };
1313
FA1916591AA68D3C00C51681 /* UIViewControllerFastttCameraSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = FA1916581AA68D3C00C51681 /* UIViewControllerFastttCameraSpec.m */; };
1414
FA28C5441A9BB488009DBB83 /* FastttCameraTest.png in Resources */ = {isa = PBXBuildFile; fileRef = FA28C5411A9BB488009DBB83 /* FastttCameraTest.png */; };
@@ -42,12 +42,12 @@
4242
/* End PBXContainerItemProxy section */
4343

4444
/* Begin PBXFileReference section */
45-
0DFFC49FDE42DF3F0DC25CCE /* libPods-FastttCamera.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCamera.a"; sourceTree = BUILT_PRODUCTS_DIR; };
46-
48AF9CCB180708078DE6E516 /* Pods-FastttCameraTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCameraTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCameraTests/Pods-FastttCameraTests.debug.xcconfig"; sourceTree = "<group>"; };
47-
5141270C1ECE47804F132180 /* Pods-FastttCameraTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCameraTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCameraTests/Pods-FastttCameraTests.release.xcconfig"; sourceTree = "<group>"; };
48-
681900DCC8097FD462E46556 /* libPods-FastttCameraTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCameraTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
49-
78E1CD45A5522076D78AA110 /* Pods-FastttCamera.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.debug.xcconfig"; sourceTree = "<group>"; };
50-
9E06B3209BE8DAEF88292AE7 /* Pods-FastttCamera.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.release.xcconfig"; sourceTree = "<group>"; };
45+
027C9048D236E26032130398 /* Pods-FastttCamera.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.debug.xcconfig"; sourceTree = "<group>"; };
46+
6F9AB7CE82B7818B5AD9623F /* libPods-FastttCamera-FastttCameraTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCamera-FastttCameraTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
47+
B34120259D718FF104495E4E /* Pods-FastttCamera-FastttCameraTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera-FastttCameraTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests.release.xcconfig"; sourceTree = "<group>"; };
48+
B382500DAE4F9FCE2C3784FD /* Pods-FastttCamera.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera.release.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera.release.xcconfig"; sourceTree = "<group>"; };
49+
D67EFF1504E0A50EB57D1275 /* libPods-FastttCamera.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FastttCamera.a"; sourceTree = BUILT_PRODUCTS_DIR; };
50+
E067B6C029ECAA7B4C5AE191 /* Pods-FastttCamera-FastttCameraTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FastttCamera-FastttCameraTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests.debug.xcconfig"; sourceTree = "<group>"; };
5151
FA1916561AA68D1F00C51681 /* FastttFocusSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FastttFocusSpec.m; sourceTree = "<group>"; };
5252
FA1916581AA68D3C00C51681 /* UIViewControllerFastttCameraSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIViewControllerFastttCameraSpec.m; sourceTree = "<group>"; };
5353
FA28C5411A9BB488009DBB83 /* FastttCameraTest.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FastttCameraTest.png; sourceTree = "<group>"; };
@@ -85,40 +85,40 @@
8585
buildActionMask = 2147483647;
8686
files = (
8787
FA574BD21A8991270061849B /* Accelerate.framework in Frameworks */,
88-
51862F434E7883F39F12B059 /* libPods-FastttCamera.a in Frameworks */,
88+
4C919A752452D6B889592318 /* libPods-FastttCamera.a in Frameworks */,
8989
);
9090
runOnlyForDeploymentPostprocessing = 0;
9191
};
9292
FAC389A91A8928440005EFDD /* Frameworks */ = {
9393
isa = PBXFrameworksBuildPhase;
9494
buildActionMask = 2147483647;
9595
files = (
96-
86A312B9D5A7F65E2C40BAC6 /* libPods-FastttCameraTests.a in Frameworks */,
96+
DC0A33DB4A0EE2F1F41FA5B0 /* libPods-FastttCamera-FastttCameraTests.a in Frameworks */,
9797
);
9898
runOnlyForDeploymentPostprocessing = 0;
9999
};
100100
/* End PBXFrameworksBuildPhase section */
101101

102102
/* Begin PBXGroup section */
103-
0839C141103D606E86EDEFE0 /* Pods */ = {
103+
4B6C9BACA635F1867D2C649C /* Frameworks */ = {
104104
isa = PBXGroup;
105105
children = (
106-
78E1CD45A5522076D78AA110 /* Pods-FastttCamera.debug.xcconfig */,
107-
9E06B3209BE8DAEF88292AE7 /* Pods-FastttCamera.release.xcconfig */,
108-
48AF9CCB180708078DE6E516 /* Pods-FastttCameraTests.debug.xcconfig */,
109-
5141270C1ECE47804F132180 /* Pods-FastttCameraTests.release.xcconfig */,
106+
FA574BD11A8991270061849B /* Accelerate.framework */,
107+
D67EFF1504E0A50EB57D1275 /* libPods-FastttCamera.a */,
108+
6F9AB7CE82B7818B5AD9623F /* libPods-FastttCamera-FastttCameraTests.a */,
110109
);
111-
name = Pods;
110+
name = Frameworks;
112111
sourceTree = "<group>";
113112
};
114-
4B6C9BACA635F1867D2C649C /* Frameworks */ = {
113+
A440DF1F3DF4372C8BEB1822 /* Pods */ = {
115114
isa = PBXGroup;
116115
children = (
117-
FA574BD11A8991270061849B /* Accelerate.framework */,
118-
0DFFC49FDE42DF3F0DC25CCE /* libPods-FastttCamera.a */,
119-
681900DCC8097FD462E46556 /* libPods-FastttCameraTests.a */,
116+
027C9048D236E26032130398 /* Pods-FastttCamera.debug.xcconfig */,
117+
B382500DAE4F9FCE2C3784FD /* Pods-FastttCamera.release.xcconfig */,
118+
E067B6C029ECAA7B4C5AE191 /* Pods-FastttCamera-FastttCameraTests.debug.xcconfig */,
119+
B34120259D718FF104495E4E /* Pods-FastttCamera-FastttCameraTests.release.xcconfig */,
120120
);
121-
name = Frameworks;
121+
name = Pods;
122122
sourceTree = "<group>";
123123
};
124124
FA28C5401A9BB488009DBB83 /* Test Images */ = {
@@ -138,8 +138,8 @@
138138
FAC389951A8928440005EFDD /* Example */,
139139
FAC389AF1A8928440005EFDD /* FastttCameraTests */,
140140
FAC389941A8928440005EFDD /* Products */,
141-
0839C141103D606E86EDEFE0 /* Pods */,
142141
4B6C9BACA635F1867D2C649C /* Frameworks */,
142+
A440DF1F3DF4372C8BEB1822 /* Pods */,
143143
);
144144
sourceTree = "<group>";
145145
};
@@ -212,11 +212,12 @@
212212
isa = PBXNativeTarget;
213213
buildConfigurationList = FAC389B61A8928440005EFDD /* Build configuration list for PBXNativeTarget "FastttCamera" */;
214214
buildPhases = (
215-
FE4976FB8F98C95B28CCECC1 /* Check Pods Manifest.lock */,
215+
A523EB39C390B0E416B33C5E /* 📦 Check Pods Manifest.lock */,
216216
FAC3898F1A8928440005EFDD /* Sources */,
217217
FAC389901A8928440005EFDD /* Frameworks */,
218218
FAC389911A8928440005EFDD /* Resources */,
219-
1168D0FD6A65C88D5D995162 /* Copy Pods Resources */,
219+
6DDD63F078028E0F3152F696 /* 📦 Embed Pods Frameworks */,
220+
0C722632AE5B4ADF4323027F /* 📦 Copy Pods Resources */,
220221
);
221222
buildRules = (
222223
);
@@ -231,11 +232,12 @@
231232
isa = PBXNativeTarget;
232233
buildConfigurationList = FAC389B91A8928440005EFDD /* Build configuration list for PBXNativeTarget "FastttCameraTests" */;
233234
buildPhases = (
234-
6758E4F8109EFADAED29F515 /* Check Pods Manifest.lock */,
235+
85418A2F1F4A10F69A7359CF /* 📦 Check Pods Manifest.lock */,
235236
FAC389A81A8928440005EFDD /* Sources */,
236237
FAC389A91A8928440005EFDD /* Frameworks */,
237238
FAC389AA1A8928440005EFDD /* Resources */,
238-
1EFFADC47AB10325E84178B2 /* Copy Pods Resources */,
239+
48EDCB104F0C53B3DD9BD263 /* 📦 Embed Pods Frameworks */,
240+
A658D0FD67F6FCC2199E491E /* 📦 Copy Pods Resources */,
239241
);
240242
buildRules = (
241243
);
@@ -307,66 +309,96 @@
307309
/* End PBXResourcesBuildPhase section */
308310

309311
/* Begin PBXShellScriptBuildPhase section */
310-
1168D0FD6A65C88D5D995162 /* Copy Pods Resources */ = {
312+
0C722632AE5B4ADF4323027F /* 📦 Copy Pods Resources */ = {
311313
isa = PBXShellScriptBuildPhase;
312314
buildActionMask = 2147483647;
313315
files = (
314316
);
315317
inputPaths = (
316318
);
317-
name = "Copy Pods Resources";
319+
name = "📦 Copy Pods Resources";
318320
outputPaths = (
319321
);
320322
runOnlyForDeploymentPostprocessing = 0;
321323
shellPath = /bin/sh;
322324
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera-resources.sh\"\n";
323325
showEnvVarsInLog = 0;
324326
};
325-
1EFFADC47AB10325E84178B2 /* Copy Pods Resources */ = {
327+
48EDCB104F0C53B3DD9BD263 /* 📦 Embed Pods Frameworks */ = {
328+
isa = PBXShellScriptBuildPhase;
329+
buildActionMask = 2147483647;
330+
files = (
331+
);
332+
inputPaths = (
333+
);
334+
name = "📦 Embed Pods Frameworks";
335+
outputPaths = (
336+
);
337+
runOnlyForDeploymentPostprocessing = 0;
338+
shellPath = /bin/sh;
339+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests-frameworks.sh\"\n";
340+
showEnvVarsInLog = 0;
341+
};
342+
6DDD63F078028E0F3152F696 /* 📦 Embed Pods Frameworks */ = {
326343
isa = PBXShellScriptBuildPhase;
327344
buildActionMask = 2147483647;
328345
files = (
329346
);
330347
inputPaths = (
331348
);
332-
name = "Copy Pods Resources";
349+
name = "📦 Embed Pods Frameworks";
333350
outputPaths = (
334351
);
335352
runOnlyForDeploymentPostprocessing = 0;
336353
shellPath = /bin/sh;
337-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCameraTests/Pods-FastttCameraTests-resources.sh\"\n";
354+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera/Pods-FastttCamera-frameworks.sh\"\n";
338355
showEnvVarsInLog = 0;
339356
};
340-
6758E4F8109EFADAED29F515 /* Check Pods Manifest.lock */ = {
357+
85418A2F1F4A10F69A7359CF /* 📦 Check Pods Manifest.lock */ = {
341358
isa = PBXShellScriptBuildPhase;
342359
buildActionMask = 2147483647;
343360
files = (
344361
);
345362
inputPaths = (
346363
);
347-
name = "Check Pods Manifest.lock";
364+
name = "📦 Check Pods Manifest.lock";
348365
outputPaths = (
349366
);
350367
runOnlyForDeploymentPostprocessing = 0;
351368
shellPath = /bin/sh;
352369
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
353370
showEnvVarsInLog = 0;
354371
};
355-
FE4976FB8F98C95B28CCECC1 /* Check Pods Manifest.lock */ = {
372+
A523EB39C390B0E416B33C5E /* 📦 Check Pods Manifest.lock */ = {
356373
isa = PBXShellScriptBuildPhase;
357374
buildActionMask = 2147483647;
358375
files = (
359376
);
360377
inputPaths = (
361378
);
362-
name = "Check Pods Manifest.lock";
379+
name = "📦 Check Pods Manifest.lock";
363380
outputPaths = (
364381
);
365382
runOnlyForDeploymentPostprocessing = 0;
366383
shellPath = /bin/sh;
367384
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
368385
showEnvVarsInLog = 0;
369386
};
387+
A658D0FD67F6FCC2199E491E /* 📦 Copy Pods Resources */ = {
388+
isa = PBXShellScriptBuildPhase;
389+
buildActionMask = 2147483647;
390+
files = (
391+
);
392+
inputPaths = (
393+
);
394+
name = "📦 Copy Pods Resources";
395+
outputPaths = (
396+
);
397+
runOnlyForDeploymentPostprocessing = 0;
398+
shellPath = /bin/sh;
399+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FastttCamera-FastttCameraTests/Pods-FastttCamera-FastttCameraTests-resources.sh\"\n";
400+
showEnvVarsInLog = 0;
401+
};
370402
/* End PBXShellScriptBuildPhase section */
371403

372404
/* Begin PBXSourcesBuildPhase section */
@@ -491,7 +523,7 @@
491523
};
492524
FAC389B71A8928440005EFDD /* Debug */ = {
493525
isa = XCBuildConfiguration;
494-
baseConfigurationReference = 78E1CD45A5522076D78AA110 /* Pods-FastttCamera.debug.xcconfig */;
526+
baseConfigurationReference = 027C9048D236E26032130398 /* Pods-FastttCamera.debug.xcconfig */;
495527
buildSettings = {
496528
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
497529
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -535,7 +567,7 @@
535567
};
536568
FAC389B81A8928440005EFDD /* Release */ = {
537569
isa = XCBuildConfiguration;
538-
baseConfigurationReference = 9E06B3209BE8DAEF88292AE7 /* Pods-FastttCamera.release.xcconfig */;
570+
baseConfigurationReference = B382500DAE4F9FCE2C3784FD /* Pods-FastttCamera.release.xcconfig */;
539571
buildSettings = {
540572
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
541573
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -579,7 +611,7 @@
579611
};
580612
FAC389BA1A8928440005EFDD /* Debug */ = {
581613
isa = XCBuildConfiguration;
582-
baseConfigurationReference = 48AF9CCB180708078DE6E516 /* Pods-FastttCameraTests.debug.xcconfig */;
614+
baseConfigurationReference = E067B6C029ECAA7B4C5AE191 /* Pods-FastttCamera-FastttCameraTests.debug.xcconfig */;
583615
buildSettings = {
584616
BUNDLE_LOADER = "$(TEST_HOST)";
585617
FRAMEWORK_SEARCH_PATHS = (
@@ -599,7 +631,7 @@
599631
};
600632
FAC389BB1A8928440005EFDD /* Release */ = {
601633
isa = XCBuildConfiguration;
602-
baseConfigurationReference = 5141270C1ECE47804F132180 /* Pods-FastttCameraTests.release.xcconfig */;
634+
baseConfigurationReference = B34120259D718FF104495E4E /* Pods-FastttCamera-FastttCameraTests.release.xcconfig */;
603635
buildSettings = {
604636
BUNDLE_LOADER = "$(TEST_HOST)";
605637
FRAMEWORK_SEARCH_PATHS = (

‎Example/Podfile‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22

3-
xcodeproj 'FastttCamera'
3+
project 'FastttCamera'
44

55
platform :ios, '7.0'
66

@@ -9,14 +9,13 @@ def install_pods
99
pod 'Masonry', '0.6.1'
1010
end
1111

12-
target 'FastttCamera', :exclusive => true do
12+
target 'FastttCamera' do
1313
install_pods
14-
end
1514

16-
target 'FastttCameraTests', :exclusive => true do
17-
install_pods
18-
pod 'Specta'
19-
pod 'Expecta'
20-
pod 'Expecta+Snapshots'
21-
pod 'OCMock'
15+
target 'FastttCameraTests' do
16+
pod 'Specta'
17+
pod 'Expecta'
18+
pod 'Expecta+Snapshots'
19+
pod 'OCMock'
20+
end
2221
end

‎Example/Podfile.lock‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DEPENDENCIES:
2121

2222
EXTERNAL SOURCES:
2323
FastttCamera:
24-
:path: ../FastttCamera.podspec
24+
:path: "../FastttCamera.podspec"
2525

2626
SPEC CHECKSUMS:
2727
Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15
@@ -32,4 +32,6 @@ SPEC CHECKSUMS:
3232
OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
3333
Specta: 69bb134672aae190a1379ff91df07dad8dd1f869
3434

35-
COCOAPODS: 0.38.2
35+
PODFILE CHECKSUM: 8b803b068d0f7869491602ceaa035cda38f4a00b
36+
37+
COCOAPODS: 1.0.0

0 commit comments

Comments
 (0)