Skip to content

Commit

Permalink
switch facebook to pods and bump to version 3.19
Browse files Browse the repository at this point in the history
  • Loading branch information
alexshepard committed Oct 9, 2014
1 parent a70dfb3 commit 6da9e48
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
1 change: 1 addition & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ platform :ios, :deployment_target => '7.0'

pod 'CrashlyticsFramework', '2.2.4'
pod 'FlurrySDK', '5.4.0'
pod 'Facebook-iOS-SDK', '3.19.0'
6 changes: 6 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
PODS:
- Bolts (1.1.2)
- CrashlyticsFramework (2.2.4)
- Facebook-iOS-SDK (3.19.0):
- Bolts (~> 1.0)
- FlurrySDK (5.4.0):
- FlurrySDK/FlurrySDK
- FlurrySDK/FlurrySDK (5.4.0)

DEPENDENCIES:
- CrashlyticsFramework (= 2.2.4)
- Facebook-iOS-SDK (= 3.19.0)
- FlurrySDK (= 5.4.0)

SPEC CHECKSUMS:
Bolts: 2635e8698a630774689441047f3465d78c48d485
CrashlyticsFramework: 0c28a2c07a51b7691e6668b83824b0b0be77f307
Facebook-iOS-SDK: cb7d74759d0b1ba546e6e6f1dde407b0d4e448d6
FlurrySDK: bed9e5598353f867508d164795a451e3ada92cb6

COCOAPODS: 0.34.1
14 changes: 0 additions & 14 deletions iNaturalist.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,6 @@
19F87499152679F300A65F9A /* TaxaSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19F87498152679F100A65F9A /* TaxaSearchViewController.m */; };
19F8749B152684DF00A65F9A /* TaxonOneNameTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19F8749A152684DF00A65F9A /* TaxonOneNameTableViewCell.xib */; };
19F8749D1526850100A65F9A /* TaxonTwoNameTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19F8749C1526850100A65F9A /* TaxonTwoNameTableViewCell.xib */; };
6098FD0F16F3BD560053987E /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6098FD0E16F3BD550053987E /* FacebookSDK.framework */; };
6098FD1116F3BD980053987E /* FacebookSDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6098FD1016F3BD980053987E /* FacebookSDKResources.bundle */; };
6098FD1316F3BDC80053987E /* FBUserSettingsViewResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 6098FD1216F3BDC80053987E /* FBUserSettingsViewResources.bundle */; };
6098FD1516F3BE280053987E /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6098FD1416F3BE270053987E /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
6098FD1716F3BE4C0053987E /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6098FD1616F3BE4C0053987E /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
6098FD1916F3BE690053987E /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6098FD1816F3BE690053987E /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
6098FD7D16F3F6890053987E /* libGooglePlusUniversal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6098FD2216F3F6880053987E /* libGooglePlusUniversal.a */; };
Expand Down Expand Up @@ -834,9 +830,6 @@
22DD1D8B5E5FE5F54289AE42 /* 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>"; };
45329ED8F6D98DC739CC54AE /* 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>"; };
5FDA5EFF9EFA47B2B6919DBE /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
6098FD0E16F3BD550053987E /* FacebookSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookSDK.framework; path = Vendor/Facebook/build/FacebookSDK.framework; sourceTree = "<group>"; };
6098FD1016F3BD980053987E /* FacebookSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = FacebookSDKResources.bundle; path = Vendor/Facebook/build/FacebookSDK.framework/Versions/A/Resources/FacebookSDKResources.bundle; sourceTree = "<group>"; };
6098FD1216F3BDC80053987E /* FBUserSettingsViewResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = FBUserSettingsViewResources.bundle; path = Vendor/Facebook/build/FacebookSDK.framework/Versions/A/Resources/FBUserSettingsViewResources.bundle; sourceTree = "<group>"; };
6098FD1416F3BE270053987E /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
6098FD1616F3BE4C0053987E /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
6098FD1816F3BE690053987E /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -971,7 +964,6 @@
60A0E22916F7D1E3003621FA /* libOAuth2Client.a in Frameworks */,
6098FD1916F3BE690053987E /* Social.framework in Frameworks */,
6098FD1716F3BE4C0053987E /* Accounts.framework in Frameworks */,
6098FD1516F3BE280053987E /* AdSupport.framework in Frameworks */,
19DA9F5F161D4B5900DCCB5B /* CoreData.framework in Frameworks */,
19DA9F4C161D40A400DCCB5B /* libThree20.a in Frameworks */,
19DA9F4D161D40A400DCCB5B /* libThree20Core.a in Frameworks */,
Expand All @@ -994,7 +986,6 @@
1959CDB314EA30280036F363 /* QuartzCore.framework in Frameworks */,
1927513814E9CCC9000ABAC4 /* UIKit.framework in Frameworks */,
1927513A14E9CCC9000ABAC4 /* Foundation.framework in Frameworks */,
6098FD0F16F3BD560053987E /* FacebookSDK.framework in Frameworks */,
6098FD7D16F3F6890053987E /* libGooglePlusUniversal.a in Frameworks */,
15FD479DF25C4C90950EE4A2 /* libPods.a in Frameworks */,
);
Expand Down Expand Up @@ -1123,9 +1114,6 @@
1927513614E9CCC9000ABAC4 /* Frameworks */ = {
isa = PBXGroup;
children = (
6098FD1216F3BDC80053987E /* FBUserSettingsViewResources.bundle */,
6098FD1016F3BD980053987E /* FacebookSDKResources.bundle */,
6098FD0E16F3BD550053987E /* FacebookSDK.framework */,
6098FD1816F3BE690053987E /* Social.framework */,
6098FD1616F3BE4C0053987E /* Accounts.framework */,
6098FD1416F3BE270053987E /* AdSupport.framework */,
Expand Down Expand Up @@ -2107,8 +2095,6 @@
19E4CC3216240A5A00694E5D /* ObservationFieldValueStaticCell.xib in Resources */,
60F6CEBE16E29AD60031504A /* Localizable.strings in Resources */,
60EBAD4F16E5C65B00BFCDAF /* InfoPlist.strings in Resources */,
6098FD1116F3BD980053987E /* FacebookSDKResources.bundle in Resources */,
6098FD1316F3BDC80053987E /* FBUserSettingsViewResources.bundle in Resources */,
6098FDA416F3F6890053987E /* GTMOAuth2ViewTouch.xib in Resources */,
60A0E24316FC0B24003621FA /* GoogleIcon.png in Resources */,
60A0E24716FCBE55003621FA /* FacebookIcon.png in Resources */,
Expand Down

0 comments on commit 6da9e48

Please sign in to comment.