Skip to content

Commit

Permalink
Move to using frameworks for pods
Browse files Browse the repository at this point in the history
  • Loading branch information
nickai committed Jan 18, 2016
1 parent 875ef77 commit b2d36ea
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 34 deletions.
5 changes: 3 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pod 'AFNetworking'
pod 'BDBOAuth1Manager'
use_frameworks!

pod 'AFNetworking', '~> 2.5'
pod 'BDBOAuth1Manager'
30 changes: 15 additions & 15 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
PODS:
- AFNetworking (2.6.1):
- AFNetworking/NSURLConnection (= 2.6.1)
- AFNetworking/NSURLSession (= 2.6.1)
- AFNetworking/Reachability (= 2.6.1)
- AFNetworking/Security (= 2.6.1)
- AFNetworking/Serialization (= 2.6.1)
- AFNetworking/UIKit (= 2.6.1)
- AFNetworking/NSURLConnection (2.6.1):
- AFNetworking (2.6.3):
- AFNetworking/NSURLConnection (= 2.6.3)
- AFNetworking/NSURLSession (= 2.6.3)
- AFNetworking/Reachability (= 2.6.3)
- AFNetworking/Security (= 2.6.3)
- AFNetworking/Serialization (= 2.6.3)
- AFNetworking/UIKit (= 2.6.3)
- AFNetworking/NSURLConnection (2.6.3):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/NSURLSession (2.6.1):
- AFNetworking/NSURLSession (2.6.3):
- AFNetworking/Reachability
- AFNetworking/Security
- AFNetworking/Serialization
- AFNetworking/Reachability (2.6.1)
- AFNetworking/Security (2.6.1)
- AFNetworking/Serialization (2.6.1)
- AFNetworking/UIKit (2.6.1):
- AFNetworking/Reachability (2.6.3)
- AFNetworking/Security (2.6.3)
- AFNetworking/Serialization (2.6.3)
- AFNetworking/UIKit (2.6.3):
- AFNetworking/NSURLConnection
- AFNetworking/NSURLSession
- BDBOAuth1Manager (1.6.0):
- AFNetworking/NSURLConnection (~> 2.6.0)
- AFNetworking/NSURLSession (~> 2.6.0)

DEPENDENCIES:
- AFNetworking
- AFNetworking (~> 2.5)
- BDBOAuth1Manager

SPEC CHECKSUMS:
AFNetworking: 8e4e60500beb8bec644cf575beee72990a76d399
AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
BDBOAuth1Manager: cd5a5872f355ca38180d52ca2dd844f0b0c84797

COCOAPODS: 0.39.0
14 changes: 6 additions & 8 deletions Yelp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
03D1A025B413415787AD3DF3 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C56EF0CE844A4EE5819C72AF /* libPods.a */; };
222D8A5B19CCF9F900D2DB53 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 222D8A5A19CCF9F900D2DB53 /* AppDelegate.swift */; };
222D8A6019CCF9F900D2DB53 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 222D8A5E19CCF9F900D2DB53 /* Main.storyboard */; };
222D8A6219CCF9F900D2DB53 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 222D8A6119CCF9F900D2DB53 /* Images.xcassets */; };
Expand All @@ -16,6 +15,7 @@
222D8A7D19CCFAE000D2DB53 /* YelpClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 222D8A7C19CCFAE000D2DB53 /* YelpClient.swift */; };
22AAAA991AEA0A9700A544AF /* Business.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22AAAA981AEA0A9700A544AF /* Business.swift */; };
22AAAA9C1AEA1EC300A544AF /* BusinessesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22AAAA9B1AEA1EC300A544AF /* BusinessesViewController.swift */; };
90B718C590BD546DEFEF0D61 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA3C5CF4FD317D72ABE2AAC4 /* Pods.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -39,20 +39,19 @@
222D8A6F19CCF9F900D2DB53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
222D8A7019CCF9F900D2DB53 /* YelpTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YelpTests.swift; sourceTree = "<group>"; };
222D8A7C19CCFAE000D2DB53 /* YelpClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YelpClient.swift; sourceTree = "<group>"; };
222D8A7E19CCFAEF00D2DB53 /* Yelp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Yelp-Bridging-Header.h"; sourceTree = "<group>"; };
22AAAA981AEA0A9700A544AF /* Business.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Business.swift; sourceTree = "<group>"; };
22AAAA9B1AEA1EC300A544AF /* BusinessesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BusinessesViewController.swift; sourceTree = "<group>"; };
97D8B2E3FFD1AF4F4A707E47 /* 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>"; };
AA3C5CF4FD317D72ABE2AAC4 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
BBD540129B10DFE60E8C24E2 /* 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>"; };
C56EF0CE844A4EE5819C72AF /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
222D8A5219CCF9F900D2DB53 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
03D1A025B413415787AD3DF3 /* libPods.a in Frameworks */,
90B718C590BD546DEFEF0D61 /* Pods.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -97,7 +96,6 @@
222D8A6119CCF9F900D2DB53 /* Images.xcassets */,
222D8A6319CCF9F900D2DB53 /* LaunchScreen.xib */,
222D8A5819CCF9F900D2DB53 /* Supporting Files */,
222D8A7E19CCFAEF00D2DB53 /* Yelp-Bridging-Header.h */,
);
path = Yelp;
sourceTree = "<group>";
Expand Down Expand Up @@ -154,7 +152,7 @@
4A7CA25ACD374CA0AC966A24 /* Frameworks */ = {
isa = PBXGroup;
children = (
C56EF0CE844A4EE5819C72AF /* libPods.a */,
AA3C5CF4FD317D72ABE2AAC4 /* Pods.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -454,7 +452,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.codepath.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Yelp/Yelp-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
Expand All @@ -469,7 +467,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.codepath.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Yelp/Yelp-Bridging-Header.h";
SWIFT_OBJC_BRIDGING_HEADER = "";
};
name = Release;
};
Expand Down
11 changes: 10 additions & 1 deletion Yelp.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions Yelp/Yelp-Bridging-Header.h

This file was deleted.

5 changes: 4 additions & 1 deletion Yelp/YelpClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

import UIKit

import AFNetworking
import BDBOAuth1Manager

// You can register for Yelp API keys here: http://www.yelp.com/developers/manage_api_keys
let yelpConsumerKey = "vxKwwcR_NMQ7WaEiQBK_CA"
let yelpConsumerSecret = "33QCvh5bIF5jIHR5klQr7RtBDhQ"
Expand Down Expand Up @@ -77,7 +80,7 @@ class YelpClient: BDBOAuth1RequestOperationManager {
if dictionaries != nil {
completion(Business.businesses(array: dictionaries!), nil)
}
}, failure: { (operation: AFHTTPRequestOperation!, error: NSError!) -> Void in
}, failure: { (operation: AFHTTPRequestOperation?, error: NSError!) -> Void in
completion(nil, error)
})!
}
Expand Down

0 comments on commit b2d36ea

Please sign in to comment.