Merge pull request #322 from janicduplessis/master

Update iOS RN header paths
facebookarchive · Jan 9, 2017 · 1827bc4 · 1827bc4
2 parents 9b95c21 + 71a1319
commit 1827bc4
Show file tree

Hide file tree

Showing 29 changed files with 37 additions and 41 deletions.
diff --git a/ios/RCTFBSDK.xcodeproj/project.pbxproj b/ios/RCTFBSDK.xcodeproj/project.pbxproj
@@ -370,8 +370,6 @@
  HEADER_SEARCH_PATHS = (
  "$(inherited)",
  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
- "$(SRCROOT)/../../react/**",
- "${SRCROOT}/../../react-native/React/**",
  "${SRCROOT}/../../../ios/**",
  );
  IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -393,8 +391,6 @@
  HEADER_SEARCH_PATHS = (
  "$(inherited)",
  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
- "$(SRCROOT)/../../react/**",
- "${SRCROOT}/../../react-native/React/**",
  "${SRCROOT}/../../../ios/**",
  );
  IPHONEOS_DEPLOYMENT_TARGET = 8.0;

diff --git a/ios/RCTFBSDK/core/RCTConvert+FBSDKAccessToken.h b/ios/RCTFBSDK/core/RCTConvert+FBSDKAccessToken.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTConvert.h>
+#import <React/RCTConvert.h>
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 

diff --git a/ios/RCTFBSDK/core/RCTFBSDKAccessToken.h b/ios/RCTFBSDK/core/RCTFBSDKAccessToken.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 

diff --git a/ios/RCTFBSDK/core/RCTFBSDKAccessToken.m b/ios/RCTFBSDK/core/RCTFBSDKAccessToken.m
@@ -18,7 +18,7 @@
 
 #import "RCTFBSDKAccessToken.h"
 
-#import <RCTUtils.h>
+#import <React/RCTUtils.h>
 
 #import "RCTConvert+FBSDKAccessToken.h"
 

diff --git a/ios/RCTFBSDK/core/RCTFBSDKAppEvents.h b/ios/RCTFBSDK/core/RCTFBSDKAppEvents.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 

diff --git a/ios/RCTFBSDK/core/RCTFBSDKGraphRequestConnectionContainer.h b/ios/RCTFBSDK/core/RCTFBSDKGraphRequestConnectionContainer.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <Foundation/Foundation.h>

diff --git a/ios/RCTFBSDK/core/RCTFBSDKGraphRequestConnectionContainer.m b/ios/RCTFBSDK/core/RCTFBSDKGraphRequestConnectionContainer.m
@@ -18,8 +18,8 @@
 
 #import "RCTFBSDKGraphRequestConnectionContainer.h"
 
-#import <RCTConvert.h>
-#import <RCTUtils.h>
+#import <React/RCTConvert.h>
+#import <React/RCTUtils.h>
 
 #pragma mark - Helper Functions
 

diff --git a/ios/RCTFBSDK/core/RCTFBSDKGraphRequestManager.h b/ios/RCTFBSDK/core/RCTFBSDKGraphRequestManager.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 

diff --git a/ios/RCTFBSDK/core/RCTFBSDKInitializer.m b/ios/RCTFBSDK/core/RCTFBSDKInitializer.m
@@ -17,7 +17,7 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 

diff --git a/ios/RCTFBSDK/login/RCTConvert+FBSDKLogin.h b/ios/RCTFBSDK/login/RCTConvert+FBSDKLogin.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTConvert.h>
+#import <React/RCTConvert.h>
 
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 

diff --git a/ios/RCTFBSDK/login/RCTFBSDKLoginButtonManager.h b/ios/RCTFBSDK/login/RCTFBSDKLoginButtonManager.h
@@ -18,7 +18,7 @@
 
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 
-#import <RCTViewManager.h>
+#import <React/RCTViewManager.h>
 
 @interface RCTFBSDKLoginButtonManager : RCTViewManager <FBSDKLoginButtonDelegate>
 

diff --git a/ios/RCTFBSDK/login/RCTFBSDKLoginButtonManager.m b/ios/RCTFBSDK/login/RCTFBSDKLoginButtonManager.m
@@ -18,10 +18,10 @@
 
 #import "RCTFBSDKLoginButtonManager.h"
 
-#import <RCTBridge.h>
-#import <RCTEventDispatcher.h>
-#import <RCTUtils.h>
-#import <UIView+React.h>
+#import <React/RCTBridge.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/RCTUtils.h>
+#import <React/UIView+React.h>
 
 #import "RCTConvert+FBSDKLogin.h"
 

diff --git a/ios/RCTFBSDK/login/RCTFBSDKLoginManager.h b/ios/RCTFBSDK/login/RCTFBSDKLoginManager.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 @interface RCTFBSDKLoginManager : NSObject <RCTBridgeModule>
 @end
diff --git a/ios/RCTFBSDK/login/RCTFBSDKLoginManager.m b/ios/RCTFBSDK/login/RCTFBSDKLoginManager.m
@@ -18,7 +18,7 @@
 
 #import "RCTFBSDKLoginManager.h"
 
-#import <RCTUtils.h>
+#import <React/RCTUtils.h>
 
 #import "RCTConvert+FBSDKLogin.h"
 

diff --git a/ios/RCTFBSDK/share/RCTConvert+FBSDKSharingContent.h b/ios/RCTFBSDK/share/RCTConvert+FBSDKSharingContent.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTConvert.h>
+#import <React/RCTConvert.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKAppInviteDialog.h b/ios/RCTFBSDK/share/RCTFBSDKAppInviteDialog.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKAppInviteDialog.m b/ios/RCTFBSDK/share/RCTFBSDKAppInviteDialog.m
@@ -18,8 +18,8 @@
 
 #import "RCTFBSDKAppInviteDialog.h"
 
-#import <RCTConvert.h>
-#import <RCTUtils.h>
+#import <React/RCTConvert.h>
+#import <React/RCTUtils.h>
 
 @implementation RCTConvert (FBSDKAppInviteDialog)
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKGameRequestDialog.h b/ios/RCTFBSDK/share/RCTFBSDKGameRequestDialog.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKGameRequestDialog.m b/ios/RCTFBSDK/share/RCTFBSDKGameRequestDialog.m
@@ -18,8 +18,8 @@
 
 #import "RCTFBSDKGameRequestDialog.h"
 
-#import <RCTConvert.h>
-#import <RCTUtils.h>
+#import <React/RCTConvert.h>
+#import <React/RCTUtils.h>
 
 @implementation RCTConvert (FBSDKGameRequestDialog)
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKLikeControlManager.h b/ios/RCTFBSDK/share/RCTFBSDKLikeControlManager.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTViewManager.h>
+#import <React/RCTViewManager.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKLikeControlManager.m b/ios/RCTFBSDK/share/RCTFBSDKLikeControlManager.m
@@ -18,10 +18,10 @@
 
 #import "RCTFBSDKLikeControlManager.h"
 
-#import <RCTBridge.h>
-#import <RCTConvert.h>
-#import <RCTEventDispatcher.h>
-#import <UIView+React.h>
+#import <React/RCTBridge.h>
+#import <React/RCTConvert.h>
+#import <React/RCTEventDispatcher.h>
+#import <React/UIView+React.h>
 
 #import <Foundation/Foundation.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKMessageDialog.h b/ios/RCTFBSDK/share/RCTFBSDKMessageDialog.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKMessageDialog.m b/ios/RCTFBSDK/share/RCTFBSDKMessageDialog.m
@@ -18,7 +18,7 @@
 
 #import "RCTFBSDKMessageDialog.h"
 
-#import <RCTUtils.h>
+#import <React/RCTUtils.h>
 
 #import "RCTConvert+FBSDKSharingContent.h"
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKSendButtonManager.h b/ios/RCTFBSDK/share/RCTFBSDKSendButtonManager.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTViewManager.h>
+#import <React/RCTViewManager.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKShareAPI.h b/ios/RCTFBSDK/share/RCTFBSDKShareAPI.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKShareAPI.m b/ios/RCTFBSDK/share/RCTFBSDKShareAPI.m
@@ -18,7 +18,7 @@
 
 #import "RCTFBSDKShareAPI.h"
 
-#import <RCTUtils.h>
+#import <React/RCTUtils.h>
 
 #import "RCTConvert+FBSDKSharingContent.h"
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKShareButtonManager.h b/ios/RCTFBSDK/share/RCTFBSDKShareButtonManager.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTViewManager.h>
+#import <React/RCTViewManager.h>
 
 @interface RCTFBSDKShareButtonManager : RCTViewManager
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKShareDialog.h b/ios/RCTFBSDK/share/RCTFBSDKShareDialog.h
@@ -16,7 +16,7 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import <RCTBridgeModule.h>
+#import <React/RCTBridgeModule.h>
 
 #import <FBSDKShareKit/FBSDKShareKit.h>
 

diff --git a/ios/RCTFBSDK/share/RCTFBSDKShareDialog.m b/ios/RCTFBSDK/share/RCTFBSDKShareDialog.m
@@ -18,7 +18,7 @@
 
 #import "RCTFBSDKShareDialog.h"
 
-#import <RCTUtils.h>
+#import <React/RCTUtils.h>
 
 #import "RCTConvert+FBSDKSharingContent.h"