Permalink
Browse files

Change framework name from FBiOSSDK to FacebookSDK

Summary:
Changed framework name from FBiOSSDK to FacebookSDK in the build scripts and sample apps.
FBiOSSDKResources.bundle was also renamed to FacebookSDKResources.bundle, updated those references.

Test Plan:
- Ran samples
- Ran unit tests

Reviewers: jacl, mmarucheck, gregschechte, clang

Reviewed By: jacl

CC: msdkexp@, platform-diffs@lists, security-diffs@lists, yariv, bhiller, scottg

Differential Revision: https://phabricator.fb.com/D514982

Task ID: 1167996
  • Loading branch information...
aydenw
aydenw committed Jul 9, 2012
1 parent 6192c59 commit 889130228e528622c06ee743b05bbbf70fa0a720
Showing with 183 additions and 184 deletions.
  1. +4 −4 samples/BooleanOGSample/BooleanOGSample.xcodeproj/project.pbxproj
  2. +1 −1 samples/BooleanOGSample/BooleanOGSample/BOGAppDelegate.h
  3. +1 −1 samples/BooleanOGSample/BooleanOGSample/BOGFirstViewController.m
  4. +1 −1 samples/BooleanOGSample/BooleanOGSample/BOGSecondViewController.h
  5. +1 −1 samples/BooleanOGSample/BooleanOGSample/OGProtocols.h
  6. +8 −8 samples/FriendPickerSample/FriendPickerSample.xcodeproj/project.pbxproj
  7. +1 −1 samples/FriendPickerSample/FriendPickerSample/FPAppDelegate.h
  8. +72 −72 samples/Hackbook/Hackbook.xcodeproj/project.pbxproj
  9. +8 −8 samples/HelloFacebookSample/HelloFacebookSample.xcodeproj/project.pbxproj
  10. +1 −1 samples/HelloFacebookSample/HelloFacebookSample/HFAppDelegate.h
  11. +1 −1 samples/HelloFacebookSample/HelloFacebookSample/HFAppDelegate.m
  12. +1 −1 samples/HelloFacebookSample/HelloFacebookSample/HFViewController.m
  13. +4 −4 samples/JustLoginSample/JustLoginSample.xcodeproj/project.pbxproj
  14. +1 −1 samples/JustLoginSample/JustLoginSample/JLAppDelegate.h
  15. +4 −4 samples/JustRequestSample/JustRequestSample.xcodeproj/project.pbxproj
  16. +1 −1 samples/JustRequestSample/JustRequestSample/JRAppDelegate.m
  17. +1 −1 samples/JustRequestSample/JustRequestSample/JRViewController.m
  18. +1 −2 samples/JustRequestSample/JustRequestSample/JustRequestSample-Prefix.pch
  19. +8 −8 samples/PlacePickerSample/PlacePickerSample.xcodeproj/project.pbxproj
  20. +1 −1 samples/PlacePickerSample/PlacePickerSample/PPAppDelegate.h
  21. +1 −1 samples/PlacePickerSample/PlacePickerSample/PPViewController.h
  22. +1 −1 samples/PlacePickerSample/PlacePickerSample/PPViewController.m
  23. +10 −10 samples/ProfilePictureSample/ProfilePictureSample.xcodeproj/project.pbxproj
  24. +1 −1 samples/ProfilePictureSample/ProfilePictureSample/PPAppDelegate.m
  25. +1 −1 samples/ProfilePictureSample/ProfilePictureSample/PPViewController.h
  26. +10 −10 samples/Scrumptious/Scrumptious.xcodeproj/project.pbxproj
  27. +1 −1 samples/Scrumptious/scrumptious/SCAppDelegate.m
  28. +1 −1 samples/Scrumptious/scrumptious/SCProtocols.h
  29. +2 −2 samples/Scrumptious/scrumptious/SCViewController.m
  30. +8 −8 samples/SwitchUserSample/SwitchUserSample.xcodeproj/project.pbxproj
  31. +1 −1 samples/SwitchUserSample/SwitchUserSample/SUAppDelegate.h
  32. +1 −1 samples/SwitchUserSample/SwitchUserSample/SUProfileTableViewCell.m
  33. +1 −1 samples/SwitchUserSample/SwitchUserSample/SUSettingsViewController.m
  34. +1 −1 samples/SwitchUserSample/SwitchUserSample/SUUserManager.h
  35. +2 −2 samples/SwitchUserSample/SwitchUserSample/SUUserManager.m
  36. +1 −1 samples/SwitchUserSample/SwitchUserSample/SUUsingViewController.m
  37. +1 −1 scripts/build_all.sh
  38. +3 −3 scripts/build_distribution.sh
  39. +5 −5 scripts/build_framework.sh
  40. +1 −1 scripts/common.sh
  41. +1 −1 src/FBDialog.m
  42. +1 −1 src/FBFriendPickerViewController.m
  43. +2 −2 src/FBLoginView.m
  44. +1 −1 src/FBPlacePickerViewController.m
  45. +1 −1 src/FBProfilePictureView.m
  46. BIN src/{FBiOSSDKResources.bundle → FacebookSDKResources.bundle}/FBDialog/images/close.png
  47. BIN src/{FBiOSSDKResources.bundle → FacebookSDKResources.bundle}/FBDialog/images/close@2x.png
  48. BIN src/{FBiOSSDKResources.bundle → FacebookSDKResources.bundle}/FBDialog/images/fbicon.png
  49. BIN src/{FBiOSSDKResources.bundle → FacebookSDKResources.bundle}/FBFriendPickerView/images/default.png
  50. BIN src/{FBiOSSDKResources.bundle → FacebookSDKResources.bundle}/FBLoginView/images/bluetint.png
  51. BIN src/{FBiOSSDKResources.bundle → FacebookSDKResources.bundle}/FBLoginView/images/f_logo.png
  52. BIN ...SSDKResources.bundle → FacebookSDKResources.bundle}/FBPlacePickerView/images/fb_generic_place.png
  53. BIN ...s.bundle → FacebookSDKResources.bundle}/FBProfilePictureView/images/fb_blank_profile_portrait.png
  54. BIN ...ces.bundle → FacebookSDKResources.bundle}/FBProfilePictureView/images/fb_blank_profile_square.png
  55. +2 −2 src/facebook-ios-sdk.xcodeproj/project.pbxproj
  56. +1 −1 src/tests/FBOpenGraphActionTests.m
@@ -23,12 +23,12 @@
84070D3F1540AA2B00E39703 /* BOGFirstViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84070D3D1540AA2B00E39703 /* BOGFirstViewController_iPad.xib */; };
84070D421540AA2B00E39703 /* BOGSecondViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84070D401540AA2B00E39703 /* BOGSecondViewController_iPhone.xib */; };
84070D451540AA2B00E39703 /* BOGSecondViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84070D431540AA2B00E39703 /* BOGSecondViewController_iPad.xib */; };
- 840969421540C66400479AD9 /* FBiOSSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 840969411540C66400479AD9 /* FBiOSSDK.framework */; };
84605AB615A77C9300197AA7 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84605AB515A77C9300197AA7 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
85AFB4CA158F9B8B000AF7F5 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C6158F9B8B000AF7F5 /* Icon-72.png */; };
85AFB4CB158F9B8B000AF7F5 /* Icon-72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C7158F9B8B000AF7F5 /* Icon-72@2x.png */; };
85AFB4CC158F9B8B000AF7F5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C8158F9B8B000AF7F5 /* Icon.png */; };
85AFB4CD158F9B8B000AF7F5 /* Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 85AFB4C9158F9B8B000AF7F5 /* Icon@2x.png */; };
+ DD37EA7F15ABA42D0015966B /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD37EA7E15ABA42D0015966B /* FacebookSDK.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -54,13 +54,13 @@
84070D3E1540AA2B00E39703 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/BOGFirstViewController_iPad.xib; sourceTree = "<group>"; };
84070D411540AA2B00E39703 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/BOGSecondViewController_iPhone.xib; sourceTree = "<group>"; };
84070D441540AA2B00E39703 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/BOGSecondViewController_iPad.xib; sourceTree = "<group>"; };
- 840969411540C66400479AD9 /* FBiOSSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBiOSSDK.framework; path = ../../build/FBiOSSDK.framework; sourceTree = "<group>"; };
8409694E1545D10B00479AD9 /* OGProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OGProtocols.h; sourceTree = "<group>"; };
84605AB515A77C9300197AA7 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
85AFB4C6158F9B8B000AF7F5 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = "<group>"; };
85AFB4C7158F9B8B000AF7F5 /* Icon-72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72@2x.png"; sourceTree = "<group>"; };
85AFB4C8158F9B8B000AF7F5 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
85AFB4C9158F9B8B000AF7F5 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon@2x.png"; sourceTree = "<group>"; };
+ DD37EA7E15ABA42D0015966B /* FacebookSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FacebookSDK.framework; path = ../../build/FacebookSDK.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -72,7 +72,7 @@
84070D1B1540AA2B00E39703 /* UIKit.framework in Frameworks */,
84070D1D1540AA2B00E39703 /* Foundation.framework in Frameworks */,
84070D1F1540AA2B00E39703 /* CoreGraphics.framework in Frameworks */,
- 840969421540C66400479AD9 /* FBiOSSDK.framework in Frameworks */,
+ DD37EA7F15ABA42D0015966B /* FacebookSDK.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -99,7 +99,7 @@
84070D191540AA2B00E39703 /* Frameworks */ = {
isa = PBXGroup;
children = (
- 840969411540C66400479AD9 /* FBiOSSDK.framework */,
+ DD37EA7E15ABA42D0015966B /* FacebookSDK.framework */,
84605AB515A77C9300197AA7 /* Accounts.framework */,
84070D1A1540AA2B00E39703 /* UIKit.framework */,
84070D1C1540AA2B00E39703 /* Foundation.framework */,
@@ -15,7 +15,7 @@
*/
#import <UIKit/UIKit.h>
-#import <FBiOSSDK/FacebookSDK.h>
+#import <FacebookSDK/FacebookSDK.h>
// Boolean OG (Rock the Logic!) sample application
//
@@ -16,7 +16,7 @@
#import "BOGFirstViewController.h"
#import "BOGAppDelegate.h"
-#import <FBiOSSDK/FacebookSDK.h>
+#import <FacebookSDK/FacebookSDK.h>
#import "OGProtocols.h"
@interface BOGFirstViewController () <UIPickerViewDelegate>
@@ -15,7 +15,7 @@
*/
#import <UIKit/UIKit.h>
-#import <FBiOSSDK/FacebookSDK.h>
+#import <FacebookSDK/FacebookSDK.h>
@interface BOGSecondViewController : FBFriendPickerViewController
@@ -15,7 +15,7 @@
*/
#import <Foundation/Foundation.h>
-#import <FBiOSSDK/FacebookSDK.h>
+#import <FacebookSDK/FacebookSDK.h>
// FBSample logic
// The protocols here show how to setup typed access to graph and open graph objects.
@@ -12,7 +12,8 @@
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 */; };
- E214BA93154623E8006818DE /* FBiOSSDKResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E214BA92154623E8006818DE /* FBiOSSDKResources.bundle */; };
+ 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 */; };
E2D6B81715413A570050835F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D6B81615413A570050835F /* CoreGraphics.framework */; };
@@ -22,7 +23,6 @@
E2D6B82615413A570050835F /* FPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2D6B82515413A570050835F /* FPViewController.m */; };
E2D6B82915413A570050835F /* FPViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2D6B82715413A570050835F /* FPViewController_iPhone.xib */; };
E2D6B82C15413A570050835F /* FPViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2D6B82A15413A570050835F /* FPViewController_iPad.xib */; };
- E2D6B83915413D080050835F /* FBiOSSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2D6B83815413D070050835F /* FBiOSSDK.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -31,7 +31,8 @@
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>"; };
- E214BA92154623E8006818DE /* FBiOSSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = FBiOSSDKResources.bundle; path = ../../build/FBiOSSDK.framework/Versions/A/Resources/FBiOSSDKResources.bundle; sourceTree = "<group>"; };
+ 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; };
E2D6B81415413A570050835F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -46,7 +47,6 @@
E2D6B82515413A570050835F /* FPViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FPViewController.m; sourceTree = "<group>"; };
E2D6B82815413A570050835F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/FPViewController_iPhone.xib; sourceTree = "<group>"; };
E2D6B82B15413A570050835F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/FPViewController_iPad.xib; sourceTree = "<group>"; };
- E2D6B83815413D070050835F /* FBiOSSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBiOSSDK.framework; path = ../../build/FBiOSSDK.framework; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -55,10 +55,10 @@
buildActionMask = 2147483647;
files = (
84605AB315A77C2700197AA7 /* Accounts.framework in Frameworks */,
- E2D6B83915413D080050835F /* FBiOSSDK.framework in Frameworks */,
E2D6B81315413A570050835F /* UIKit.framework in Frameworks */,
E2D6B81515413A570050835F /* Foundation.framework in Frameworks */,
E2D6B81715413A570050835F /* CoreGraphics.framework in Frameworks */,
+ DD37EA8815ABA46B0015966B /* FacebookSDK.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -85,8 +85,8 @@
E2D6B81115413A570050835F /* Frameworks */ = {
isa = PBXGroup;
children = (
- E214BA92154623E8006818DE /* FBiOSSDKResources.bundle */,
- E2D6B83815413D070050835F /* FBiOSSDK.framework */,
+ DD37EA8515ABA4670015966B /* FacebookSDKResources.bundle */,
+ DD37EA8715ABA46B0015966B /* FacebookSDK.framework */,
84605AB215A77C2700197AA7 /* Accounts.framework */,
E2D6B81215413A570050835F /* UIKit.framework */,
E2D6B81415413A570050835F /* Foundation.framework */,
@@ -174,14 +174,14 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- E214BA93154623E8006818DE /* FBiOSSDKResources.bundle in Resources */,
E2D6B81D15413A570050835F /* InfoPlist.strings in Resources */,
E2D6B82915413A570050835F /* FPViewController_iPhone.xib in Resources */,
E2D6B82C15413A570050835F /* FPViewController_iPad.xib in Resources */,
85AFB4D7158F9C1D000AF7F5 /* Icon-72.png in Resources */,
85AFB4D8158F9C1D000AF7F5 /* Icon-72@2x.png in Resources */,
85AFB4D9158F9C1D000AF7F5 /* Icon.png in Resources */,
85AFB4DA158F9C1D000AF7F5 /* Icon@2x.png in Resources */,
+ DD37EA8615ABA4670015966B /* FacebookSDKResources.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -15,7 +15,7 @@
*/
#import <UIKit/UIKit.h>
-#import <FBiOSSDK/FacebookSDK.h>
+#import <FacebookSDK/FacebookSDK.h>
// Friend Picker sample application
//
Oops, something went wrong.

0 comments on commit 8891302

Please sign in to comment.