From 636924dd3317f2c7fadc840c7ea0c5ab7d7f5af5 Mon Sep 17 00:00:00 2001
From: Gabriel Furini <gabrielfurini@gmail.com>
Date: Thu, 12 Sep 2019 11:08:06 -0300
Subject: [PATCH 1/5] Rename Yoga imports to capital case

---
 Libraries/Text/Text/RCTTextShadowView.m               | 2 +-
 Libraries/Text/TextInput/RCTBaseTextInputShadowView.m | 2 +-
 Libraries/Text/VirtualText/RCTVirtualTextShadowView.m | 2 +-
 React/Base/RCTConvert.h                               | 2 +-
 React/Base/Surface/RCTSurfaceRootShadowView.h         | 2 +-
 React/Views/RCTLayout.h                               | 2 +-
 React/Views/RCTLayout.m                               | 2 +-
 React/Views/RCTRootShadowView.h                       | 2 +-
 React/Views/RCTShadowView+Layout.m                    | 2 +-
 React/Views/RCTShadowView.h                           | 2 +-
 React/Views/SafeAreaView/RCTSafeAreaShadowView.m      | 2 +-
 React/Views/ScrollView/RCTScrollContentShadowView.m   | 2 +-
 React/Views/UIView+React.h                            | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 1543bca7a6cd18..3d86a6f58705cf 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -10,7 +10,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import "NSTextStorage+FontScaling.h"
 #import <React/RCTTextView.h>
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index aac20ea3c6903b..019c83141bb80a 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -10,7 +10,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import "NSTextStorage+FontScaling.h"
 #import <React/RCTBaseTextInputView.h>
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
index 1326b3e2796d59..cfa697fbe6de48 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
@@ -8,7 +8,7 @@
 #import <React/RCTVirtualTextShadowView.h>
 
 #import <React/RCTShadowView+Layout.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import <React/RCTRawTextShadowView.h>
 
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index 219a06a7621829..cc3e8d195f58a8 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -14,7 +14,7 @@
 #import <React/RCTLog.h>
 #import <React/RCTPointerEvents.h>
 #import <React/RCTTextDecorationLineType.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 #if TARGET_OS_IPHONE && WEBKIT_IOS_10_APIS_AVAILABLE
 #import <WebKit/WebKit.h>
 #endif
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index c277f36e824781..61da5e139c3929 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -7,7 +7,7 @@
 
 #import <React/RCTShadowView.h>
 #import <React/RCTSurfaceRootShadowViewDelegate.h>
-#import <yoga/YGEnums.h>
+#import <Yoga/YGEnums.h>
 
 @interface RCTSurfaceRootShadowView : RCTShadowView
 
diff --git a/React/Views/RCTLayout.h b/React/Views/RCTLayout.h
index 57047b39d43edd..576edbb92c9703 100644
--- a/React/Views/RCTLayout.h
+++ b/React/Views/RCTLayout.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
index 321199f8f47f1c..31b5a282cfd7f7 100644
--- a/React/Views/RCTLayout.m
+++ b/React/Views/RCTLayout.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import "RCTAssert.h"
 #import "RCTShadowView+Layout.h"
diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h
index 775274fd253833..20265535b7138a 100644
--- a/React/Views/RCTRootShadowView.h
+++ b/React/Views/RCTRootShadowView.h
@@ -6,7 +6,7 @@
  */
 
 #import <React/RCTShadowView.h>
-#import <yoga/YGEnums.h>
+#import <Yoga/YGEnums.h>
 
 @interface RCTRootShadowView : RCTShadowView
 
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index da110cc740b7f0..ed254254cd9f1d 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -7,7 +7,7 @@
 
 #import "RCTShadowView+Layout.h"
 
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import "RCTAssert.h"
 
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 8d9828cb98a6d1..3963c034420f74 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -10,7 +10,7 @@
 #import <React/RCTComponent.h>
 #import <React/RCTLayout.h>
 #import <React/RCTRootView.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 @class RCTRootShadowView;
 @class RCTSparseArray;
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
index 52ba5f00ec9452..359be14100f613 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
@@ -8,7 +8,7 @@
 #import "RCTSafeAreaShadowView.h"
 
 #import <React/RCTAssert.h>
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import "RCTSafeAreaViewLocalData.h"
 
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.m b/React/Views/ScrollView/RCTScrollContentShadowView.m
index 16bf6147c0f3b2..733280389e47d2 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.m
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.m
@@ -7,7 +7,7 @@
 
 #import "RCTScrollContentShadowView.h"
 
-#import <yoga/Yoga.h>
+#import <Yoga/Yoga.h>
 
 #import "RCTUtils.h"
 
diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h
index 5c855acb0a6a4c..f9a6d790846d19 100644
--- a/React/Views/UIView+React.h
+++ b/React/Views/UIView+React.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
-#import <yoga/YGEnums.h>
+#import <Yoga/YGEnums.h>
 
 @class RCTShadowView;
 

From 7b96af66f06c28ba9152f4ea1d8446e53af1cd31 Mon Sep 17 00:00:00 2001
From: Gabriel Furini <gabrielfurini@gmail.com>
Date: Thu, 12 Sep 2019 12:10:32 -0300
Subject: [PATCH 2/5] Rename Yoga includes to capital case

---
 ReactCommon/yoga/yoga/Bitfield.h    | 2 +-
 ReactCommon/yoga/yoga/event/event.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactCommon/yoga/yoga/Bitfield.h b/ReactCommon/yoga/yoga/Bitfield.h
index da85a5bf345690..957f6b235b7ad6 100644
--- a/ReactCommon/yoga/yoga/Bitfield.h
+++ b/ReactCommon/yoga/yoga/Bitfield.h
@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <limits>
 #include <type_traits>
-#include <yoga/YGEnums.h>
+#include <Yoga/YGEnums.h>
 
 namespace facebook {
 namespace yoga {
diff --git a/ReactCommon/yoga/yoga/event/event.h b/ReactCommon/yoga/yoga/event/event.h
index 39b07394d3a5d1..961e202f820824 100644
--- a/ReactCommon/yoga/yoga/event/event.h
+++ b/ReactCommon/yoga/yoga/event/event.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include <vector>
 #include <array>
-#include <yoga/YGEnums.h>
+#include <Yoga/YGEnums.h>
 
 struct YGConfig;
 struct YGNode;

From a853a9839b806a1edee7e21e14ffc291f08066ce Mon Sep 17 00:00:00 2001
From: Gabriel Furini <gabrielfurini@gmail.com>
Date: Tue, 17 Sep 2019 10:26:56 -0300
Subject: [PATCH 3/5] Revert "Rename Yoga includes to capital case"

This reverts commit 7b96af66f06c28ba9152f4ea1d8446e53af1cd31.
---
 ReactCommon/yoga/yoga/Bitfield.h    | 2 +-
 ReactCommon/yoga/yoga/event/event.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactCommon/yoga/yoga/Bitfield.h b/ReactCommon/yoga/yoga/Bitfield.h
index 957f6b235b7ad6..da85a5bf345690 100644
--- a/ReactCommon/yoga/yoga/Bitfield.h
+++ b/ReactCommon/yoga/yoga/Bitfield.h
@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <limits>
 #include <type_traits>
-#include <Yoga/YGEnums.h>
+#include <yoga/YGEnums.h>
 
 namespace facebook {
 namespace yoga {
diff --git a/ReactCommon/yoga/yoga/event/event.h b/ReactCommon/yoga/yoga/event/event.h
index 961e202f820824..39b07394d3a5d1 100644
--- a/ReactCommon/yoga/yoga/event/event.h
+++ b/ReactCommon/yoga/yoga/event/event.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include <vector>
 #include <array>
-#include <Yoga/YGEnums.h>
+#include <yoga/YGEnums.h>
 
 struct YGConfig;
 struct YGNode;

From d41bd7a25444f7c3493129af3cfcbda80455ebca Mon Sep 17 00:00:00 2001
From: Gabriel Furini <gabrielfurini@gmail.com>
Date: Tue, 17 Sep 2019 10:27:10 -0300
Subject: [PATCH 4/5] Revert "Rename Yoga imports to capital case"

This reverts commit 636924dd3317f2c7fadc840c7ea0c5ab7d7f5af5.
---
 Libraries/Text/Text/RCTTextShadowView.m               | 2 +-
 Libraries/Text/TextInput/RCTBaseTextInputShadowView.m | 2 +-
 Libraries/Text/VirtualText/RCTVirtualTextShadowView.m | 2 +-
 React/Base/RCTConvert.h                               | 2 +-
 React/Base/Surface/RCTSurfaceRootShadowView.h         | 2 +-
 React/Views/RCTLayout.h                               | 2 +-
 React/Views/RCTLayout.m                               | 2 +-
 React/Views/RCTRootShadowView.h                       | 2 +-
 React/Views/RCTShadowView+Layout.m                    | 2 +-
 React/Views/RCTShadowView.h                           | 2 +-
 React/Views/SafeAreaView/RCTSafeAreaShadowView.m      | 2 +-
 React/Views/ScrollView/RCTScrollContentShadowView.m   | 2 +-
 React/Views/UIView+React.h                            | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m
index 3d86a6f58705cf..1543bca7a6cd18 100644
--- a/Libraries/Text/Text/RCTTextShadowView.m
+++ b/Libraries/Text/Text/RCTTextShadowView.m
@@ -10,7 +10,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "NSTextStorage+FontScaling.h"
 #import <React/RCTTextView.h>
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
index 019c83141bb80a..aac20ea3c6903b 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m
@@ -10,7 +10,7 @@
 #import <React/RCTBridge.h>
 #import <React/RCTShadowView+Layout.h>
 #import <React/RCTUIManager.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "NSTextStorage+FontScaling.h"
 #import <React/RCTBaseTextInputView.h>
diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
index cfa697fbe6de48..1326b3e2796d59 100644
--- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
+++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m
@@ -8,7 +8,7 @@
 #import <React/RCTVirtualTextShadowView.h>
 
 #import <React/RCTShadowView+Layout.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import <React/RCTRawTextShadowView.h>
 
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index cc3e8d195f58a8..219a06a7621829 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -14,7 +14,7 @@
 #import <React/RCTLog.h>
 #import <React/RCTPointerEvents.h>
 #import <React/RCTTextDecorationLineType.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 #if TARGET_OS_IPHONE && WEBKIT_IOS_10_APIS_AVAILABLE
 #import <WebKit/WebKit.h>
 #endif
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index 61da5e139c3929..c277f36e824781 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -7,7 +7,7 @@
 
 #import <React/RCTShadowView.h>
 #import <React/RCTSurfaceRootShadowViewDelegate.h>
-#import <Yoga/YGEnums.h>
+#import <yoga/YGEnums.h>
 
 @interface RCTSurfaceRootShadowView : RCTShadowView
 
diff --git a/React/Views/RCTLayout.h b/React/Views/RCTLayout.h
index 576edbb92c9703..57047b39d43edd 100644
--- a/React/Views/RCTLayout.h
+++ b/React/Views/RCTLayout.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Views/RCTLayout.m b/React/Views/RCTLayout.m
index 31b5a282cfd7f7..321199f8f47f1c 100644
--- a/React/Views/RCTLayout.m
+++ b/React/Views/RCTLayout.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "RCTAssert.h"
 #import "RCTShadowView+Layout.h"
diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h
index 20265535b7138a..775274fd253833 100644
--- a/React/Views/RCTRootShadowView.h
+++ b/React/Views/RCTRootShadowView.h
@@ -6,7 +6,7 @@
  */
 
 #import <React/RCTShadowView.h>
-#import <Yoga/YGEnums.h>
+#import <yoga/YGEnums.h>
 
 @interface RCTRootShadowView : RCTShadowView
 
diff --git a/React/Views/RCTShadowView+Layout.m b/React/Views/RCTShadowView+Layout.m
index ed254254cd9f1d..da110cc740b7f0 100644
--- a/React/Views/RCTShadowView+Layout.m
+++ b/React/Views/RCTShadowView+Layout.m
@@ -7,7 +7,7 @@
 
 #import "RCTShadowView+Layout.h"
 
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "RCTAssert.h"
 
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 3963c034420f74..8d9828cb98a6d1 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -10,7 +10,7 @@
 #import <React/RCTComponent.h>
 #import <React/RCTLayout.h>
 #import <React/RCTRootView.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 @class RCTRootShadowView;
 @class RCTSparseArray;
diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
index 359be14100f613..52ba5f00ec9452 100644
--- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
+++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m
@@ -8,7 +8,7 @@
 #import "RCTSafeAreaShadowView.h"
 
 #import <React/RCTAssert.h>
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "RCTSafeAreaViewLocalData.h"
 
diff --git a/React/Views/ScrollView/RCTScrollContentShadowView.m b/React/Views/ScrollView/RCTScrollContentShadowView.m
index 733280389e47d2..16bf6147c0f3b2 100644
--- a/React/Views/ScrollView/RCTScrollContentShadowView.m
+++ b/React/Views/ScrollView/RCTScrollContentShadowView.m
@@ -7,7 +7,7 @@
 
 #import "RCTScrollContentShadowView.h"
 
-#import <Yoga/Yoga.h>
+#import <yoga/Yoga.h>
 
 #import "RCTUtils.h"
 
diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h
index f9a6d790846d19..5c855acb0a6a4c 100644
--- a/React/Views/UIView+React.h
+++ b/React/Views/UIView+React.h
@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTComponent.h>
-#import <Yoga/YGEnums.h>
+#import <yoga/YGEnums.h>
 
 @class RCTShadowView;
 

From a1aaca473424cb5cd6c5bab4047d7b125114ea54 Mon Sep 17 00:00:00 2001
From: Gabriel Furini <gabrielfurini@gmail.com>
Date: Tue, 17 Sep 2019 10:29:34 -0300
Subject: [PATCH 5/5] Adding "spec.header_dir" to Yoga.podspec in order to fix
 imports and includes on build time

---
 ReactCommon/yoga/Yoga.podspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReactCommon/yoga/Yoga.podspec b/ReactCommon/yoga/Yoga.podspec
index a416963f782a97..82051b0e8ee58d 100644
--- a/ReactCommon/yoga/Yoga.podspec
+++ b/ReactCommon/yoga/Yoga.podspec
@@ -28,6 +28,7 @@ Pod::Spec.new do |spec|
   spec.source = source
 
   spec.module_name = 'yoga'
+  spec.header_dir = 'yoga'
   spec.requires_arc = false
   spec.pod_target_xcconfig = {
       'DEFINES_MODULE' => 'YES'