Skip to content

Commit

Permalink
Update demo to use use_frameworks!
Browse files Browse the repository at this point in the history
  • Loading branch information
zenangst committed May 11, 2015
1 parent 4c28933 commit f9f9e4f
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 18 deletions.
24 changes: 20 additions & 4 deletions Demos/Basic-ObjC/Basic-ObjC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
14E49C3C1A99B7D600F19988 /* camera-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 14E49C2B1A99B7D600F19988 /* camera-icon@2x.png */; };
14E49C401A99B7D600F19988 /* HYPSampleCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E49C311A99B7D600F19988 /* HYPSampleCollectionViewController.m */; };
14E49C411A99B7D600F19988 /* HYPImageFormFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 14E49C341A99B7D600F19988 /* HYPImageFormFieldCell.m */; };
1E1A35C89938DD4BA1A656D3 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 29491F317417C0D1E29829A7 /* libPods.a */; };
1E5444BD0389FFEFBB7186A2 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 45445B9B2AF71C6EB29E5561 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -31,7 +31,7 @@
14E49C331A99B7D600F19988 /* HYPImageFormFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HYPImageFormFieldCell.h; sourceTree = "<group>"; };
14E49C341A99B7D600F19988 /* HYPImageFormFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HYPImageFormFieldCell.m; sourceTree = "<group>"; };
24255EE596DCD2C0FE5C4CFB /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
29491F317417C0D1E29829A7 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
45445B9B2AF71C6EB29E5561 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5C74849DF53D9C3C7FE00770 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -40,7 +40,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1E1A35C89938DD4BA1A656D3 /* libPods.a in Frameworks */,
1E5444BD0389FFEFBB7186A2 /* Pods.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -134,7 +134,7 @@
9661221E81F7A73DE1DDD54C /* Frameworks */ = {
isa = PBXGroup;
children = (
29491F317417C0D1E29829A7 /* libPods.a */,
45445B9B2AF71C6EB29E5561 /* Pods.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -160,6 +160,7 @@
14E49BF31A99B75500F19988 /* Frameworks */,
14E49BF41A99B75500F19988 /* Resources */,
5363A2951A16517EF2EF62A6 /* Copy Pods Resources */,
5BD4AC1D4F92BDB1F7552BF0 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -246,6 +247,21 @@
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";
showEnvVarsInLog = 0;
};
5BD4AC1D4F92BDB1F7552BF0 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
2 changes: 1 addition & 1 deletion Demos/Basic-ObjC/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '7.0'
use_frameworks!

pod 'Form', path: "../../"
pod 'UIViewController-HYPKeyboardToolbar'
26 changes: 13 additions & 13 deletions Demos/Basic-ObjC/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
PODS:
- Form (3.4.0):
- Hex (~> 1.1.1)
- HYP8601 (~> 0.7.2)
- HYPImagePicker (~> 0.3)
- HYPMathParser (~> 0.4.0)
- HYPMathParser (~> 0.4.1)
- HYPNorwegianAccountNumber (~> 1.2.1)
- HYPNorwegianSSN (~> 1.10)
- ISO8601DateFormatter (~> 0.7)
- HYPNorwegianSSN (~> 1.10.2)
- NSDictionary-ANDYSafeValue (~> 0.3)
- NSDictionary-HYPNestedAttributes (~> 0.4.1)
- NSJSONSerialization-ANDYJSONFile (~> 1.1)
- NSObject-HYPTesting (~> 1.2)
- NSString-HYPContainsString (~> 0.1)
- NSString-HYPFormula (~> 1.6.1)
- NSString-HYPRelationshipParser (~> 0.4.1)
- NSString-HYPWordExtractor (~> 1.1)
- NSString-HYPWordExtractor (~> 1.2)
- NSString-ZENInflections (~> 1.2)
- UIButton-ANDYHighlighted (~> 0.2.1)
- UIViewController-HYPKeyboardToolbar (~> 0.1)
- Hex (1.1.1)
- HYP8601 (0.7.2)
- HYPImagePicker (0.3)
- HYPMathParser (0.4.0)
- HYPMathParser (0.4.1)
- HYPNorwegianAccountNumber (1.2.1)
- HYPNorwegianSSN (1.10.1)
- ISO8601DateFormatter (0.7)
- HYPNorwegianSSN (1.10.2)
- NSDictionary-ANDYSafeValue (0.3)
- NSDictionary-HYPNestedAttributes (0.4.1):
- NSString-HYPRelationshipParser (~> 0.4.1)
Expand All @@ -43,16 +43,16 @@ DEPENDENCIES:

EXTERNAL SOURCES:
Form:
:path: ../../
:path: "../../"

SPEC CHECKSUMS:
Form: 95b18c872ca40ecdadbde38ebded2cd41c50b520
Form: 2a2f9ed0ee19f7b153b9b5a8bcf19811d028b847
Hex: acf6d0dc34658d3d44047a992bfd09190c87e6e7
HYP8601: 0118757c1332620748c75e7218e7b6b849686d06
HYPImagePicker: 5c6e463ec15ae6b647355eb11f3f310342616fbf
HYPMathParser: 234475b2d424fc9cc5a17bd2fef7b73e1c03dfd3
HYPMathParser: 146a4981427a0b46cc9af823b210bfefdf0a7107
HYPNorwegianAccountNumber: b0062d7419d217123dff0ef04f1931ed5f1e3bbf
HYPNorwegianSSN: 75e8b512f5a7be80dad61c3ba26494a5459a5b7a
ISO8601DateFormatter: ab926648eebe497f4d167c0fd083992f959f1274
HYPNorwegianSSN: 1eb54f1488ac24cdd7d0aee34e10d0f826c27fc1
NSDictionary-ANDYSafeValue: c15ff39a6b1b82a52ea277c64520c7b574715afc
NSDictionary-HYPNestedAttributes: 783d3adcf9f8e9a554004ee225f1bc0cdf0cfdfe
NSJSONSerialization-ANDYJSONFile: 4a92ca174d5ccde13015e853e9eb62440459b478
Expand All @@ -65,4 +65,4 @@ SPEC CHECKSUMS:
UIButton-ANDYHighlighted: 3f5e9fb68fb3425bd9fddc030af452d3ac9d1613
UIViewController-HYPKeyboardToolbar: d5cb85447caeaf9e0e7ed575ce3b1576c7d53dd8

COCOAPODS: 0.37.0
COCOAPODS: 0.37.1

0 comments on commit f9f9e4f

Please sign in to comment.