CocoaPods frameworks compatibility: Step 2 (facebook#25619)

Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in facebook#25393 (comment). If accepted, it will fix facebook#25349. It builds on the changes I made in facebook#25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by facebook#25619 (comment). - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by facebook#25619 (comment). - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by facebook#25619 (comment). - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by facebook#25619 (comment). - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in facebook#25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by facebook@3357351. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: facebook#25619 Test Plan: ``` buck build catalyst ``` Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
TMomemt · Aug 2, 2019 · 2ac46f4 · 2ac46f4
1 parent 1f66f33
commit 2ac46f4
Show file tree

Hide file tree

Showing 136 changed files with 817 additions and 342 deletions.
diff --git a/Libraries/ART/ARTGroup.m b/Libraries/ART/ARTGroup.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTGroup.h"
+#import <React/ARTGroup.h>
 
 @implementation ARTGroup
 

diff --git a/Libraries/ART/ARTNode.m b/Libraries/ART/ARTNode.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTNode.h"
+#import <React/ARTNode.h>
 
-#import "ARTContainer.h"
+#import <React/ARTContainer.h>
 
 @implementation ARTNode
 

diff --git a/Libraries/ART/ARTRenderable.m b/Libraries/ART/ARTRenderable.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTRenderable.h"
+#import <React/ARTRenderable.h>
 
 @implementation ARTRenderable
 

diff --git a/Libraries/ART/ARTShape.m b/Libraries/ART/ARTShape.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTShape.h"
+#import <React/ARTShape.h>
 
 @implementation ARTShape
 

diff --git a/Libraries/ART/ARTSurfaceView.m b/Libraries/ART/ARTSurfaceView.m
@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTSurfaceView.h"
+#import <React/ARTSurfaceView.h>
 
 #import <React/RCTLog.h>
 
-#import "ARTNode.h"
+#import <React/ARTNode.h>
 
 @implementation ARTSurfaceView
 

diff --git a/Libraries/ART/ARTText.m b/Libraries/ART/ARTText.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTText.h"
+#import <React/ARTText.h>
 
 #import <CoreText/CoreText.h>
 

diff --git a/Libraries/ART/Brushes/ARTBrush.m b/Libraries/ART/Brushes/ARTBrush.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTBrush.h"
+#import <React/ARTBrush.h>
 
 #import <React/RCTDefines.h>
 

diff --git a/Libraries/ART/Brushes/ARTLinearGradient.m b/Libraries/ART/Brushes/ARTLinearGradient.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTLinearGradient.h"
+#import <React/ARTLinearGradient.h>
 
 #import <React/RCTLog.h>
 

diff --git a/Libraries/ART/Brushes/ARTPattern.m b/Libraries/ART/Brushes/ARTPattern.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTPattern.h"
+#import <React/ARTPattern.h>
 
 #import <React/RCTLog.h>
 

diff --git a/Libraries/ART/Brushes/ARTRadialGradient.m b/Libraries/ART/Brushes/ARTRadialGradient.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTRadialGradient.h"
+#import <React/ARTRadialGradient.h>
 
 #import <React/RCTLog.h>
 

diff --git a/Libraries/ART/Brushes/ARTSolidColor.m b/Libraries/ART/Brushes/ARTSolidColor.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTSolidColor.h"
+#import <React/ARTSolidColor.h>
 
 #import <React/RCTLog.h>
 

diff --git a/Libraries/ART/RCTConvert+ART.m b/Libraries/ART/RCTConvert+ART.m
@@ -10,10 +10,10 @@
 #import <React/RCTFont.h>
 #import <React/RCTLog.h>
 
-#import "ARTLinearGradient.h"
-#import "ARTPattern.h"
-#import "ARTRadialGradient.h"
-#import "ARTSolidColor.h"
+#import <React/ARTLinearGradient.h>
+#import <React/ARTPattern.h>
+#import <React/ARTRadialGradient.h>
+#import <React/ARTSolidColor.h>
 
 @implementation RCTConvert (ART)
 

diff --git a/Libraries/ART/React-ART.podspec b/Libraries/ART/React-ART.podspec
@@ -26,9 +26,10 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "9.0", :tvos => "9.2" }
   s.source                 = source
-  s.source_files           = "**/*.{h,m}"
+  s.source_files           = "**/*.{m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "ART"
+  s.static_framework       = true
 
-  s.dependency "React-Core", version
+  s.dependency "React-Core/ARTHeaders", version
 end
diff --git a/Libraries/ART/ViewManagers/ARTGroupManager.m b/Libraries/ART/ViewManagers/ARTGroupManager.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTGroupManager.h"
+#import <React/ARTGroupManager.h>
 
-#import "ARTGroup.h"
+#import <React/ARTGroup.h>
 #import "RCTConvert+ART.h"
 
 @implementation ARTGroupManager

diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.m b/Libraries/ART/ViewManagers/ARTNodeManager.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTNodeManager.h"
+#import <React/ARTNodeManager.h>
 
-#import "ARTNode.h"
+#import <React/ARTNode.h>
 
 @implementation ARTNodeManager
 

diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.m b/Libraries/ART/ViewManagers/ARTRenderableManager.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTRenderableManager.h"
+#import <React/ARTRenderableManager.h>
 
 #import "RCTConvert+ART.h"
 

diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.m b/Libraries/ART/ViewManagers/ARTShapeManager.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTShapeManager.h"
+#import <React/ARTShapeManager.h>
 
-#import "ARTShape.h"
+#import <React/ARTShape.h>
 #import "RCTConvert+ART.h"
 
 @implementation ARTShapeManager

diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTSurfaceViewManager.h"
+#import <React/ARTSurfaceViewManager.h>
 
-#import "ARTSurfaceView.h"
+#import <React/ARTSurfaceView.h>
 
 @implementation ARTSurfaceViewManager
 

diff --git a/Libraries/ART/ViewManagers/ARTTextManager.m b/Libraries/ART/ViewManagers/ARTTextManager.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "ARTTextManager.h"
+#import <React/ARTTextManager.h>
 
-#import "ARTText.h"
+#import <React/ARTText.h>
 #import "RCTConvert+ART.h"
 
 @implementation ARTTextManager

diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTActionSheetManager.h"
+#import <React/RCTActionSheetManager.h>
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>

diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
@@ -27,9 +27,10 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "9.0", :tvos => "9.2" }
   s.source                 = source
-  s.source_files           = "*.{h,m}"
+  s.source_files           = "*.{m}"
   s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTActionSheet"
+  s.static_framework       = true
 
-  s.dependency "React-Core", version
+  s.dependency "React-Core/RCTActionSheetHeaders", version
 end
diff --git a/Libraries/Blob/RCTBlobCollector.mm b/Libraries/Blob/RCTBlobCollector.mm
@@ -8,7 +8,7 @@
 #import "RCTBlobCollector.h"
 
 #import <React/RCTBridge+Private.h>
-#import "RCTBlobManager.h"
+#import <React/RCTBlobManager.h>
 
 namespace facebook {
 namespace react {

diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTBlobManager.h"
+#import <React/RCTBlobManager.h>
 
 #import <mutex>
 

diff --git a/Libraries/Blob/RCTFileReaderModule.m b/Libraries/Blob/RCTFileReaderModule.m
@@ -6,12 +6,12 @@
  */
 
 
-#import "RCTFileReaderModule.h"
+#import <React/RCTFileReaderModule.h>
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 
-#import "RCTBlobManager.h"
+#import <React/RCTBlobManager.h>
 
 
 @implementation RCTFileReaderModule

diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec
@@ -26,11 +26,14 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "9.0", :tvos => "9.2" }
   s.source                 = source
-  s.source_files           = "*.{h,m,mm}"
+  # RCTBlobCollector.h is not included in the React module as it has C++ code
+  s.source_files           = "*.{m,mm}", "RCTBlobCollector.h"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
+  s.header_dir             = "RCTBlob"
+  s.static_framework       = true
 
-  s.dependency "React-Core", version
+  s.dependency "React-Core/RCTBlobHeaders", version
   s.dependency "React-RCTNetwork", version
   s.dependency "React-RCTWebSocket", version
+  s.dependency "React-jsi", version
 end
diff --git a/Libraries/CameraRoll/React-RCTCameraRoll.podspec b/Libraries/CameraRoll/React-RCTCameraRoll.podspec
@@ -27,10 +27,7 @@ Pod::Spec.new do |s|
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :ios => "9.0", :tvos => "9.2" }
   s.source                 = source
-  s.source_files           = "*.{h,m}"
-  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
-  s.header_dir             = "React"
-
-  s.dependency "React-Core", version
-  s.dependency "React-RCTImage", version
+  s.source_files           = "**/*.{c,h,m,mm,cpp}"
+  s.header_dir             = "RCTRequired"
+  s.static_framework       = true
 end
diff --git a/Libraries/Image/RCTGIFImageDecoder.m b/Libraries/Image/RCTGIFImageDecoder.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTGIFImageDecoder.h"
+#import <React/RCTGIFImageDecoder.h>
 
 #import <ImageIO/ImageIO.h>
 #import <QuartzCore/QuartzCore.h>

diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTImageBlurUtils.h"
+#import <React/RCTImageBlurUtils.h>
 
 UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius)
 {

diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTImageCache.h"
+#import <React/RCTImageCache.h>
 
 #import <objc/runtime.h>
 
@@ -16,7 +16,7 @@
 #import <React/RCTUtils.h>
 #import <React/RCTResizeMode.h>
 
-#import "RCTImageUtils.h"
+#import <React/RCTImageUtils.h>
 
 static const NSUInteger RCTMaxCachableDecodedImageSizeInBytes = 2097152; // 2 MB
 

diff --git a/Libraries/Image/RCTImageEditingManager.m b/Libraries/Image/RCTImageEditingManager.m
@@ -5,17 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTImageEditingManager.h"
+#import <React/RCTImageEditingManager.h>
 
 #import <UIKit/UIKit.h>
 
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 
-#import "RCTImageLoader.h"
-#import "RCTImageStoreManager.h"
-#import "RCTImageUtils.h"
+#import <React/RCTImageLoader.h>
+#import <React/RCTImageStoreManager.h>
+#import <React/RCTImageUtils.h>
 
 @implementation RCTImageEditingManager
 

diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m
@@ -17,8 +17,8 @@
 #import <React/RCTNetworking.h>
 #import <React/RCTUtils.h>
 
-#import "RCTImageCache.h"
-#import "RCTImageUtils.h"
+#import <React/RCTImageCache.h>
+#import <React/RCTImageUtils.h>
 
 static NSInteger RCTImageBytesForImage(UIImage *image)
 {

diff --git a/Libraries/Image/RCTImageShadowView.m b/Libraries/Image/RCTImageShadowView.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTImageShadowView.h"
+#import <React/RCTImageShadowView.h>
 
 #import <React/RCTLog.h>
 

diff --git a/Libraries/Image/RCTImageStoreManager.m b/Libraries/Image/RCTImageStoreManager.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTImageStoreManager.h"
+#import <React/RCTImageStoreManager.h>
 
 #import <stdatomic.h>
 
@@ -16,7 +16,7 @@
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 
-#import "RCTImageUtils.h"
+#import <React/RCTImageUtils.h>
 
 static NSString *const RCTImageStoreURLScheme = @"rct-image-store";
 

diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTImageUtils.h"
+#import <React/RCTImageUtils.h>
 
 #import <tgmath.h>