Skip to content

Commit

Permalink
Facebook iOS SDK 3.6
Browse files Browse the repository at this point in the history 
Summary:
     see https://developers.facebook.com/ios/change-log-3.x/

    Upgrading from 3.5
     https://developers.facebook.com/docs/tutorial/iossdk/upgrading-from-3.5-to-3.6

Reviewed By: jacl

Test Plan: Release Testing.
  • Loading branch information
@chrisp-fb
chrisp-fb committed Jul 24, 2013
1 parent acd4f57 commit 3ec37e0
Show file tree
Hide file tree
Showing 120 changed files with 4,291 additions and 2,386 deletions.
30 changes: 2 additions & 28 deletions samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,13 @@
objects = {

/* Begin PBXBuildFile section */
84605AB315A77C2700197AA7 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84605AB215A77C2700197AA7 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
85A928B91611462C008699F1 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85A928B81611462C008699F1 /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
85AFB4D7158F9C1D000AF7F5 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D3158F9C1D000AF7F5 /* Icon-72.png */; };
85AFB4D8158F9C1D000AF7F5 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D4158F9C1D000AF7F5 /* Icon-72@2x.png */; };
85AFB4D9158F9C1D000AF7F5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D5158F9C1D000AF7F5 /* Icon.png */; };
85AFB4DA158F9C1D000AF7F5 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4D6158F9C1D000AF7F5 /* Icon@2x.png */; };
85C69D7F1602B0AF008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D7C1602B0AF008AD9A0 /* Default-568h@2x.png */; };
85C69D801602B0AF008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D7D1602B0AF008AD9A0 /* Default.png */; };
85C69D811602B0AF008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D7E1602B0AF008AD9A0 /* Default@2x.png */; };
B59359D816D5642A000A63F0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B59359D716D5642A000A63F0 /* Security.framework */; };
B9A4167916113EAE001E7A77 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A4167816113EAE001E7A77 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
DD37EA8615ABA4670015966B /* FacebookSDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD37EA8515ABA4670015966B /* FacebookSDKResources.bundle */; };
DD37EA8815ABA46B0015966B /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD37EA8715ABA46B0015966B /* FacebookSDK.framework */; };
E2D6B81315413A570050835F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D6B81215413A570050835F /* UIKit.framework */; };
E2D6B81515413A570050835F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D6B81415413A570050835F /* Foundation.framework */; };
Expand All @@ -32,18 +27,13 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
84605AB215A77C2700197AA7 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
85A928B81611462C008699F1 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
85AFB4D3158F9C1D000AF7F5 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
85AFB4D4158F9C1D000AF7F5 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
85AFB4D5158F9C1D000AF7F5 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
85AFB4D6158F9C1D000AF7F5 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
85C69D7C1602B0AF008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D7D1602B0AF008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
85C69D7E1602B0AF008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
B59359D716D5642A000A63F0 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
B9A4167816113EAE001E7A77 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
DD37EA8515ABA4670015966B /* FacebookSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = FacebookSDKResources.bundle; path = ../../build/FacebookSDK.framework/Versions/A/Resources/FacebookSDKResources.bundle; sourceTree = "<group>"; };
DD37EA8715ABA46B0015966B /* FacebookSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookSDK.framework; path = ../../build/FacebookSDK.framework; sourceTree = "<group>"; };
E2D6B80E15413A570050835F /* FriendPickerSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FriendPickerSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
E2D6B81215413A570050835F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
Expand All @@ -66,10 +56,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B59359D816D5642A000A63F0 /* Security.framework in Frameworks */,
85A928B91611462C008699F1 /* Social.framework in Frameworks */,
B9A4167916113EAE001E7A77 /* AdSupport.framework in Frameworks */,
84605AB315A77C2700197AA7 /* Accounts.framework in Frameworks */,
E2D6B81315413A570050835F /* UIKit.framework in Frameworks */,
E2D6B81515413A570050835F /* Foundation.framework in Frameworks */,
E2D6B81715413A570050835F /* CoreGraphics.framework in Frameworks */,
Expand Down Expand Up @@ -101,11 +87,6 @@
isa = PBXGroup;
children = (
DD37EA8715ABA46B0015966B /* FacebookSDK.framework */,
B59359D716D5642A000A63F0 /* Security.framework */,
85A928B81611462C008699F1 /* Social.framework */,
B9A4167816113EAE001E7A77 /* AdSupport.framework */,
DD37EA8515ABA4670015966B /* FacebookSDKResources.bundle */,
84605AB215A77C2700197AA7 /* Accounts.framework */,
E2D6B81215413A570050835F /* UIKit.framework */,
E2D6B81415413A570050835F /* Foundation.framework */,
E2D6B81615413A570050835F /* CoreGraphics.framework */,
Expand Down Expand Up @@ -203,7 +184,6 @@
85AFB4D8158F9C1D000AF7F5 /* Icon-72@2x.png in Resources */,
85AFB4D9158F9C1D000AF7F5 /* Icon.png in Resources */,
85AFB4DA158F9C1D000AF7F5 /* Icon@2x.png in Resources */,
DD37EA8615ABA4670015966B /* FacebookSDKResources.bundle in Resources */,
85C69D7F1602B0AF008AD9A0 /* Default-568h@2x.png in Resources */,
85C69D801602B0AF008AD9A0 /* Default.png in Resources */,
85C69D811602B0AF008AD9A0 /* Default@2x.png in Resources */,
Expand Down Expand Up @@ -311,10 +291,7 @@
GCC_PREFIX_HEADER = "FriendPickerSample/FriendPickerSample-Prefix.pch";
INFOPLIST_FILE = "FriendPickerSample/FriendPickerSample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-lsqlite3.0",
"-ObjC",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand All @@ -331,10 +308,7 @@
GCC_PREFIX_HEADER = "FriendPickerSample/FriendPickerSample-Prefix.pch";
INFOPLIST_FILE = "FriendPickerSample/FriendPickerSample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-lsqlite3.0",
"-ObjC",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
};
Expand Down
1 change: 1 addition & 0 deletions samples/FriendPickerSample/FriendPickerSample/FPAppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ - (BOOL)application:(UIApplication *)application
}

- (void)applicationDidBecomeActive:(UIApplication *)application {
[FBAppEvents activateApp];
[FBAppCall handleDidBecomeActive];
}

Expand Down
26 changes: 2 additions & 24 deletions samples/GraphApiSample/GraphApiSample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@
objects = {

/* Begin PBXBuildFile section */
84605AB015A77B8600197AA7 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84605AAF15A77B8600197AA7 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
85A928CE161146AC008699F1 /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 85A928CD161146AC008699F1 /* Social.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
85AFB4FF158F9D32000AF7F5 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4FB158F9D32000AF7F5 /* Icon-72.png */; };
85AFB500158F9D32000AF7F5 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4FC158F9D32000AF7F5 /* Icon-72@2x.png */; };
85AFB501158F9D32000AF7F5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4FD158F9D32000AF7F5 /* Icon.png */; };
85AFB502158F9D32000AF7F5 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4FE158F9D32000AF7F5 /* Icon@2x.png */; };
85C69D691602B06E008AD9A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D661602B06E008AD9A0 /* Default-568h@2x.png */; };
85C69D6A1602B06E008AD9A0 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D671602B06E008AD9A0 /* Default.png */; };
85C69D6B1602B06E008AD9A0 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C69D681602B06E008AD9A0 /* Default@2x.png */; };
B59359DA16D56449000A63F0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B59359D916D56449000A63F0 /* Security.framework */; };
B9A4168E16113EE7001E7A77 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9A4168D16113EE7001E7A77 /* AdSupport.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
DDA290AD15ABA96200F533F9 /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA290AC15ABA96200F533F9 /* FacebookSDK.framework */; };
E2511742152BB6FE00CB342A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2511741152BB6FE00CB342A /* UIKit.framework */; };
E2511744152BB6FE00CB342A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2511743152BB6FE00CB342A /* Foundation.framework */; };
Expand All @@ -31,17 +27,13 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
84605AAF15A77B8600197AA7 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
85A928CD161146AC008699F1 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
85AFB4FB158F9D32000AF7F5 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
85AFB4FC158F9D32000AF7F5 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
85AFB4FD158F9D32000AF7F5 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
85AFB4FE158F9D32000AF7F5 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
85C69D661602B06E008AD9A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
85C69D671602B06E008AD9A0 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
85C69D681602B06E008AD9A0 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
B59359D916D56449000A63F0 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
B9A4168D16113EE7001E7A77 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
DDA290AC15ABA96200F533F9 /* FacebookSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookSDK.framework; path = ../../build/FacebookSDK.framework; sourceTree = "<group>"; };
E251173D152BB6FE00CB342A /* GraphApiSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GraphApiSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
E2511741152BB6FE00CB342A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
Expand All @@ -64,10 +56,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B59359DA16D56449000A63F0 /* Security.framework in Frameworks */,
85A928CE161146AC008699F1 /* Social.framework in Frameworks */,
B9A4168E16113EE7001E7A77 /* AdSupport.framework in Frameworks */,
84605AB015A77B8600197AA7 /* Accounts.framework in Frameworks */,
E2511742152BB6FE00CB342A /* UIKit.framework in Frameworks */,
E2511744152BB6FE00CB342A /* Foundation.framework in Frameworks */,
E2511746152BB6FE00CB342A /* CoreGraphics.framework in Frameworks */,
Expand Down Expand Up @@ -99,10 +87,6 @@
isa = PBXGroup;
children = (
DDA290AC15ABA96200F533F9 /* FacebookSDK.framework */,
B59359D916D56449000A63F0 /* Security.framework */,
85A928CD161146AC008699F1 /* Social.framework */,
B9A4168D16113EE7001E7A77 /* AdSupport.framework */,
84605AAF15A77B8600197AA7 /* Accounts.framework */,
E2511741152BB6FE00CB342A /* UIKit.framework */,
E2511743152BB6FE00CB342A /* Foundation.framework */,
E2511745152BB6FE00CB342A /* CoreGraphics.framework */,
Expand Down Expand Up @@ -307,10 +291,7 @@
GCC_PREFIX_HEADER = "GraphApiSample/GraphApiSample-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/GraphApiSample/GraphApiSample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-lsqlite3.0",
"-ObjC",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = GraphApiSample;
WRAPPER_EXTENSION = app;
};
Expand All @@ -329,10 +310,7 @@
GCC_PREFIX_HEADER = "GraphApiSample/GraphApiSample-Prefix.pch";
INFOPLIST_FILE = "$(SRCROOT)/GraphApiSample/GraphApiSample-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = (
"-lsqlite3.0",
"-ObjC",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = GraphApiSample;
WRAPPER_EXTENSION = app;
};
Expand Down
1 change: 1 addition & 0 deletions samples/GraphApiSample/GraphApiSample/GraphApiAppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ - (BOOL)application:(UIApplication *)application
}

- (void)applicationDidBecomeActive:(UIApplication *)application {
[FBAppEvents activateApp];
[FBAppCall handleDidBecomeActive];
}

Expand Down
Loading

0 comments on commit 3ec37e0

Please sign in to comment.