From 936d72a9c7c0ea7b5bb63e793f6b4d6f09a12474 Mon Sep 17 00:00:00 2001
From: Leland Richardson <leland.m.richardson@gmail.com>
Date: Mon, 6 Feb 2017 16:54:28 -0800
Subject: [PATCH] [Airbnb] Fix imports and private files to work with
 Swift/CocoaPods

---
 Libraries/Text/RCTTextManager.m         | 2 +-
 React.podspec                           | 2 ++
 React/Base/RCTConvert.h                 | 2 +-
 React/Base/RCTJavaScriptLoader.mm       | 4 ++--
 React/Executors/RCTJSCErrorHandling.mm  | 2 +-
 React/Executors/RCTJSCExecutor.mm       | 4 ++--
 React/Modules/RCTUIManager.m            | 2 +-
 React/Views/RCTShadowView.h             | 2 +-
 ReactCommon/jschelpers/JavaScriptCore.h | 2 +-
 9 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/RCTTextManager.m
index d5c8c86ae7c..027ef5202e8 100644
--- a/Libraries/Text/RCTTextManager.m
+++ b/Libraries/Text/RCTTextManager.m
@@ -9,7 +9,7 @@
 
 #import "RCTTextManager.h"
 
-#import <yoga/Yoga.h>
+#import <React/Yoga.h>
 #import <React/RCTAccessibilityManager.h>
 #import <React/RCTAssert.h>
 #import <React/RCTConvert.h>
diff --git a/React.podspec b/React.podspec
index b2ceca7e953..cc5d859f29a 100644
--- a/React.podspec
+++ b/React.podspec
@@ -46,12 +46,14 @@ Pod::Spec.new do |s|
 
   s.subspec 'jschelpers' do |ss|
     ss.source_files = 'ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.{cpp,h}'
+    ss.private_header_files = "ReactCommon/jschelpers/{JavaScriptCore,JSCWrapper}.h"
     ss.header_dir   = 'jschelpers'
   end
 
   s.subspec 'cxxreact' do |ss|
     ss.dependency     'React/jschelpers'
     ss.source_files = 'ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.{cpp,h}'
+    ss.private_header_files = "ReactCommon/cxxreact/{JSBundleType,oss-compat-util}.h"
     ss.header_dir   = 'cxxreact'
   end
 
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index f725092c49c..aadbb1af7b8 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -10,7 +10,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
 
-#import <yoga/Yoga.h>
+#import <React/Yoga.h>
 #import <React/RCTAnimationType.h>
 #import <React/RCTBorderStyle.h>
 #import <React/RCTDefines.h>
diff --git a/React/Base/RCTJavaScriptLoader.mm b/React/Base/RCTJavaScriptLoader.mm
index 1d0f3cdec88..c9a95f58ca4 100755
--- a/React/Base/RCTJavaScriptLoader.mm
+++ b/React/Base/RCTJavaScriptLoader.mm
@@ -11,8 +11,8 @@
 
 #import <sys/stat.h>
 
-#import <cxxreact/JSBundleType.h>
-#import <jschelpers/JavaScriptCore.h>
+#import <React/JSBundleType.h>
+#import <React/JavaScriptCore.h>
 
 #import "RCTBridge.h"
 #import "RCTConvert.h"
diff --git a/React/Executors/RCTJSCErrorHandling.mm b/React/Executors/RCTJSCErrorHandling.mm
index 21dd74b85f7..af9f5b43c9a 100644
--- a/React/Executors/RCTJSCErrorHandling.mm
+++ b/React/Executors/RCTJSCErrorHandling.mm
@@ -9,7 +9,7 @@
 
 #include "RCTJSCErrorHandling.h"
 
-#import <jschelpers/JavaScriptCore.h>
+#import <React/JavaScriptCore.h>
 
 #import "RCTAssert.h"
 #import "RCTJSStackFrame.h"
diff --git a/React/Executors/RCTJSCExecutor.mm b/React/Executors/RCTJSCExecutor.mm
index 66ad2ef8352..e126cd1fe20 100644
--- a/React/Executors/RCTJSCExecutor.mm
+++ b/React/Executors/RCTJSCExecutor.mm
@@ -17,8 +17,8 @@
 
 #import <UIKit/UIDevice.h>
 
-#import <cxxreact/JSBundleType.h>
-#import <jschelpers/JavaScriptCore.h>
+#import <React/JSBundleType.h>
+#import <React/JavaScriptCore.h>
 
 #import "JSCSamplingProfiler.h"
 #import "RCTAssert.h"
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 58ffe2985c0..e6dbe4c6116 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -11,7 +11,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-#import <yoga/Yoga.h>
+#import <React/Yoga.h>
 
 #import "RCTAccessibilityManager.h"
 #import "RCTAnimationType.h"
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index d9b5667cfc9..d9eeb729317 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -9,7 +9,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <yoga/Yoga.h>
+#import <React/Yoga.h>
 #import <React/RCTComponent.h>
 #import <React/RCTRootView.h>
 
diff --git a/ReactCommon/jschelpers/JavaScriptCore.h b/ReactCommon/jschelpers/JavaScriptCore.h
index 4d849883476..fd996051cf7 100644
--- a/ReactCommon/jschelpers/JavaScriptCore.h
+++ b/ReactCommon/jschelpers/JavaScriptCore.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <jschelpers/JSCWrapper.h>
+#include <React/JSCWrapper.h>
 
 #if defined(__APPLE__)