diff --git a/Libraries/ART/ARTGroup.m b/Libraries/ART/ARTGroup.m index 56699114f4a3f2..da4a77141f27ff 100644 --- 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 @implementation ARTGroup diff --git a/Libraries/ART/ARTNode.m b/Libraries/ART/ARTNode.m index ae1a152a7d7626..b283f03169d9ea 100644 --- 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 -#import "ARTContainer.h" +#import @implementation ARTNode diff --git a/Libraries/ART/ARTRenderable.m b/Libraries/ART/ARTRenderable.m index 88349f8296e7b0..0d3ce7c3e48218 100644 --- 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 @implementation ARTRenderable diff --git a/Libraries/ART/ARTShape.m b/Libraries/ART/ARTShape.m index 8a1a7d6979f3e9..6b2d983ec7c4d8 100644 --- 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 @implementation ARTShape diff --git a/Libraries/ART/ARTSurfaceView.m b/Libraries/ART/ARTSurfaceView.m index 7e033690d1dc99..e19d29cc06a7d6 100644 --- 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 #import -#import "ARTNode.h" +#import @implementation ARTSurfaceView diff --git a/Libraries/ART/ARTText.m b/Libraries/ART/ARTText.m index 5bcebdf5559942..924257cabea819 100644 --- 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 #import diff --git a/Libraries/ART/Brushes/ARTBrush.m b/Libraries/ART/Brushes/ARTBrush.m index 969ad5d7edb363..9743ac57e133db 100644 --- 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 #import diff --git a/Libraries/ART/Brushes/ARTLinearGradient.m b/Libraries/ART/Brushes/ARTLinearGradient.m index 20bd1af6233b4e..da98ac007877d7 100644 --- 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 #import diff --git a/Libraries/ART/Brushes/ARTPattern.m b/Libraries/ART/Brushes/ARTPattern.m index 70e0bd25f367b7..bb4a3844c07946 100644 --- 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 #import diff --git a/Libraries/ART/Brushes/ARTRadialGradient.m b/Libraries/ART/Brushes/ARTRadialGradient.m index c36f6ce57fc1fc..309667115e2003 100644 --- 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 #import diff --git a/Libraries/ART/Brushes/ARTSolidColor.m b/Libraries/ART/Brushes/ARTSolidColor.m index 2ef02d43d98592..24d1d7ae70cb78 100644 --- 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 #import diff --git a/Libraries/ART/RCTConvert+ART.m b/Libraries/ART/RCTConvert+ART.m index 3312e319436369..c1207e60210e36 100644 --- a/Libraries/ART/RCTConvert+ART.m +++ b/Libraries/ART/RCTConvert+ART.m @@ -10,10 +10,10 @@ #import #import -#import "ARTLinearGradient.h" -#import "ARTPattern.h" -#import "ARTRadialGradient.h" -#import "ARTSolidColor.h" +#import +#import +#import +#import @implementation RCTConvert (ART) diff --git a/Libraries/ART/React-ART.podspec b/Libraries/ART/React-ART.podspec index c7bd0d259b8376..6794975d1578ff 100644 --- 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 index 9fb45d71bbdf4d..da035d0257aab8 100644 --- 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 -#import "ARTGroup.h" +#import #import "RCTConvert+ART.h" @implementation ARTGroupManager diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.m b/Libraries/ART/ViewManagers/ARTNodeManager.m index 62680975ba1033..959f485d60c22a 100644 --- 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 -#import "ARTNode.h" +#import @implementation ARTNodeManager diff --git a/Libraries/ART/ViewManagers/ARTRenderableManager.m b/Libraries/ART/ViewManagers/ARTRenderableManager.m index ad0264965391e5..4d0e224c49312f 100644 --- 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 #import "RCTConvert+ART.h" diff --git a/Libraries/ART/ViewManagers/ARTShapeManager.m b/Libraries/ART/ViewManagers/ARTShapeManager.m index cb056e5d268877..c5e5a919adeee0 100644 --- 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 -#import "ARTShape.h" +#import #import "RCTConvert+ART.h" @implementation ARTShapeManager diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.m index 1a03897937e860..a40f2e73014ee7 100644 --- 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 -#import "ARTSurfaceView.h" +#import @implementation ARTSurfaceViewManager diff --git a/Libraries/ART/ViewManagers/ARTTextManager.m b/Libraries/ART/ViewManagers/ARTTextManager.m index 35c53811fd9509..9ded7cd6772352 100644 --- 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 -#import "ARTText.h" +#import #import "RCTConvert+ART.h" @implementation ARTTextManager diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m index 9eca118126ca16..03df6d51b8ad84 100644 --- 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 #import #import diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec index 9cc25ab1e7501a..53eb10000be23d 100644 --- 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 index 284b52b5a4e8dd..1b928a3e11615a 100644 --- a/Libraries/Blob/RCTBlobCollector.mm +++ b/Libraries/Blob/RCTBlobCollector.mm @@ -8,7 +8,7 @@ #import "RCTBlobCollector.h" #import -#import "RCTBlobManager.h" +#import namespace facebook { namespace react { diff --git a/Libraries/Blob/RCTBlobManager.mm b/Libraries/Blob/RCTBlobManager.mm index 9e8faeb7b149ca..04aba9b637eb01 100755 --- 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 #import diff --git a/Libraries/Blob/RCTFileReaderModule.m b/Libraries/Blob/RCTFileReaderModule.m index 26b33f63e471a9..50fae382019463 100644 --- a/Libraries/Blob/RCTFileReaderModule.m +++ b/Libraries/Blob/RCTFileReaderModule.m @@ -6,12 +6,12 @@ */ -#import "RCTFileReaderModule.h" +#import #import #import -#import "RCTBlobManager.h" +#import @implementation RCTFileReaderModule diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index 55ab585abd88ea..ab2f8d3472c369 100644 --- 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/FBLazyVector/FBLazyVector.podspec b/Libraries/FBLazyVector/FBLazyVector.podspec index 84c8cf012b3ec4..d2a5ea3ac80402 100644 --- a/Libraries/FBLazyVector/FBLazyVector.podspec +++ b/Libraries/FBLazyVector/FBLazyVector.podspec @@ -28,4 +28,5 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "FBLazyVector" + end diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec index 32c55ecef29d64..93a527c6cf7dce 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec @@ -32,6 +32,7 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "FBReactNativeSpec" + s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", diff --git a/Libraries/Image/RCTAnimatedImage.m b/Libraries/Image/RCTAnimatedImage.m index 004ba90b2c7ad8..2cabc1c648e9a3 100644 --- a/Libraries/Image/RCTAnimatedImage.m +++ b/Libraries/Image/RCTAnimatedImage.m @@ -6,7 +6,7 @@ */ #import -#import "RCTAnimatedImage.h" +#import @interface RCTGIFCoderFrame : NSObject diff --git a/Libraries/Image/RCTGIFImageDecoder.m b/Libraries/Image/RCTGIFImageDecoder.m index a5f13a66681d87..a40b42529d1619 100644 --- a/Libraries/Image/RCTGIFImageDecoder.m +++ b/Libraries/Image/RCTGIFImageDecoder.m @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTGIFImageDecoder.h" +#import #import #import #import -#import "RCTAnimatedImage.h" +#import @implementation RCTGIFImageDecoder diff --git a/Libraries/Image/RCTImageBlurUtils.m b/Libraries/Image/RCTImageBlurUtils.m index 8ee3282de4de4e..422bed842868c3 100644 --- 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 UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius) { diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m index a6546a7e26ce17..fabeede3c8df8d 100644 --- 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 #import @@ -16,7 +16,7 @@ #import #import -#import "RCTImageUtils.h" +#import static const NSUInteger RCTMaxCachableDecodedImageSizeInBytes = 2097152; // 2 MB diff --git a/Libraries/Image/RCTImageEditingManager.m b/Libraries/Image/RCTImageEditingManager.m index eb87df96fa77b5..9f14c8362a068c 100644 --- a/Libraries/Image/RCTImageEditingManager.m +++ b/Libraries/Image/RCTImageEditingManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTImageEditingManager.h" +#import #import @@ -13,9 +13,9 @@ #import #import -#import "RCTImageLoader.h" -#import "RCTImageStoreManager.h" -#import "RCTImageUtils.h" +#import +#import +#import @implementation RCTImageEditingManager diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m index 13a485f4122ead..7741648491b980 100644 --- a/Libraries/Image/RCTImageLoader.m +++ b/Libraries/Image/RCTImageLoader.m @@ -17,8 +17,8 @@ #import #import -#import "RCTImageCache.h" -#import "RCTImageUtils.h" +#import +#import static NSInteger RCTImageBytesForImage(UIImage *image) { diff --git a/Libraries/Image/RCTImageShadowView.m b/Libraries/Image/RCTImageShadowView.m index 9102dc1b3b0b73..df50b36b13142d 100644 --- 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 #import diff --git a/Libraries/Image/RCTImageStoreManager.m b/Libraries/Image/RCTImageStoreManager.m index 03656e4ea3312d..1b78327f638cd5 100644 --- 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 #import @@ -16,7 +16,7 @@ #import #import -#import "RCTImageUtils.h" +#import static NSString *const RCTImageStoreURLScheme = @"rct-image-store"; diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m index 0d2e1df1e78bb0..fcd9f3f57f01e0 100644 --- 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 #import diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m index 7cea4625f1b492..da31e17862d2dc 100644 --- a/Libraries/Image/RCTImageView.m +++ b/Libraries/Image/RCTImageView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTImageView.h" +#import #import #import @@ -14,10 +14,10 @@ #import #import -#import "RCTUIImageViewAnimated.h" -#import "RCTImageBlurUtils.h" -#import "RCTImageLoader.h" -#import "RCTImageUtils.h" +#import +#import +#import +#import /** * Determines whether an image of `currentSize` should be reloaded for display diff --git a/Libraries/Image/RCTImageViewManager.m b/Libraries/Image/RCTImageViewManager.m index 7d92500f4e7934..6ca281d7f8f364 100644 --- a/Libraries/Image/RCTImageViewManager.m +++ b/Libraries/Image/RCTImageViewManager.m @@ -5,16 +5,16 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTImageViewManager.h" +#import #import #import #import -#import "RCTImageLoader.h" -#import "RCTImageShadowView.h" -#import "RCTImageView.h" +#import +#import +#import @implementation RCTImageViewManager diff --git a/Libraries/Image/RCTLocalAssetImageLoader.m b/Libraries/Image/RCTLocalAssetImageLoader.m index 68407f38064ab0..8348c363cf9eef 100644 --- a/Libraries/Image/RCTLocalAssetImageLoader.m +++ b/Libraries/Image/RCTLocalAssetImageLoader.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTLocalAssetImageLoader.h" +#import #import diff --git a/Libraries/Image/RCTResizeMode.m b/Libraries/Image/RCTResizeMode.m index 34027f8e8a2ec0..f718d5bd15e405 100644 --- a/Libraries/Image/RCTResizeMode.m +++ b/Libraries/Image/RCTResizeMode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTResizeMode.h" +#import @implementation RCTConvert(RCTResizeMode) diff --git a/Libraries/Image/RCTUIImageViewAnimated.h b/Libraries/Image/RCTUIImageViewAnimated.h index 4afe90a64ebf6b..7647c932136808 100644 --- a/Libraries/Image/RCTUIImageViewAnimated.h +++ b/Libraries/Image/RCTUIImageViewAnimated.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTAnimatedImage.h" +#import @interface RCTUIImageViewAnimated : UIImageView diff --git a/Libraries/Image/RCTUIImageViewAnimated.m b/Libraries/Image/RCTUIImageViewAnimated.m index a8f01c5bfdde41..acd04fc84292bd 100644 --- a/Libraries/Image/RCTUIImageViewAnimated.m +++ b/Libraries/Image/RCTUIImageViewAnimated.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTUIImageViewAnimated.h" +#import #import #import diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index 01ee7fb7cdf826..1ea644b474691f 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -27,10 +27,11 @@ 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 = "RCTImage" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTImageHeaders", version s.dependency "React-RCTNetwork", version end diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m index 3255f5cab5491f..516cd0f1125d3c 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.m +++ b/Libraries/LinkingIOS/RCTLinkingManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTLinkingManager.h" +#import #import #import diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index e111a64a23e302..4d396e2d64125f 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.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 = "RCTLinking" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTLinkingHeaders", version end diff --git a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m index 27d4edfc3bb7d3..ca35c7d31466ee 100644 --- a/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m +++ b/Libraries/NativeAnimation/Drivers/RCTDecayAnimation.m @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTDecayAnimation.h" +#import #import #import -#import "RCTAnimationUtils.h" -#import "RCTValueAnimatedNode.h" +#import +#import @interface RCTDecayAnimation () diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m index 7ae667bb833df0..778c775a2c20a4 100644 --- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m +++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTEventAnimation.h" +#import @implementation RCTEventAnimation { diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m index a6dfde50012f63..3fd8d33ac76daf 100644 --- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m +++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m @@ -5,15 +5,15 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTFrameAnimation.h" +#import #import #import #import -#import "RCTAnimationUtils.h" -#import "RCTValueAnimatedNode.h" +#import +#import @interface RCTFrameAnimation () diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m index 179a187877e368..4ddbb9c73e5a2f 100644 --- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m +++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m @@ -5,15 +5,15 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTSpringAnimation.h" +#import #import #import #import -#import "RCTAnimationUtils.h" -#import "RCTValueAnimatedNode.h" +#import +#import @interface RCTSpringAnimation () diff --git a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m index dfb6f92a2999df..d7bedda903fb47 100644 --- a/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTAdditionAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTAdditionAnimatedNode.h" +#import @implementation RCTAdditionAnimatedNode diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m index 6f61e084a472a5..c4563519ecf718 100644 --- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTAnimatedNode.h" +#import #import diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m index 569741722ab74f..4cd29fb42bc059 100644 --- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTDiffClampAnimatedNode.h" +#import #import diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m index d2cd3a1336c95c..c186a2cba3db0e 100644 --- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTDivisionAnimatedNode.h" +#import #import diff --git a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m index 1fdadc263d538e..921a8db15f013b 100644 --- a/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.m @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTInterpolationAnimatedNode.h" +#import -#import "RCTAnimationUtils.h" +#import static NSRegularExpression *regex; diff --git a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m index e75391c6dc0728..2165c6984be0a6 100644 --- a/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTModuloAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTModuloAnimatedNode.h" +#import @implementation RCTModuloAnimatedNode diff --git a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m index 05a664e2e7483a..05428d3c527ce8 100644 --- a/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTMultiplicationAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTMultiplicationAnimatedNode.h" +#import @implementation RCTMultiplicationAnimatedNode diff --git a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m index 37f81a148e6821..3469d941026fb3 100644 --- a/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m @@ -5,15 +5,15 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTPropsAnimatedNode.h" +#import #import #import #import -#import "RCTAnimationUtils.h" -#import "RCTStyleAnimatedNode.h" -#import "RCTValueAnimatedNode.h" +#import +#import +#import diff --git a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m index 665545be9b4edc..39385726716bce 100644 --- a/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.m @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTStyleAnimatedNode.h" -#import "RCTAnimationUtils.h" -#import "RCTValueAnimatedNode.h" -#import "RCTTransformAnimatedNode.h" +#import +#import +#import +#import @implementation RCTStyleAnimatedNode { diff --git a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m index c5489d15abb3b8..6aa29f44bf1fbe 100644 --- a/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTSubtractionAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTSubtractionAnimatedNode.h" +#import @implementation RCTSubtractionAnimatedNode diff --git a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m index 337a1555373ae9..d1dc941363f954 100644 --- a/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.m @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTrackingAnimatedNode.h" -#import "RCTValueAnimatedNode.h" -#import "RCTNativeAnimatedNodesManager.h" +#import +#import +#import @implementation RCTTrackingAnimatedNode { NSNumber *_animationId; diff --git a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m index 708cd846455693..5d1e0889473154 100644 --- a/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.m @@ -5,8 +5,8 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTransformAnimatedNode.h" -#import "RCTValueAnimatedNode.h" +#import +#import @implementation RCTTransformAnimatedNode { diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m index 949fcad137ff2e..261b6d7aec2081 100644 --- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTValueAnimatedNode.h" +#import @interface RCTValueAnimatedNode () diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m index bd4b2c33e249ce..5d719109d8dcf8 100644 --- a/Libraries/NativeAnimation/RCTAnimationUtils.m +++ b/Libraries/NativeAnimation/RCTAnimationUtils.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTAnimationUtils.h" +#import #import diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m index cbaa41509b85bd..858a658e742d7e 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m +++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m @@ -4,9 +4,9 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -#import "RCTNativeAnimatedModule.h" +#import -#import "RCTNativeAnimatedNodesManager.h" +#import typedef void (^AnimatedOperation)(RCTNativeAnimatedNodesManager *nodesManager); diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m index 819cc1650be94e..fbf5aa231fa8da 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m +++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m @@ -5,28 +5,28 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTNativeAnimatedNodesManager.h" +#import #import -#import "RCTAdditionAnimatedNode.h" -#import "RCTAnimatedNode.h" -#import "RCTAnimationDriver.h" -#import "RCTDiffClampAnimatedNode.h" -#import "RCTDivisionAnimatedNode.h" -#import "RCTEventAnimation.h" -#import "RCTFrameAnimation.h" -#import "RCTDecayAnimation.h" -#import "RCTInterpolationAnimatedNode.h" -#import "RCTModuloAnimatedNode.h" -#import "RCTMultiplicationAnimatedNode.h" -#import "RCTPropsAnimatedNode.h" -#import "RCTSpringAnimation.h" -#import "RCTStyleAnimatedNode.h" -#import "RCTSubtractionAnimatedNode.h" -#import "RCTTransformAnimatedNode.h" -#import "RCTValueAnimatedNode.h" -#import "RCTTrackingAnimatedNode.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import // We do some normalizing of the event names in RCTEventDispatcher#RCTNormalizeInputEventName. // To make things simpler just get rid of the parts we change in the event names we use here. diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index ddab24fba42b04..aa195398b3de93 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.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 = "{Drivers/*,Nodes/*,*}.{h,m}" + s.source_files = "{Drivers/*,Nodes/*,*}.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" - s.header_dir = "React" + s.header_dir = "RCTAnimation" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTAnimationHeaders", version end diff --git a/Libraries/Network/RCTDataRequestHandler.m b/Libraries/Network/RCTDataRequestHandler.m index 2a7c42c6a10bf1..5d72c52264a423 100644 --- a/Libraries/Network/RCTDataRequestHandler.m +++ b/Libraries/Network/RCTDataRequestHandler.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTDataRequestHandler.h" +#import @implementation RCTDataRequestHandler { diff --git a/Libraries/Network/RCTFileRequestHandler.m b/Libraries/Network/RCTFileRequestHandler.m index 00041a78171689..1beba0581614bb 100644 --- a/Libraries/Network/RCTFileRequestHandler.m +++ b/Libraries/Network/RCTFileRequestHandler.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTFileRequestHandler.h" +#import #import diff --git a/Libraries/Network/RCTHTTPRequestHandler.mm b/Libraries/Network/RCTHTTPRequestHandler.mm index 9a555fab4e205c..e72e9437f60109 100644 --- a/Libraries/Network/RCTHTTPRequestHandler.mm +++ b/Libraries/Network/RCTHTTPRequestHandler.mm @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTHTTPRequestHandler.h" +#import #import -#import "RCTNetworking.h" +#import @interface RCTHTTPRequestHandler () diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m index ab310ba1302430..e7aba4fa80486c 100644 --- a/Libraries/Network/RCTNetInfo.m +++ b/Libraries/Network/RCTNetInfo.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTNetInfo.h" +#import #if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC #import diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm index a17d0d3de56d56..193e3c52796507 100644 --- a/Libraries/Network/RCTNetworking.mm +++ b/Libraries/Network/RCTNetworking.mm @@ -16,7 +16,7 @@ #import #import -#import "RCTHTTPRequestHandler.h" +#import typedef RCTURLRequestCancellationBlock (^RCTHTTPQueryResult)(NSError *error, NSDictionary *result); diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index 17797985e7c641..ce9366626c4f83 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.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,mm}" + s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" - s.header_dir = "React" + s.header_dir = "RCTNetwork" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTNetworkHeaders", version end diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m index 2095efa793bd0b..a43d805e43ba53 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m +++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTPushNotificationManager.h" +#import #import diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index da20c0e2f6422d..1c4fa37a479e01 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.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 = "RCTPushNotification" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTPushNotificationHeaders", version end diff --git a/Libraries/RCTRequired/RCTRequired.podspec b/Libraries/RCTRequired/RCTRequired.podspec index 26fa4c7e1a6d96..7a6104c6cdbba1 100644 --- a/Libraries/RCTRequired/RCTRequired.podspec +++ b/Libraries/RCTRequired/RCTRequired.podspec @@ -28,4 +28,5 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "RCTRequired" + s.static_framework = true end diff --git a/Libraries/Settings/RCTSettingsManager.m b/Libraries/Settings/RCTSettingsManager.m index ab8e14dfc4875d..5e3757d30cde25 100644 --- a/Libraries/Settings/RCTSettingsManager.m +++ b/Libraries/Settings/RCTSettingsManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTSettingsManager.h" +#import #import #import diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index 05463e4b714777..f61c7e5871266c 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.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 = "RCTSettings" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTSettingsHeaders", version end diff --git a/Libraries/Text/BaseText/RCTBaseTextShadowView.m b/Libraries/Text/BaseText/RCTBaseTextShadowView.m index 5f2e6dea686920..e834e5c2b2c80b 100644 --- a/Libraries/Text/BaseText/RCTBaseTextShadowView.m +++ b/Libraries/Text/BaseText/RCTBaseTextShadowView.m @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBaseTextShadowView.h" +#import #import -#import "RCTRawTextShadowView.h" -#import "RCTVirtualTextShadowView.h" +#import +#import NSString *const RCTBaseTextShadowViewEmbeddedShadowViewAttributeName = @"RCTBaseTextShadowViewEmbeddedShadowViewAttributeName"; diff --git a/Libraries/Text/BaseText/RCTBaseTextViewManager.m b/Libraries/Text/BaseText/RCTBaseTextViewManager.m index 247c636d9cda64..60d1c627c570ba 100644 --- a/Libraries/Text/BaseText/RCTBaseTextViewManager.m +++ b/Libraries/Text/BaseText/RCTBaseTextViewManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBaseTextViewManager.h" +#import @implementation RCTBaseTextViewManager diff --git a/Libraries/Text/RCTConvert+Text.m b/Libraries/Text/RCTConvert+Text.m index cd91ba9623478a..d3c4aa9a5eecf8 100644 --- a/Libraries/Text/RCTConvert+Text.m +++ b/Libraries/Text/RCTConvert+Text.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTConvert+Text.h" +#import @implementation RCTConvert (Text) diff --git a/Libraries/Text/RCTTextAttributes.m b/Libraries/Text/RCTTextAttributes.m index ceefb2e49df1ce..dcd4dfa2dd77c9 100644 --- a/Libraries/Text/RCTTextAttributes.m +++ b/Libraries/Text/RCTTextAttributes.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTextAttributes.h" +#import #import #import diff --git a/Libraries/Text/RawText/RCTRawTextShadowView.m b/Libraries/Text/RawText/RCTRawTextShadowView.m index 823058626ea186..2317bb2874ba48 100644 --- a/Libraries/Text/RawText/RCTRawTextShadowView.m +++ b/Libraries/Text/RawText/RCTRawTextShadowView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTRawTextShadowView.h" +#import #import diff --git a/Libraries/Text/RawText/RCTRawTextViewManager.m b/Libraries/Text/RawText/RCTRawTextViewManager.m index 641f4e7d30cbf4..afa83ca7de86bb 100644 --- a/Libraries/Text/RawText/RCTRawTextViewManager.m +++ b/Libraries/Text/RawText/RCTRawTextViewManager.m @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTRawTextViewManager.h" +#import -#import "RCTRawTextShadowView.h" +#import @implementation RCTRawTextViewManager diff --git a/Libraries/Text/React-RCTText.podspec b/Libraries/Text/React-RCTText.podspec index 23072496b6c85e..31e05163f883de 100644 --- a/Libraries/Text/React-RCTText.podspec +++ b/Libraries/Text/React-RCTText.podspec @@ -29,7 +29,8 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{h,m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" - s.header_dir = "React" + s.header_dir = "RCTText" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTTextHeaders", version end diff --git a/Libraries/Text/Text/RCTTextShadowView.m b/Libraries/Text/Text/RCTTextShadowView.m index a1243e3243c528..1ebcadd416d8fb 100644 --- a/Libraries/Text/Text/RCTTextShadowView.m +++ b/Libraries/Text/Text/RCTTextShadowView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTextShadowView.h" +#import #import #import @@ -13,7 +13,7 @@ #import #import "NSTextStorage+FontScaling.h" -#import "RCTTextView.h" +#import @implementation RCTTextShadowView { diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m index edfa070d26695f..c95ba433ed84aa 100644 --- a/Libraries/Text/Text/RCTTextView.m +++ b/Libraries/Text/Text/RCTTextView.m @@ -5,14 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTextView.h" +#import #import #import #import -#import "RCTTextShadowView.h" +#import @implementation RCTTextView { diff --git a/Libraries/Text/Text/RCTTextViewManager.m b/Libraries/Text/Text/RCTTextViewManager.m index 9e0af363715d5d..8b4db638a2c055 100644 --- a/Libraries/Text/Text/RCTTextViewManager.m +++ b/Libraries/Text/Text/RCTTextViewManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTextViewManager.h" +#import #import #import @@ -14,8 +14,8 @@ #import #import -#import "RCTTextShadowView.h" -#import "RCTTextView.h" +#import +#import @interface RCTTextViewManager () diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m index dd6b489020926a..7ccef0e8d895a5 100644 --- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputView.m @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTMultilineTextInputView.h" +#import #import -#import "RCTUITextView.h" +#import @implementation RCTMultilineTextInputView { diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m index b086dfaecbd933..760299485e75a7 100644 --- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m +++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTMultilineTextInputViewManager.h" +#import -#import "RCTMultilineTextInputView.h" +#import @implementation RCTMultilineTextInputViewManager diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m index 96e7867c92c4aa..df7e26dc2dda2f 100644 --- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m +++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTUITextView.h" +#import #import #import -#import "RCTBackedTextInputDelegateAdapter.h" -#import "RCTTextAttributes.h" +#import +#import @implementation RCTUITextView { diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m index fe5ee67647d950..baedcba4f3a31e 100644 --- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m +++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBackedTextInputDelegateAdapter.h" +#import #pragma mark - RCTBackedTextFieldDelegateAdapter (for UITextField) diff --git a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m index c6cc08bb8bf0f3..e9523f57bf601f 100644 --- a/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m +++ b/Libraries/Text/TextInput/RCTBaseTextInputShadowView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBaseTextInputShadowView.h" +#import #import #import @@ -13,7 +13,7 @@ #import #import "NSTextStorage+FontScaling.h" -#import "RCTBaseTextInputView.h" +#import @implementation RCTBaseTextInputShadowView { diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m index c82c7b8142e7e8..28a33c79974ff1 100644 --- a/Libraries/Text/TextInput/RCTBaseTextInputView.m +++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBaseTextInputView.h" +#import #import #import @@ -15,10 +15,10 @@ #import #import -#import "RCTInputAccessoryView.h" -#import "RCTInputAccessoryViewContent.h" -#import "RCTTextAttributes.h" -#import "RCTTextSelection.h" +#import +#import +#import +#import @implementation RCTBaseTextInputView { __weak RCTBridge *_bridge; diff --git a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m index a1a3671be8cab3..f57b69d1cd6121 100644 --- a/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m +++ b/Libraries/Text/TextInput/RCTBaseTextInputViewManager.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTBaseTextInputViewManager.h" +#import #import #import @@ -17,9 +17,9 @@ #import #import -#import "RCTBaseTextInputShadowView.h" -#import "RCTBaseTextInputView.h" -#import "RCTConvert+Text.h" +#import +#import +#import @interface RCTBaseTextInputViewManager () diff --git a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m index 68a6681df3682d..91b90c40ce71e7 100644 --- a/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m +++ b/Libraries/Text/TextInput/RCTInputAccessoryShadowView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTInputAccessoryShadowView.h" +#import #import diff --git a/Libraries/Text/TextInput/RCTInputAccessoryView.m b/Libraries/Text/TextInput/RCTInputAccessoryView.m index 1535f9719f9f16..7aa42466ac4213 100644 --- a/Libraries/Text/TextInput/RCTInputAccessoryView.m +++ b/Libraries/Text/TextInput/RCTInputAccessoryView.m @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTInputAccessoryView.h" +#import #import #import #import -#import "RCTInputAccessoryViewContent.h" +#import @interface RCTInputAccessoryView() diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m index 6cd4350e25c55c..13e3d8f32c3733 100644 --- a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m +++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTInputAccessoryViewContent.h" +#import #import diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m index 5fe42d86efb267..f0b50f5131d6ab 100644 --- a/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m +++ b/Libraries/Text/TextInput/RCTInputAccessoryViewManager.m @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTInputAccessoryViewManager.h" +#import -#import "RCTInputAccessoryShadowView.h" -#import "RCTInputAccessoryView.h" +#import +#import @implementation RCTInputAccessoryViewManager diff --git a/Libraries/Text/TextInput/RCTTextSelection.m b/Libraries/Text/TextInput/RCTTextSelection.m index 082b8fd3e48f82..ccece082216cab 100644 --- a/Libraries/Text/TextInput/RCTTextSelection.m +++ b/Libraries/Text/TextInput/RCTTextSelection.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTTextSelection.h" +#import @implementation RCTTextSelection diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m index 4292a04fb69031..b6cd8626f395c8 100644 --- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputView.m @@ -5,11 +5,11 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTSinglelineTextInputView.h" +#import #import -#import "RCTUITextField.h" +#import @implementation RCTSinglelineTextInputView { diff --git a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m index 5a2af1cbcb2f1a..13dfca82bb8533 100644 --- a/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m +++ b/Libraries/Text/TextInput/Singleline/RCTSinglelineTextInputViewManager.m @@ -5,10 +5,10 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTSinglelineTextInputViewManager.h" +#import -#import "RCTBaseTextInputShadowView.h" -#import "RCTSinglelineTextInputView.h" +#import +#import @implementation RCTSinglelineTextInputViewManager diff --git a/Libraries/Text/TextInput/Singleline/RCTUITextField.m b/Libraries/Text/TextInput/Singleline/RCTUITextField.m index 3346fd56c3d5ee..10e3d3df7a1638 100644 --- a/Libraries/Text/TextInput/Singleline/RCTUITextField.m +++ b/Libraries/Text/TextInput/Singleline/RCTUITextField.m @@ -5,13 +5,13 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTUITextField.h" +#import #import #import -#import "RCTBackedTextInputDelegateAdapter.h" -#import "RCTTextAttributes.h" +#import +#import @implementation RCTUITextField { RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter; diff --git a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m index ef659cc54b797a..1326b3e2796d59 100644 --- a/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m +++ b/Libraries/Text/VirtualText/RCTVirtualTextShadowView.m @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTVirtualTextShadowView.h" +#import #import #import -#import "RCTRawTextShadowView.h" +#import @implementation RCTVirtualTextShadowView { BOOL _isLayoutDirty; diff --git a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m index 48eec5ff25a199..1371b08f0e76e9 100644 --- a/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m +++ b/Libraries/Text/VirtualText/RCTVirtualTextViewManager.m @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTVirtualTextViewManager.h" +#import -#import "RCTVirtualTextShadowView.h" +#import @implementation RCTVirtualTextViewManager diff --git a/Libraries/TypeSafety/RCTTypeSafety.podspec b/Libraries/TypeSafety/RCTTypeSafety.podspec index 0bd66ab18d65fd..f0444097f78f83 100644 --- a/Libraries/TypeSafety/RCTTypeSafety.podspec +++ b/Libraries/TypeSafety/RCTTypeSafety.podspec @@ -32,6 +32,7 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "RCTTypeSafety" + s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", diff --git a/Libraries/Vibration/RCTVibration.m b/Libraries/Vibration/RCTVibration.m index 0c960cd449ce1a..db991b0775cc1b 100644 --- a/Libraries/Vibration/RCTVibration.m +++ b/Libraries/Vibration/RCTVibration.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTVibration.h" +#import #import diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index e4df901ac533df..04b6ffeb27f866 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.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 = "RCTVibration" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTVibrationHeaders", version end diff --git a/Libraries/WebSocket/RCTReconnectingWebSocket.m b/Libraries/WebSocket/RCTReconnectingWebSocket.m index a879d305fb62d1..467da99e4c3e17 100644 --- a/Libraries/WebSocket/RCTReconnectingWebSocket.m +++ b/Libraries/WebSocket/RCTReconnectingWebSocket.m @@ -5,12 +5,12 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTReconnectingWebSocket.h" +#import #import #import -#import "RCTSRWebSocket.h" +#import #if RCT_DEV // Only supported in dev mode diff --git a/Libraries/WebSocket/RCTSRWebSocket.m b/Libraries/WebSocket/RCTSRWebSocket.m index 0adf808f382f7b..a134d2e0dd010b 100644 --- a/Libraries/WebSocket/RCTSRWebSocket.m +++ b/Libraries/WebSocket/RCTSRWebSocket.m @@ -16,7 +16,7 @@ #if !TARGET_OS_UIKITFORMAC -#import "RCTSRWebSocket.h" +#import #import #import diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.m b/Libraries/WebSocket/RCTWebSocketExecutor.m index 4d8daa32f47d5b..5cd8d732ce8472 100644 --- a/Libraries/WebSocket/RCTWebSocketExecutor.m +++ b/Libraries/WebSocket/RCTWebSocketExecutor.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTWebSocketExecutor.h" +#import #import #import @@ -14,7 +14,7 @@ #import #import -#import "RCTSRWebSocket.h" +#import #if RCT_DEV // Debug executors are only supported in dev mode diff --git a/Libraries/WebSocket/RCTWebSocketModule.m b/Libraries/WebSocket/RCTWebSocketModule.m index c0426e947d5c3e..d9387c464d18a2 100644 --- a/Libraries/WebSocket/RCTWebSocketModule.m +++ b/Libraries/WebSocket/RCTWebSocketModule.m @@ -5,14 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTWebSocketModule.h" +#import #import #import #import -#import "RCTSRWebSocket.h" +#import @implementation RCTSRWebSocket (React) diff --git a/Libraries/WebSocket/React-RCTWebSocket.podspec b/Libraries/WebSocket/React-RCTWebSocket.podspec index 8f2ec71cefabf1..31a149a0f145d6 100644 --- a/Libraries/WebSocket/React-RCTWebSocket.podspec +++ b/Libraries/WebSocket/React-RCTWebSocket.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 = "RCTWebSocket" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/RCTWebSocketHeaders", version end diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 410fe944e6e4ac..5758d4423c8dee 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -39,7 +39,7 @@ PODS: - React-RCTVibration (= 1000.0.0) - React-RCTWebSocket (= 1000.0.0) - React-ART (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/ARTHeaders (= 1000.0.0) - React-Core (1000.0.0): - Folly (= 2018.10.22.00) - glog @@ -48,9 +48,18 @@ PODS: - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - yoga (= 1000.0.0.React) - - React-Core/CxxBridge (1000.0.0): + - React-Core/ARTHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/CoreModulesHeaders (1000.0.0): - Folly (= 2018.10.22.00) - glog + - React-Core/Default - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) @@ -62,10 +71,106 @@ PODS: - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - yoga (= 1000.0.0.React) + - React-Core/DevSupportHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTActionSheetHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTAnimationHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTBlobHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTImageHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTLinkingHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTNetworkHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTPushNotificationHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTSettingsHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTTextHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTVibrationHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) + - React-Core/RCTWebSocketHeaders (1000.0.0): + - Folly (= 2018.10.22.00) + - glog + - React-Core/Default + - React-cxxreact (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - yoga (= 1000.0.0.React) - React-CoreModules (1000.0.0): - FBReactNativeSpec (= 1000.0.0) - Folly (= 2018.10.22.00) - - React-Core (= 1000.0.0) + - React-Core/CoreModulesHeaders (= 1000.0.0) - React-cxxreact (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion @@ -73,7 +178,8 @@ PODS: - glog - React-jsinspector (= 1000.0.0) - React-DevSupport (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/DevSupportHeaders (= 1000.0.0) + - React-jsinspector (= 1000.0.0) - React-RCTWebSocket (= 1000.0.0) - React-jsi (1000.0.0): - boost-for-react-native (= 1.63.0) @@ -94,32 +200,33 @@ PODS: - React-jsi (= 1000.0.0) - React-jsinspector (1000.0.0) - React-RCTActionSheet (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTActionSheetHeaders (= 1000.0.0) - React-RCTAnimation (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTAnimationHeaders (= 1000.0.0) - React-RCTBlob (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTBlobHeaders (= 1000.0.0) + - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - React-RCTWebSocket (= 1000.0.0) - React-RCTImage (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTImageHeaders (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - React-RCTLinking (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTLinkingHeaders (= 1000.0.0) - React-RCTNetwork (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTNetworkHeaders (= 1000.0.0) - React-RCTPushNotification (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTPushNotificationHeaders (= 1000.0.0) - React-RCTSettings (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTSettingsHeaders (= 1000.0.0) - React-RCTTest (1000.0.0): - React-Core (= 1000.0.0) - React-RCTText (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTVibrationHeaders (= 1000.0.0) - React-RCTWebSocket (1000.0.0): - - React-Core (= 1000.0.0) + - React-Core/RCTWebSocketHeaders (= 1000.0.0) - ReactCommon/jscallinvoker (1000.0.0): - DoubleConversion - Folly (= 2018.10.22.00) @@ -129,7 +236,7 @@ PODS: - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core/CxxBridge (= 1000.0.0) + - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/jscallinvoker (= 1000.0.0) @@ -137,7 +244,7 @@ PODS: - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core/CxxBridge (= 1000.0.0) + - React-Core (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - ReactCommon/jscallinvoker (= 1000.0.0) @@ -154,7 +261,7 @@ DEPENDENCIES: - RCTTypeSafety (from `../Libraries/TypeSafety`) - React (from `../`) - React-ART (from `../Libraries/ART`) - - React-Core (from `../React`) + - React-Core (from `../`) - React-CoreModules (from `../React/CoreModules`) - React-cxxreact (from `../ReactCommon/cxxreact`) - React-DevSupport (from `../React`) @@ -202,7 +309,7 @@ EXTERNAL SOURCES: React-ART: :path: "../Libraries/ART" React-Core: - :path: "../React" + :path: "../" React-CoreModules: :path: "../React/CoreModules" React-cxxreact: @@ -247,35 +354,35 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: 34431b7e61740bed29b082ff81500b0ffafaffa0 - FBReactNativeSpec: e9febd2d5cc091662f172724165922b2e28d10a3 + FBLazyVector: 6819cebb734b7256eb84c2cca750996547423726 + FBReactNativeSpec: 61b1414583d19e3d7bc9a13bf9ff9f17e9ae1b34 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: 33f3b89d2d82ef01c02b9b4f8146c43762e509d8 - RCTTypeSafety: 2b1cb2d92b779aa9a3522f67bd4f07e6b6d0797e - React: 7c652b87c228731c51ab5764de68b6c17e6342be - React-ART: 28f8815acbbc4816cec14866b59911a83eb780ed - React-Core: b85f6553c4b2a31e7d71234c28b51bb928a00cbd - React-CoreModules: b4d2aa51d008ec9edf74f3a03075bbf0359c325f - React-cxxreact: 7c4242192149ce0205b53efaa03e3bf86ba4337c - React-DevSupport: f34768e3aad3e59ee9800c752a78bc6cb24d0f75 - React-jsi: 98d1f9d8a79d2720ba6a44c2d928a77f315b7e4f - React-jsiexecutor: c0ab8c80a6e88380d63f583690a50d4a723b47b5 - React-jsinspector: ea0a218071a11c3687cef2480580180caa6a64c0 - React-RCTActionSheet: caf6532394bdbbe0fc0ec2363c84f26bcfcdd36a - React-RCTAnimation: b324c6eb699637c735650c6180e13d003eeb0e56 - React-RCTBlob: 069290c8db758bb1d77523a06d117dd668b6cef3 - React-RCTImage: 012d845d919177e2726743ad06052dda66592760 - React-RCTLinking: c6fe7b82bed97ce72203b2ce2f4aac87b1e2647f - React-RCTNetwork: 2a2b22a17cd965de53ba21c5ca392d0da84ef322 - React-RCTPushNotification: 13729b4a2b63b191f42ba7230a69f462f3b5a7f9 - React-RCTSettings: e36d7f7d566b80d4363176c2f76cc5eccfdd0ae1 - React-RCTTest: 59213db38d80ff3bf4ff068d6127688687c3d349 - React-RCTText: 469ec754592c92fc639825e558908c2f0e783e2c - React-RCTVibration: ade3c169b54f3bc16c9a9918e17e48ef66aee6ba - React-RCTWebSocket: cb5317e9a4adc37191660f819fb21d63433584ef - ReactCommon: 040ed4788f8cae2ffa23b2d5fb0d4afa58c6d646 - yoga: b72aa5b3708cc93c5897f8297122d6eba1331e07 + RCTRequired: 8652b935c8889a2e4be5c57a82836363ebedf61f + RCTTypeSafety: 97b81cb68b97ed96be3ccf0565b2061de6a0bc55 + React: beba8f1e2440eecfc1d35011fc8329f12d89e603 + React-ART: 490c0e1ea4df0b98ae8dd770e644b11a4557d333 + React-Core: 54db1e19082cb9e8cb1c36bf94ce35767a23d080 + React-CoreModules: d44db82972fb535b9d05f0fa7b817f1580ca2d4e + React-cxxreact: e5b8167a83d4fa6beff7d515272635010e935034 + React-DevSupport: 5ab9466039188e3600317b8d333cb22544ad0851 + React-jsi: f4831e5ac33f7e977bdc142a5706aac13f046ffa + React-jsiexecutor: b1287cb8253594428abad802487778d9db13ab4b + React-jsinspector: b3fe4b62c26de015571c31c6947e0504918babe2 + React-RCTActionSheet: 38632b38346bb86a4ccb60cf96dba36498aedaf1 + React-RCTAnimation: d42e1085be92081b3f46a52a5c50f09e404594d9 + React-RCTBlob: 7385974303c6c8e02d0785234f11a2b9a517b9b0 + React-RCTImage: bf535c1517d75f27c816951944d0fb14bfc59775 + React-RCTLinking: 8933b90652ad2dc710bee77ae2fd1cb2774e6474 + React-RCTNetwork: c3e3f5f3240e2442027d5e2246ef01925bc2c751 + React-RCTPushNotification: 73f198e4297df4ffc4ad72e4224e55f6e9383c63 + React-RCTSettings: bad4194e92c8217129ada3a60bc94bda69e8c7cb + React-RCTTest: c6b1c6da5c91c27eefd8fd2458ec945d6d96fddb + React-RCTText: c7dfcdc34e0372150b00032017c3cc8eb256f4d9 + React-RCTVibration: 8df441ec34cbc9989a3213036351af5a159a072a + React-RCTWebSocket: caed9c5cd2570a71d44a422dab0ed3977aa007ed + ReactCommon: 5af7631cc74d3e6363aaf6cc23cd4c5cb090c109 + yoga: 0025bdd71d1219ea829a69743a3bef9f60dcd8a1 PODFILE CHECKSUM: f866eab42001b1d59349bce6b20d00912cdc700c diff --git a/RNTester/RCTTest/React-RCTTest.podspec b/RNTester/RCTTest/React-RCTTest.podspec index 400e0c8481a26c..2afb7c2099711d 100644 --- a/RNTester/RCTTest/React-RCTTest.podspec +++ b/RNTester/RCTTest/React-RCTTest.podspec @@ -29,7 +29,8 @@ Pod::Spec.new do |s| s.source_files = "**/*.{h,m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.framework = "XCTest" - s.header_dir = "React" + s.header_dir = "RCTTest" + s.static_framework = true s.dependency "React-Core", version end diff --git a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m index 02f1ce4b4978a4..ec72c2b2fd37d7 100644 --- a/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m +++ b/RNTester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m @@ -9,17 +9,10 @@ #import #import -#if (defined(COCOAPODS)) -#import -#import -#import -#import -#else #import #import #import #import -#endif #define RCT_TEST_DATA_CONFIGURATION_BLOCK(appName, testType, input, block) \ - (void)DISABLED_test##appName##_##testType##_##input \ diff --git a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m index dae14d4cbb2645..de28e9a742523d 100644 --- a/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m +++ b/RNTester/RNTesterIntegrationTests/RNTesterIntegrationTests.m @@ -8,11 +8,7 @@ #import #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #define RCT_TEST(name) \ - (void)test##name \ diff --git a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m index 935a15ca1afb30..55998e0bfb8bdc 100644 --- a/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m +++ b/RNTester/RNTesterIntegrationTests/RNTesterSnapshotTests.m @@ -9,11 +9,7 @@ #import #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif @interface RNTesterSnapshotTests : XCTestCase { diff --git a/RNTester/RNTesterPods.xcodeproj/project.pbxproj b/RNTester/RNTesterPods.xcodeproj/project.pbxproj index 5b3b7d43d2d8e5..acf3239ec9aeb4 100644 --- a/RNTester/RNTesterPods.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterPods.xcodeproj/project.pbxproj @@ -7,19 +7,18 @@ objects = { /* Begin PBXBuildFile section */ + 08E577ADEA6D725E9377C9DA /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 72247071A1BF06D54F0FECC7 /* libPods-RNTesterUnitTests.a */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 21A422067A416DD31A8C9E6B /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DC8BF45A723792FE216DDD4 /* libPods-RNTesterIntegrationTests.a */; }; 272E6B3F1BEA849E001FCF37 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; }; 27F441EC1BEBE5030039B79C /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; }; - 2B4F154B3D4EC0787495836D /* libPods-RNTesterUnitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A31CF0ADE5D152C57F0E67 /* libPods-RNTesterUnitTests.a */; }; 2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2DDEF00F1F84BF7B00DBDF73 /* Images.xcassets */; }; 3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; }; + 413F654822EE16AED0DF2540 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F94084777080D7B374FB4783 /* libPods-RNTester.a */; }; 5C60EB1C226440DB0018C04F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C60EB1B226440DB0018C04F /* AppDelegate.mm */; }; 5CB07C9B226467E60039471C /* RNTesterTurboModuleProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */; }; 68E1E4BC2230DF2F00570185 /* ComponentRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68E1E4BB2230DF2F00570185 /* ComponentRegistry.cpp */; }; - B9C5BB1881F54450DBCA70F5 /* libPods-RNTester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8508AD3C1DC3509924E63948 /* libPods-RNTester.a */; }; - C480FE5FFE5B7C5430FA898E /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 8BBFF9F061783A02D50DD2EC /* libPods-RNTesterIntegrationTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */; }; E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; }; E7DB20D122B2BAA6005AC45F /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20A922B2BAA3005AC45F /* RCTBundleURLProviderTests.m */; }; E7DB20D222B2BAA6005AC45F /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7DB20AA22B2BAA3005AC45F /* RCTModuleInitNotificationRaceTests.m */; }; @@ -76,7 +75,6 @@ 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = RNTester/main.m; sourceTree = ""; }; - 25A31CF0ADE5D152C57F0E67 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 272E6B3B1BEA849E001FCF37 /* UpdatePropertiesExampleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePropertiesExampleView.h; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.h; sourceTree = ""; }; 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePropertiesExampleView.m; path = RNTester/NativeExampleViews/UpdatePropertiesExampleView.m; sourceTree = ""; }; 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FlexibleSizeExampleView.m; path = RNTester/NativeExampleViews/FlexibleSizeExampleView.m; sourceTree = ""; }; @@ -88,10 +86,10 @@ 5C60EB1B226440DB0018C04F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = RNTester/AppDelegate.mm; sourceTree = ""; }; 5CB07C99226467E60039471C /* RNTesterTurboModuleProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RNTesterTurboModuleProvider.mm; path = RNTester/RNTesterTurboModuleProvider.mm; sourceTree = ""; }; 5CB07C9A226467E60039471C /* RNTesterTurboModuleProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNTesterTurboModuleProvider.h; path = RNTester/RNTesterTurboModuleProvider.h; sourceTree = ""; }; - 5DC8BF45A723792FE216DDD4 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 68E1E4BB2230DF2F00570185 /* ComponentRegistry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ComponentRegistry.cpp; sourceTree = ""; }; + 72247071A1BF06D54F0FECC7 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 7D51F73F0DA20287418D98BD /* Pods-RNTesterIntegrationTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig"; sourceTree = ""; }; - 8508AD3C1DC3509924E63948 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 972A459EE6CF8CC63531A088 /* Pods-RNTesterIntegrationTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterIntegrationTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig"; sourceTree = ""; }; 98233960D1D6A1977D1C7EAF /* Pods-RNTester.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTester.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig"; sourceTree = ""; }; E771AEEA22B44E3100EA1189 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = RNTester/Info.plist; sourceTree = ""; }; @@ -169,6 +167,7 @@ E7DB216122B2F3EC005AC45F /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = ""; }; E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/iPhoneOS.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = ""; }; + F94084777080D7B374FB4783 /* libPods-RNTester.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -176,8 +175,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B9C5BB1881F54450DBCA70F5 /* libPods-RNTester.a in Frameworks */, - C480FE5FFE5B7C5430FA898E /* (null) in Frameworks */, + 413F654822EE16AED0DF2540 /* libPods-RNTester.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -187,7 +185,7 @@ files = ( E7DB213122B2C649005AC45F /* JavaScriptCore.framework in Frameworks */, E7DB213222B2C67D005AC45F /* libOCMock.a in Frameworks */, - 2B4F154B3D4EC0787495836D /* libPods-RNTesterUnitTests.a in Frameworks */, + 08E577ADEA6D725E9377C9DA /* libPods-RNTesterUnitTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -197,7 +195,7 @@ files = ( E7DB218C22B41FCD005AC45F /* XCTest.framework in Frameworks */, E7DB216722B2F69F005AC45F /* JavaScriptCore.framework in Frameworks */, - 21A422067A416DD31A8C9E6B /* libPods-RNTesterIntegrationTests.a in Frameworks */, + 8BBFF9F061783A02D50DD2EC /* libPods-RNTesterIntegrationTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -269,9 +267,9 @@ E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, E7DB211C22B2BD53005AC45F /* libReact-RCTWebSocket.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, - 8508AD3C1DC3509924E63948 /* libPods-RNTester.a */, - 5DC8BF45A723792FE216DDD4 /* libPods-RNTesterIntegrationTests.a */, - 25A31CF0ADE5D152C57F0E67 /* libPods-RNTesterUnitTests.a */, + F94084777080D7B374FB4783 /* libPods-RNTester.a */, + 8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */, + 72247071A1BF06D54F0FECC7 /* libPods-RNTesterUnitTests.a */, ); name = Frameworks; sourceTree = ""; @@ -733,6 +731,7 @@ "\"${PODS_ROOT}/Headers/Public/libevent\"", "\"$(PODS_ROOT)/boost-for-react-native\"", "\"$(PODS_ROOT)/Folly\"", + "\"$(PODS_ROOT)/DoubleConversion\"", ); INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -741,29 +740,7 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-l\"DoubleConversion\"", - "-l\"Folly\"", - "-l\"React-ART\"", - "-l\"React-Core\"", - "-l\"React-DevSupport\"", - "-l\"React-RCTActionSheet\"", - "-l\"React-RCTAnimation\"", - "-l\"React-RCTBlob\"", - "-l\"React-RCTImage\"", - "-l\"React-RCTLinking\"", - "-l\"React-RCTNetwork\"", - "-l\"React-RCTPushNotification\"", - "-l\"React-RCTSettings\"", - "-l\"React-RCTText\"", - "-l\"React-RCTVibration\"", - "-l\"React-RCTWebSocket\"", - "-l\"React-cxxreact\"", - "-l\"React-jsi\"", - "-l\"React-jsiexecutor\"", - "-l\"React-jsinspector\"", - "-l\"glog\"", "-l\"stdc++\"", - "-l\"yoga\"", "-framework", "\"JavaScriptCore\"", ); @@ -810,6 +787,7 @@ "\"${PODS_ROOT}/Headers/Public/libevent\"", "\"$(PODS_ROOT)/boost-for-react-native\"", "\"$(PODS_ROOT)/Folly\"", + "\"$(PODS_ROOT)/DoubleConversion\"", ); INFOPLIST_FILE = "$(SRCROOT)/RNTester/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -818,29 +796,7 @@ OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", - "-l\"DoubleConversion\"", - "-l\"Folly\"", - "-l\"React-ART\"", - "-l\"React-Core\"", - "-l\"React-DevSupport\"", - "-l\"React-RCTActionSheet\"", - "-l\"React-RCTAnimation\"", - "-l\"React-RCTBlob\"", - "-l\"React-RCTImage\"", - "-l\"React-RCTLinking\"", - "-l\"React-RCTNetwork\"", - "-l\"React-RCTPushNotification\"", - "-l\"React-RCTSettings\"", - "-l\"React-RCTText\"", - "-l\"React-RCTVibration\"", - "-l\"React-RCTWebSocket\"", - "-l\"React-cxxreact\"", - "-l\"React-jsi\"", - "-l\"React-jsiexecutor\"", - "-l\"React-jsinspector\"", - "-l\"glog\"", "-l\"stdc++\"", - "-l\"yoga\"", "-framework", "\"JavaScriptCore\"", ); diff --git a/RNTester/RNTesterUnitTests/RCTAllocationTests.m b/RNTester/RNTesterUnitTests/RCTAllocationTests.m index ffff8cfdda6a3f..e088566d555f36 100644 --- a/RNTester/RNTesterUnitTests/RCTAllocationTests.m +++ b/RNTester/RNTesterUnitTests/RCTAllocationTests.m @@ -9,11 +9,7 @@ #import #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #import #import #import diff --git a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m index bc612c3218805f..a0546a93131a8b 100644 --- a/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m +++ b/RNTester/RNTesterUnitTests/RCTAnimationUtilsTests.m @@ -8,11 +8,7 @@ #import -#if (defined(COCOAPODS)) -#import -#else -#import -#endif +#import @interface RCTAnimationUtilsTests : XCTestCase diff --git a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m index 7f384a5dc494ce..b3a472e16841ef 100644 --- a/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m +++ b/RNTester/RNTesterUnitTests/RCTBlobManagerTests.m @@ -8,11 +8,7 @@ #import -#if (defined(COCOAPODS)) -#import -#else -#import -#endif +#import @interface RCTBlobManagerTests : XCTestCase diff --git a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m index 4bc0eebfd3b487..9b66322d70d905 100644 --- a/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m +++ b/RNTester/RNTesterUnitTests/RCTComponentPropsTests.m @@ -8,11 +8,7 @@ #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #import #import #import diff --git a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m index d1135f69547bb2..487aaedab08ca5 100644 --- a/RNTester/RNTesterUnitTests/RCTDevMenuTests.m +++ b/RNTester/RNTesterUnitTests/RCTDevMenuTests.m @@ -8,11 +8,7 @@ #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #import #import diff --git a/RNTester/RNTesterUnitTests/RCTGzipTests.m b/RNTester/RNTesterUnitTests/RCTGzipTests.m index b28321725f61d2..1a077ab67565b0 100644 --- a/RNTester/RNTesterUnitTests/RCTGzipTests.m +++ b/RNTester/RNTesterUnitTests/RCTGzipTests.m @@ -8,11 +8,7 @@ #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #import #import diff --git a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m index 5f1c7c78b20696..633e958f8abe16 100644 --- a/RNTester/RNTesterUnitTests/RCTImageUtilTests.m +++ b/RNTester/RNTesterUnitTests/RCTImageUtilTests.m @@ -11,11 +11,7 @@ #import #import -#if (defined(COCOAPODS)) -#import -#else -#import -#endif +#import #define RCTAssertEqualPoints(a, b) { \ XCTAssertEqual(a.x, b.x); \ diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m index 68fc28868b678c..3bcecc6dc66e0a 100644 --- a/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m +++ b/RNTester/RNTesterUnitTests/RCTModuleInitNotificationRaceTests.m @@ -9,11 +9,7 @@ #import #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #import #import diff --git a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m index 37d7445029e7d7..3232ec4e82ff1d 100644 --- a/RNTester/RNTesterUnitTests/RCTModuleInitTests.m +++ b/RNTester/RNTesterUnitTests/RCTModuleInitTests.m @@ -9,11 +9,7 @@ #import #import -#if (defined(COCOAPODS)) -#import -#else #import -#endif #import #import #import diff --git a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m index 223dc13b811ae4..b3766f0334d830 100644 --- a/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m +++ b/RNTester/RNTesterUnitTests/RCTNativeAnimatedNodesManagerTests.m @@ -10,13 +10,8 @@ #import "OCMock/OCMock.h" -#if (defined(COCOAPODS)) -#import -#import -#else -#import -#import -#endif +#import +#import #import static const NSTimeInterval FRAME_LENGTH = 1.0 / 60.0; diff --git a/React-Core.podspec b/React-Core.podspec new file mode 100644 index 00000000000000..04e49efb978618 --- /dev/null +++ b/React-Core.podspec @@ -0,0 +1,91 @@ +# coding: utf-8 +# Copyright (c) Facebook, Inc. and its affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +require "json" + +package = JSON.parse(File.read(File.join(__dir__, "package.json"))) +version = package['version'] + +source = { :git => 'https://github.com/facebook/react-native.git' } +if version == '1000.0.0' + # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. + source[:commit] = `git rev-parse HEAD`.strip +else + source[:tag] = "v#{version}" +end + +folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' +folly_version = '2018.10.22.00' +boost_compiler_flags = '-Wno-documentation' + +header_subspecs = { + 'ARTHeaders' => 'Libraries/ART/**/*.h', + 'DevSupportHeaders' => 'React/{DevSupport/*.h,Inspector/*.h}', + 'CoreModulesHeaders' => 'React/CoreModules/**/*.h', + 'RCTActionSheetHeaders' => 'Libraries/ActionSheetIOS/*.h', + 'RCTAnimationHeaders' => 'Libraries/NativeAnimation/{Drivers/*,Nodes/*,*}.{h}', + 'RCTBlobHeaders' => 'Libraries/Blob/{RCTBlobManager,RCTFileReaderModule}.h', + 'RCTImageHeaders' => 'Libraries/Image/*.h', + 'RCTLinkingHeaders' => 'Libraries/LinkingIOS/*.h', + 'RCTNetworkHeaders' => 'Libraries/Network/*.h', + 'RCTPushNotificationHeaders' => 'Libraries/PushNotificationIOS/*.h', + 'RCTSettingsHeaders' => 'Libraries/Settings/*.h', + 'RCTTextHeaders' => 'Libraries/Text/**/*.h', + 'RCTSettingsHeaders' => 'Libraries/Settings/*.h', + 'RCTVibrationHeaders' => 'Libraries/Vibration/*.h', + 'RCTWebSocketHeaders' => 'Libraries/WebSocket/*.h', +} + +Pod::Spec.new do |s| + s.name = "React-Core" + s.version = version + s.summary = "The core of React Native." + s.homepage = "http://facebook.github.io/react-native/" + s.license = package["license"] + s.author = "Facebook, Inc. and its affiliates" + s.platforms = { :ios => "9.0", :tvos => "9.2" } + s.source = source + s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + s.header_dir = "React" + s.static_framework = true + s.framework = "JavaScriptCore" + s.library = "stdc++" + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" } + s.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""} + s.default_subspec = "Default" + + s.subspec "Default" do |ss| + ss.source_files = "React/**/*.{c,h,m,mm,S,cpp}" + ss.exclude_files = "React/CoreModules/**/*", + "React/DevSupport/**/*", + "React/Fabric/**/*", + "React/Inspector/**/*" + ss.ios.exclude_files = "React/**/RCTTV*.*" + ss.tvos.exclude_files = "React/Modules/RCTClipboard*", + "React/Views/RCTDatePicker*", + "React/Views/RCTPicker*", + "React/Views/RCTRefreshControl*", + "React/Views/RCTSlider*", + "React/Views/RCTSwitch*", + ss.private_header_files = "React/Cxx*/*.h" + end + + # Add a subspec containing just the headers for each + # pod that should live under + header_subspecs.each do |name, headers| + s.subspec name do |ss| + ss.source_files = headers + ss.dependency "React-Core/Default" + end + end + + s.dependency "Folly", folly_version + s.dependency "React-cxxreact", version + s.dependency "React-jsi", version + s.dependency "React-jsiexecutor", version + s.dependency "yoga", "#{version}.React" + s.dependency "glog" +end diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec index 93a873b8fd38e3..1b77bad71d4262 100644 --- a/React/CoreModules/React-CoreModules.podspec +++ b/React/CoreModules/React-CoreModules.podspec @@ -30,8 +30,9 @@ Pod::Spec.new do |s| s.platforms = { :ios => "9.0", :tvos => "9.2" } s.compiler_flags = folly_compiler_flags + ' -Wno-nullability-completeness' s.source = source - s.source_files = "**/*.{c,h,m,mm,cpp}" - s.header_dir = "React" + s.source_files = "**/*.{c,m,mm,cpp}" + s.header_dir = "CoreModules" + s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", @@ -40,5 +41,5 @@ Pod::Spec.new do |s| s.dependency "FBReactNativeSpec", version s.dependency "Folly", folly_version - s.dependency "React-Core", version + s.dependency "React-Core/CoreModulesHeaders", version end diff --git a/React/DevSupport/RCTDevLoadingView.m b/React/DevSupport/RCTDevLoadingView.m index 9d75cb7c5487fe..6f7670b322e364 100644 --- a/React/DevSupport/RCTDevLoadingView.m +++ b/React/DevSupport/RCTDevLoadingView.m @@ -5,14 +5,14 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTDevLoadingView.h" +#import #import -#import "RCTBridge.h" -#import "RCTDefines.h" -#import "RCTModalHostViewController.h" -#import "RCTUtils.h" +#import +#import +#import +#import #if RCT_DEV | RCT_ENABLE_LOADING_VIEW diff --git a/React/DevSupport/RCTDevMenu.m b/React/DevSupport/RCTDevMenu.m index 6a653b8a552822..e372ccb39a05bc 100644 --- a/React/DevSupport/RCTDevMenu.m +++ b/React/DevSupport/RCTDevMenu.m @@ -5,20 +5,20 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTDevMenu.h" - -#import "RCTBridge+Private.h" -#import "RCTDevSettings.h" -#import "RCTKeyCommands.h" -#import "RCTLog.h" -#import "RCTUtils.h" -#import "RCTDefines.h" +#import + +#import +#import +#import +#import +#import +#import #import #if RCT_DEV #if RCT_ENABLE_INSPECTOR -#import "RCTInspectorDevServerHelper.h" +#import #endif NSString *const RCTShowDevMenuNotification = @"RCTShowDevMenuNotification"; diff --git a/React/DevSupport/RCTInspectorDevServerHelper.mm b/React/DevSupport/RCTInspectorDevServerHelper.mm index c29b3476e9aef8..ab339f5da14195 100644 --- a/React/DevSupport/RCTInspectorDevServerHelper.mm +++ b/React/DevSupport/RCTInspectorDevServerHelper.mm @@ -3,15 +3,15 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the root directory of this source tree. -#import "RCTInspectorDevServerHelper.h" +#import #if RCT_DEV && !TARGET_OS_UIKITFORMAC #import #import -#import "RCTDefines.h" -#import "RCTInspectorPackagerConnection.h" +#import +#import static NSString *const kDebuggerMsgDisable = @"{ \"id\":1,\"method\":\"Debugger.disable\" }"; diff --git a/React/DevSupport/RCTPackagerClient.m b/React/DevSupport/RCTPackagerClient.m index 66c086f39183f8..a53046c557d2f2 100644 --- a/React/DevSupport/RCTPackagerClient.m +++ b/React/DevSupport/RCTPackagerClient.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTPackagerClient.h" +#import #import #import diff --git a/React/DevSupport/RCTPackagerConnection.mm b/React/DevSupport/RCTPackagerConnection.mm index dbc9c68793b13a..3fb6714f756c79 100644 --- a/React/DevSupport/RCTPackagerConnection.mm +++ b/React/DevSupport/RCTPackagerConnection.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#import "RCTPackagerConnection.h" +#import #import #import diff --git a/React/Inspector/RCTInspector.mm b/React/Inspector/RCTInspector.mm index 30d0933bb8a819..066b1243fdafb0 100644 --- a/React/Inspector/RCTInspector.mm +++ b/React/Inspector/RCTInspector.mm @@ -3,17 +3,17 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the root directory of this source tree. -#import "RCTInspector.h" +#import #if RCT_DEV && !TARGET_OS_UIKITFORMAC #include -#import "RCTDefines.h" -#import "RCTInspectorPackagerConnection.h" -#import "RCTLog.h" -#import "RCTSRWebSocket.h" -#import "RCTUtils.h" +#import +#import +#import +#import +#import using namespace facebook::react; diff --git a/React/Inspector/RCTInspectorPackagerConnection.m b/React/Inspector/RCTInspectorPackagerConnection.m index 905e5871196fcf..d026389fffade6 100644 --- a/React/Inspector/RCTInspectorPackagerConnection.m +++ b/React/Inspector/RCTInspectorPackagerConnection.m @@ -3,15 +3,15 @@ // This source code is licensed under the MIT license found in the // LICENSE file in the root directory of this source tree. -#import "RCTInspectorPackagerConnection.h" +#import #if RCT_DEV && !TARGET_OS_UIKITFORMAC -#import "RCTDefines.h" -#import "RCTInspector.h" -#import "RCTLog.h" -#import "RCTSRWebSocket.h" -#import "RCTUtils.h" +#import +#import +#import +#import +#import // This is a port of the Android impl, at // ReactAndroid/src/main/java/com/facebook/react/devsupport/InspectorPackagerConnection.java diff --git a/React/React-Core.podspec b/React/React-Core.podspec deleted file mode 100644 index 742950fe1077e9..00000000000000 --- a/React/React-Core.podspec +++ /dev/null @@ -1,68 +0,0 @@ -# coding: utf-8 -# Copyright (c) Facebook, Inc. and its affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -require "json" - -package = JSON.parse(File.read(File.join(__dir__, "..", "package.json"))) -version = package['version'] - -source = { :git => 'https://github.com/facebook/react-native.git' } -if version == '1000.0.0' - # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. - source[:commit] = `git rev-parse HEAD`.strip -else - source[:tag] = "v#{version}" -end - -folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' -boost_compiler_flags = '-Wno-documentation' - -Pod::Spec.new do |s| - s.name = "React-Core" - s.version = version - s.summary = "The core of React Native." - s.homepage = "http://facebook.github.io/react-native/" - s.license = package["license"] - s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "9.0", :tvos => "9.2" } - s.source = source - s.source_files = "**/*.{c,h,m,mm,S,cpp}" - s.exclude_files = "CoreModules/**/*", - "DevSupport/**/*", - "Fabric/**/*", - "Inspector/**/*" - s.ios.exclude_files = "**/RCTTV*.*" - s.tvos.exclude_files = "Modules/RCTClipboard*", - "Views/RCTDatePicker*", - "Views/RCTPicker*", - "Views/RCTRefreshControl*", - "Views/RCTSlider*", - "Views/RCTSwitch*", - s.private_header_files = "Cxx*/*.h" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.header_dir = "React" - s.framework = "JavaScriptCore" - s.library = "stdc++" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" } - s.default_subspec = "Default" - - s.subspec "Default" do |ss| - # no-op - end - - s.subspec "CxxBridge" do |ss| - # Make the C++ headers visible if they are needed - ss.public_header_files = "**/*.{h}" - end - - s.dependency "Folly", folly_version - s.dependency "React-cxxreact", version - s.dependency "React-jsi", version - s.dependency "React-jsiexecutor", version - s.dependency "yoga", "#{version}.React" - s.dependency "glog" -end diff --git a/React/React-DevSupport.podspec b/React/React-DevSupport.podspec index 0f9405fb942851..f247f83dc0574e 100644 --- a/React/React-DevSupport.podspec +++ b/React/React-DevSupport.podspec @@ -26,10 +26,12 @@ 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 = "DevSupport/*", - "Inspector/*" - s.header_dir = "React" + s.source_files = "DevSupport/*.{mm,m}", + "Inspector/*.{mm,m}" + s.header_dir = "DevSupport" + s.static_framework = true - s.dependency "React-Core", version + s.dependency "React-Core/DevSupportHeaders", version s.dependency "React-RCTWebSocket", version + s.dependency "React-jsinspector", version end diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index 1328360249f3f4..9ccc6dc824336c 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -36,13 +36,14 @@ Pod::Spec.new do |s| "**/android/*", s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "React" + s.static_framework = true s.framework = "JavaScriptCore" s.library = "stdc++" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" } + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" } s.xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/Folly\"", "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" + " " + folly_flags } - s.dependency "React-Core/CxxBridge", version + s.dependency "React-Core", version s.dependency "React-Fabric", version s.dependency "React-RCTImage", version s.dependency "Folly/Fabric", folly_version diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec index ea8116e2cec922..c922a515553dcc 100644 --- a/ReactCommon/React-Fabric.podspec +++ b/ReactCommon/React-Fabric.podspec @@ -36,6 +36,7 @@ Pod::Spec.new do |s| s.library = "stdc++" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" } + s.static_framework = true s.dependency folly_dep_name, folly_version s.dependency "React-graphics", version diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index 6d3ace59288e5d..e928e3ef1490dd 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -32,8 +32,9 @@ Pod::Spec.new do |s| s.platforms = { :ios => "9.0", :tvos => "9.2" } s.source = source s.header_dir = "ReactCommon" # Use global header_dir for all subspecs for use_framework compatibility + s.static_framework = true s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"", "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" } @@ -48,7 +49,7 @@ Pod::Spec.new do |s| s.subspec "turbomodule" do |ss| ss.dependency "ReactCommon/jscallinvoker", version - ss.dependency "React-Core/CxxBridge", version + ss.dependency "React-Core", version ss.dependency "React-cxxreact", version ss.dependency "React-jsi", version ss.dependency "Folly", folly_version diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec index 3f1a214f0d20eb..e9a4c96e668edf 100644 --- a/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/ReactCommon/cxxreact/React-cxxreact.podspec @@ -35,6 +35,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "cxxreact" + s.static_framework = true s.dependency "boost-for-react-native", "1.63.0" s.dependency "DoubleConversion" diff --git a/ReactCommon/fabric/graphics/React-graphics.podspec b/ReactCommon/fabric/graphics/React-graphics.podspec index 52c46a45e3d138..0233e6eceac327 100644 --- a/ReactCommon/fabric/graphics/React-graphics.podspec +++ b/ReactCommon/fabric/graphics/React-graphics.podspec @@ -34,7 +34,8 @@ Pod::Spec.new do |s| s.source_files = "**/*.{m,mm,cpp,h}" s.exclude_files = "**/tests/*", "**/android/*" - s.header_dir = "react/graphics" + s.header_dir = "react/graphics" + s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" } s.dependency "Folly/Fabric", folly_version diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec index b297c5fedfe0ad..5bb008a3d40941 100644 --- a/ReactCommon/jsi/React-jsi.podspec +++ b/ReactCommon/jsi/React-jsi.podspec @@ -36,6 +36,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "jsi" + s.static_framework = true s.default_subspec = "Default" s.dependency "boost-for-react-native", "1.63.0" diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 6ee7e3c9067643..3be23e8535cf0b 100644 --- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -34,6 +34,7 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "jsireact" + s.static_framework = true s.dependency "React-cxxreact", version s.dependency "React-jsi", version diff --git a/ReactCommon/jsinspector/React-jsinspector.podspec b/ReactCommon/jsinspector/React-jsinspector.podspec index 63db57a4900717..00dbe2f3c1598a 100644 --- a/ReactCommon/jsinspector/React-jsinspector.podspec +++ b/ReactCommon/jsinspector/React-jsinspector.podspec @@ -28,4 +28,5 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.header_dir = 'jsinspector' + s.static_framework = true end diff --git a/package.json b/package.json index b42053aafe557d..64b6043b512b9a 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "react-native.config.js", "react.gradle", "React.podspec", + "React-Core.podspec", "React", "ReactAndroid", "ReactCommon", diff --git a/scripts/autolink-ios.rb b/scripts/autolink-ios.rb index 31e8a022f69978..054003a115aae0 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/autolink-ios.rb @@ -15,7 +15,7 @@ def use_react_native! (options={}) pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired" pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety" pod 'React', :path => "#{prefix}/" - pod 'React-Core', :path => "#{prefix}/React" + pod 'React-Core', :path => "#{prefix}/" pod 'React-CoreModules', :path => "#{prefix}/React/CoreModules" pod 'React-RCTActionSheet', :path => "#{prefix}/Libraries/ActionSheetIOS" pod 'React-RCTAnimation', :path => "#{prefix}/Libraries/NativeAnimation" diff --git a/template/ios/Podfile b/template/ios/Podfile index 5be9812ad51d13..3fb683e1f32bae 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -8,7 +8,7 @@ target 'HelloWorld' do pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety" pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/React' + pod 'React-Core', :path => '../node_modules/react-native/' pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' pod 'React-DevSupport', :path => '../node_modules/react-native/React' pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'