Import CSSLayout.h as a user include when it isn't available as a lib…

…rary header
facebook · Aug 24, 2016 · 141d35d · 141d35d
1 parent b4999fc
commit 141d35d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/RCTTextManager.m
@@ -9,7 +9,13 @@
 
 #import "RCTTextManager.h"
 
+//Internally we reference a separate library. See https://github.com/facebook/react-native/pull/9544
+#if __has_include(<CSSLayout/CSSLayout.h>)
 #import <CSSLayout/CSSLayout.h>
+#else
+#import "CSSLayout.h"
+#endif
+
 #import "RCTAccessibilityManager.h"
 #import "RCTAssert.h"
 #import "RCTConvert.h"

diff --git a/React.podspec b/React.podspec
@@ -29,9 +29,8 @@ Pod::Spec.new do |s|
   s.preserve_paths      = "cli.js", "Libraries/**/*.js", "lint", "linter.js", "node_modules", "package.json", "packager", "PATENTS", "react-native-cli"
 
   s.subspec 'Core' do |ss|
-    ss.dependency            'React/CSSLayout'
     ss.source_files        = "React/**/*.{c,h,m,mm,S}"
-    ss.exclude_files       = "**/__tests__/*", "IntegrationTests/*", "React/CSSLayout/*"
+    ss.exclude_files       = "**/__tests__/*", "IntegrationTests/*"
     ss.frameworks          = "JavaScriptCore"
     ss.libraries           = "stdc++"
     ss.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
@@ -43,11 +42,6 @@ Pod::Spec.new do |s|
     ss.preserve_paths = "Libraries/ART/**/*.js"
   end
 
-  s.subspec 'CSSLayout' do |ss|
-    ss.source_files        = "React/CSSLayout/**/*.{c,h}"
-    ss.header_mappings_dir = "React"
-  end
-
   s.subspec 'RCTActionSheet' do |ss|
     ss.dependency       'React/Core'
     ss.source_files   = "Libraries/ActionSheetIOS/*.{h,m}"

diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
@@ -10,7 +10,13 @@
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
 
+//Internally we reference a separate library. See https://github.com/facebook/react-native/pull/9544
+#if __has_include(<CSSLayout/CSSLayout.h>)
 #import <CSSLayout/CSSLayout.h>
+#else
+#import "CSSLayout.h"
+#endif
+
 #import "RCTAnimationType.h"
 #import "RCTBorderStyle.h"
 #import "RCTTextDecorationLineType.h"

diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
@@ -11,7 +11,13 @@
 
 #import <AVFoundation/AVFoundation.h>
 
+//Internally we reference a separate library. See https://github.com/facebook/react-native/pull/9544
+#if __has_include(<CSSLayout/CSSLayout.h>)
 #import <CSSLayout/CSSLayout.h>
+#else
+#import "CSSLayout.h"
+#endif
+
 #import "RCTAccessibilityManager.h"
 #import "RCTAnimationType.h"
 #import "RCTAssert.h"

diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
@@ -9,7 +9,13 @@
 
 #import <UIKit/UIKit.h>
 
+//Internally we reference a separate library. See https://github.com/facebook/react-native/pull/9544
+#if __has_include(<CSSLayout/CSSLayout.h>)
 #import <CSSLayout/CSSLayout.h>
+#else
+#import "CSSLayout.h"
+#endif
+
 #import "RCTComponent.h"
 #import "RCTRootView.h"