diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj index 8bd0e03e4e..2d5105b3ad 100644 --- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj +++ b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj @@ -87,7 +87,6 @@ 2D4BD8E61DA2E20D005AC8A8 /* TestBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* TestBundle.js */; }; 2D4BD8E71DA2E20D005AC8A8 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14D6D7101B220EB3001FB087 /* libOCMock.a */; }; 2D8C2E321DA40403000EE098 /* RCTMultipartStreamReaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */; }; - 2DD0EFF41DA853B200B0C975 /* libRCTPushNotification-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD0EFF31DA853B200B0C975 /* libRCTPushNotification-tvOS.a */; }; 2DD323DC1DA2DDBF000FE1B8 /* FlexibleSizeExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 27F441E81BEBE5030039B79C /* FlexibleSizeExampleView.m */; }; 2DD323DD1DA2DDBF000FE1B8 /* UpdatePropertiesExampleView.m in Sources */ = {isa = PBXBuildFile; fileRef = 272E6B3C1BEA849E001FCF37 /* UpdatePropertiesExampleView.m */; }; 2DD323DE1DA2DDBF000FE1B8 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; @@ -212,13 +211,6 @@ remoteGlobalIDString = 2DD3238F1DA2DD8A000FE1B8; remoteInfo = "UIExplorer-tvOS"; }; - 2DD0EFF21DA853B200B0C975 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 2DD0EFE61DA8533A00B0C975; - remoteInfo = "RCTPushNotification-tvOS"; - }; 2DD323A61DA2DD8B000FE1B8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -303,6 +295,20 @@ remoteGlobalIDString = 3D13F83D1D6F6AE000E69E0E; remoteInfo = UIExplorerBundle; }; + 3D3C08801DE3424E00C268FA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D3C059A1DE3340900C268FA; + remoteInfo = CSSLayout; + }; + 3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D3C06751DE3340C00C268FA; + remoteInfo = "CSSLayout-tvOS"; + }; 58005BED1ABA80530062E044 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */; @@ -438,9 +444,9 @@ 13E501F11D07A84A005F35D8 /* libRCTAnimation.a in Frameworks */, 138DEE241B9EDFB6007F4EA5 /* libRCTCameraRoll.a in Frameworks */, 134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */, + 1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */, 13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */, 3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */, - 1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */, 14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */, 834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */, 134180011AA9153C003F314A /* libRCTText.a in Frameworks */, @@ -469,7 +475,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2DD0EFF41DA853B200B0C975 /* libRCTPushNotification-tvOS.a in Frameworks */, 2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */, 2DD323E41DA2DE3F000FE1B8 /* libRCTImage-tvOS.a in Frameworks */, 2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */, @@ -681,6 +686,8 @@ children = ( 14AADF041AC3DB95002390C9 /* libReact.a */, 2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */, + 3D3C08811DE3424E00C268FA /* libCSSLayout.a */, + 3D3C08831DE3424E00C268FA /* libCSSLayout-tvOS.a */, ); name = Products; sourceTree = ""; @@ -712,7 +719,6 @@ isa = PBXGroup; children = ( 14DC67F11AB71876001358AB /* libRCTPushNotification.a */, - 2DD0EFF31DA853B200B0C975 /* libRCTPushNotification-tvOS.a */, ); name = Products; sourceTree = ""; @@ -1134,13 +1140,6 @@ remoteRef = 14DC67F01AB71876001358AB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 2DD0EFF31DA853B200B0C975 /* libRCTPushNotification-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libRCTPushNotification-tvOS.a"; - remoteRef = 2DD0EFF21DA853B200B0C975 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1211,6 +1210,20 @@ remoteRef = 357859001B28D2C500341EDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 3D3C08811DE3424E00C268FA /* libCSSLayout.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libCSSLayout.a; + remoteRef = 3D3C08801DE3424E00C268FA /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 3D3C08831DE3424E00C268FA /* libCSSLayout-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libCSSLayout-tvOS.a"; + remoteRef = 3D3C08821DE3424E00C268FA /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 58005BEE1ABA80530062E044 /* libRCTTest.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1798,11 +1811,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - "$(SRCROOT)/../../Libraries/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1862,11 +1871,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_LABEL = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - "$(SRCROOT)/../../Libraries/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ( diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme index 86b08cc46f..cf3a62f5e5 100644 --- a/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme +++ b/Examples/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme @@ -1,6 +1,6 @@ + + + + +#import +#import +#import +#import + #if !TARGET_OS_TV -#import "RCTPushNotificationManager.h" +#import #endif @interface AppDelegate() diff --git a/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.h b/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.h index e4427fec58..3f8a854911 100644 --- a/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.h +++ b/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.h @@ -13,7 +13,8 @@ */ #import -#import "RCTView.h" + +#import @interface FlexibleSizeExampleView : RCTView diff --git a/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.m b/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.m index c96e5798b6..7b6efe028a 100644 --- a/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.m +++ b/Examples/UIExplorer/UIExplorer/NativeExampleViews/FlexibleSizeExampleView.m @@ -12,15 +12,14 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#import "AppDelegate.h" - #import "FlexibleSizeExampleView.h" -#import "RCTJavaScriptLoader.h" -#import "RCTBridge.h" -#import "RCTRootView.h" -#import "RCTRootViewDelegate.h" -#import "RCTViewManager.h" +#import +#import +#import +#import + +#import "AppDelegate.h" @interface FlexibleSizeExampleViewManager : RCTViewManager @@ -38,7 +37,7 @@ RCT_EXPORT_MODULE(); @end -@interface FlexibleSizeExampleView () +@interface FlexibleSizeExampleView () @end diff --git a/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.h b/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.h index 6f769f249e..537fb90b09 100644 --- a/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.h +++ b/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.h @@ -13,7 +13,8 @@ */ #import -#import "RCTView.h" + +#import @interface UpdatePropertiesExampleView : RCTView diff --git a/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.m b/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.m index 0416024a8b..ef58ce9417 100644 --- a/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.m +++ b/Examples/UIExplorer/UIExplorer/NativeExampleViews/UpdatePropertiesExampleView.m @@ -12,13 +12,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#import "AppDelegate.h" - #import "UpdatePropertiesExampleView.h" -#import "RCTJavaScriptLoader.h" -#import "RCTBridge.h" -#import "RCTRootView.h" -#import "RCTViewManager.h" + +#import +#import + +#import "AppDelegate.h" @interface UpdatePropertiesExampleViewManager : RCTViewManager diff --git a/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h b/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h index 890c9ef3bc..7f52a6630b 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h +++ b/Examples/UIExplorer/UIExplorerUnitTests/OCMock/OCMStubRecorder.h @@ -14,7 +14,7 @@ * under the License. */ -#import "OCMRecorder.h" +#import @interface OCMStubRecorder : OCMRecorder @@ -51,6 +51,3 @@ @property (nonatomic, readonly) OCMStubRecorder *(^ _andForwardToRealObject)(void); @end - - - diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m index a42d587b06..353bee7444 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTConvert_NSURLTests.m @@ -14,7 +14,8 @@ #import -#import "RCTConvert.h" +#import + #import "RCTUtils.h" @interface RCTConvert_NSURLTests : XCTestCase diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.h b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.h index fe68f0592a..f6641c378d 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.h +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderHelpers.h @@ -12,7 +12,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#import "RCTImageLoader.h" +#import typedef BOOL (^RCTImageURLLoaderCanLoadImageURLHandler)(NSURL *requestURL); typedef RCTImageLoaderCancellationBlock (^RCTImageURLLoaderLoadImageURLHandler)(NSURL *imageURL, CGSize size, CGFloat scale, RCTResizeMode resizeMode, RCTImageLoaderProgressBlock progressHandler, RCTImageLoaderCompletionBlock completionHandler); diff --git a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj index cdb6c2cc06..c87e340626 100644 --- a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj +++ b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj @@ -10,34 +10,12 @@ 14C644C41AB0DFC900DE3C65 /* RCTActionSheetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 14C644C21AB0DFC900DE3C65 /* RCTActionSheetManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 58B511D91A9E6C8500147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libRCTActionSheet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTActionSheet.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 14C644C11AB0DFC900DE3C65 /* RCTActionSheetManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTActionSheetManager.h; sourceTree = ""; }; + 14C644C11AB0DFC900DE3C65 /* RCTActionSheetManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTActionSheetManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 14C644C21AB0DFC900DE3C65 /* RCTActionSheetManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTActionSheetManager.m; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 58B511D81A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; @@ -66,8 +44,6 @@ buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTActionSheet" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, - 58B511D81A9E6C8500147676 /* Frameworks */, - 58B511D91A9E6C8500147676 /* CopyFiles */, ); buildRules = ( ); @@ -156,10 +132,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -200,10 +173,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.h b/Libraries/ActionSheetIOS/RCTActionSheetManager.h index 4e99f22043..313939149f 100644 --- a/Libraries/ActionSheetIOS/RCTActionSheetManager.h +++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.h @@ -9,7 +9,7 @@ #import -#import "RCTBridge.h" +#import @interface RCTActionSheetManager : NSObject diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m index ca42f0d9e2..9f550f77af 100644 --- a/Libraries/ActionSheetIOS/RCTActionSheetManager.m +++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.m @@ -9,11 +9,11 @@ #import "RCTActionSheetManager.h" -#import "RCTConvert.h" -#import "RCTLog.h" -#import "RCTUtils.h" -#import "RCTBridge.h" -#import "RCTUIManager.h" +#import +#import +#import +#import +#import @interface RCTActionSheetManager () @end diff --git a/Libraries/AdSupport/RCTAdSupport.h b/Libraries/AdSupport/RCTAdSupport.h index 56e561f745..8a15b06810 100644 --- a/Libraries/AdSupport/RCTAdSupport.h +++ b/Libraries/AdSupport/RCTAdSupport.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import @interface RCTAdSupport : NSObject diff --git a/Libraries/AdSupport/RCTAdSupport.m b/Libraries/AdSupport/RCTAdSupport.m index 1324e9c9eb..28579a5b50 100644 --- a/Libraries/AdSupport/RCTAdSupport.m +++ b/Libraries/AdSupport/RCTAdSupport.m @@ -7,10 +7,11 @@ * of patent rights can be found in the PATENTS file in the same directory. */ +#import "RCTAdSupport.h" + #import -#import "RCTAdSupport.h" -#import "RCTUtils.h" +#import @implementation RCTAdSupport diff --git a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj index 4097b5c413..d341ac07c6 100644 --- a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj +++ b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj @@ -24,7 +24,7 @@ /* Begin PBXFileReference section */ 832C81801AAF6DEF007FA2F7 /* libRCTAdSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAdSupport.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 832C819A1AAF6E1A007FA2F7 /* RCTAdSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAdSupport.h; sourceTree = ""; }; + 832C819A1AAF6E1A007FA2F7 /* RCTAdSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAdSupport.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 832C819B1AAF6E1A007FA2F7 /* RCTAdSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAdSupport.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -156,10 +156,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -200,10 +197,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h index 4ce68bc3b3..405ba289ae 100644 --- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h +++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridge.h" -#import "RCTURLRequestHandler.h" +#import +#import @class ALAssetsLibrary; diff --git a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m index a7a44bbb44..58862354ff 100644 --- a/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m +++ b/Libraries/CameraRoll/RCTAssetsLibraryRequestHandler.m @@ -9,12 +9,13 @@ #import "RCTAssetsLibraryRequestHandler.h" -#import #import + +#import #import -#import "RCTBridge.h" -#import "RCTUtils.h" +#import +#import @implementation RCTAssetsLibraryRequestHandler { @@ -54,8 +55,6 @@ RCT_EXPORT_MODULE() ALAssetRepresentation *representation = [asset defaultRepresentation]; NSInteger length = (NSInteger)representation.size; - - CFStringRef MIMEType = UTTypeCopyPreferredTagWithClass((__bridge CFStringRef _Nonnull)(representation.UTI), kUTTagClassMIMEType); NSURLResponse *response = diff --git a/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj b/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj index 042908f2fa..375a71c9ef 100644 --- a/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj +++ b/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/project.pbxproj @@ -26,14 +26,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 137620331B31C53500677FF0 /* RCTImagePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImagePickerManager.h; sourceTree = ""; }; + 137620331B31C53500677FF0 /* RCTImagePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTImagePickerManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 137620341B31C53500677FF0 /* RCTImagePickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImagePickerManager.m; sourceTree = ""; }; - 143879331AAD238D00F088A5 /* RCTCameraRollManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTCameraRollManager.h; sourceTree = ""; }; + 143879331AAD238D00F088A5 /* RCTCameraRollManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTCameraRollManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 143879341AAD238D00F088A5 /* RCTCameraRollManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTCameraRollManager.m; sourceTree = ""; }; 58B5115D1A9E6B3D00147676 /* libRCTCameraRoll.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTCameraRoll.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 8312EAEC1B85EB7C001867A2 /* RCTAssetsLibraryRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAssetsLibraryRequestHandler.h; sourceTree = ""; }; + 8312EAEC1B85EB7C001867A2 /* RCTAssetsLibraryRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAssetsLibraryRequestHandler.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 8312EAED1B85EB7C001867A2 /* RCTAssetsLibraryRequestHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAssetsLibraryRequestHandler.m; sourceTree = ""; }; - 8312EAEF1B85F071001867A2 /* RCTPhotoLibraryImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPhotoLibraryImageLoader.h; sourceTree = ""; }; + 8312EAEF1B85F071001867A2 /* RCTPhotoLibraryImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTPhotoLibraryImageLoader.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 8312EAF01B85F071001867A2 /* RCTPhotoLibraryImageLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPhotoLibraryImageLoader.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -174,15 +174,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include/**"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Image"; WARNING_CFLAGS = ( "-Werror", "-Wall", @@ -219,14 +215,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include/**"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Image"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = ( "-Werror", diff --git a/Libraries/CameraRoll/RCTCameraRollManager.h b/Libraries/CameraRoll/RCTCameraRollManager.h index 30407c9f67..f2bf18cb27 100644 --- a/Libraries/CameraRoll/RCTCameraRollManager.h +++ b/Libraries/CameraRoll/RCTCameraRollManager.h @@ -9,8 +9,8 @@ #import -#import "RCTBridgeModule.h" -#import "RCTConvert.h" +#import +#import @interface RCTConvert (ALAssetGroup) diff --git a/Libraries/CameraRoll/RCTCameraRollManager.m b/Libraries/CameraRoll/RCTCameraRollManager.m index 8164615762..015319190c 100644 --- a/Libraries/CameraRoll/RCTCameraRollManager.m +++ b/Libraries/CameraRoll/RCTCameraRollManager.m @@ -13,12 +13,13 @@ #import #import +#import +#import +#import +#import +#import + #import "RCTAssetsLibraryRequestHandler.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTImageLoader.h" -#import "RCTLog.h" -#import "RCTUtils.h" @implementation RCTConvert (ALAssetGroup) @@ -209,8 +210,8 @@ RCT_EXPORT_METHOD(getPhotos:(NSDictionary *)params }]; } }]; - } - + } + if (!group) { // Sometimes the enumeration continues even if we set stop above, so we guard against resolving the promise // multiple times here. diff --git a/Libraries/CameraRoll/RCTImagePickerManager.h b/Libraries/CameraRoll/RCTImagePickerManager.h index a008c46f37..e3053f6a12 100644 --- a/Libraries/CameraRoll/RCTImagePickerManager.h +++ b/Libraries/CameraRoll/RCTImagePickerManager.h @@ -8,7 +8,7 @@ * */ -#import "RCTBridgeModule.h" +#import @interface RCTImagePickerManager : NSObject diff --git a/Libraries/CameraRoll/RCTImagePickerManager.m b/Libraries/CameraRoll/RCTImagePickerManager.m index 8955bc1ef2..0e30307f87 100644 --- a/Libraries/CameraRoll/RCTImagePickerManager.m +++ b/Libraries/CameraRoll/RCTImagePickerManager.m @@ -9,18 +9,17 @@ */ #import "RCTImagePickerManager.h" -#import "RCTImageStoreManager.h" - -#import "RCTConvert.h" -#import "RCTRootView.h" -#import "RCTLog.h" -#import "RCTUtils.h" - -#import #import +#import -@interface RCTImagePickerManager () +#import +#import +#import +#import +#import + +@interface RCTImagePickerManager () @end diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h index 33cbab3f08..67e5cfe527 100644 --- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h +++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTImageLoader.h" +#import @interface RCTPhotoLibraryImageLoader : NSObject diff --git a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m index 9ce66d533c..b99ac934fe 100644 --- a/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m +++ b/Libraries/CameraRoll/RCTPhotoLibraryImageLoader.m @@ -11,8 +11,7 @@ #import -#import "RCTImageUtils.h" -#import "RCTUtils.h" +#import @implementation RCTPhotoLibraryImageLoader diff --git a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj index cc7d6a669b..d48d553d3a 100644 --- a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj +++ b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj @@ -10,34 +10,12 @@ 134814061AA4E45400B7C361 /* RCTLocationObserver.m in Sources */ = {isa = PBXBuildFile; fileRef = 134814051AA4E45400B7C361 /* RCTLocationObserver.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 58B511D91A9E6C8500147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - 134814041AA4E45400B7C361 /* RCTLocationObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLocationObserver.h; sourceTree = ""; }; + 134814041AA4E45400B7C361 /* RCTLocationObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTLocationObserver.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 134814051AA4E45400B7C361 /* RCTLocationObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLocationObserver.m; sourceTree = ""; }; 134814201AA4EA6300B7C361 /* libRCTGeolocation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTGeolocation.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 58B511D81A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; @@ -66,8 +44,6 @@ buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTGeolocation" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, - 58B511D81A9E6C8500147676 /* Frameworks */, - 58B511D91A9E6C8500147676 /* CopyFiles */, ); buildRules = ( ); @@ -156,10 +132,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -200,10 +173,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/Geolocation/RCTLocationObserver.h b/Libraries/Geolocation/RCTLocationObserver.h index a607155584..631bdf1cc8 100644 --- a/Libraries/Geolocation/RCTLocationObserver.h +++ b/Libraries/Geolocation/RCTLocationObserver.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" +#import @interface RCTLocationObserver : RCTEventEmitter diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m index 4ad49e6bf7..e392db3203 100644 --- a/Libraries/Geolocation/RCTLocationObserver.m +++ b/Libraries/Geolocation/RCTLocationObserver.m @@ -13,11 +13,11 @@ #import #import -#import "RCTAssert.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" -#import "RCTLog.h" +#import +#import +#import +#import +#import typedef NS_ENUM(NSInteger, RCTPositionErrorCode) { RCTPositionErrorDenied = 1, @@ -146,7 +146,7 @@ RCT_EXPORT_MODULE() [_locationManager requestAlwaysAuthorization]; // On iOS 9+ we also need to enable background updates - NSArray* backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"]; + NSArray *backgroundModes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIBackgroundModes"]; if(backgroundModes && [backgroundModes containsObject:@"location"]) { if([_locationManager respondsToSelector:@selector(setAllowsBackgroundLocationUpdates:)]) { [_locationManager setAllowsBackgroundLocationUpdates:YES]; diff --git a/Libraries/Image/RCTGIFImageDecoder.h b/Libraries/Image/RCTGIFImageDecoder.h index 465219e8c2..01128297c3 100644 --- a/Libraries/Image/RCTGIFImageDecoder.h +++ b/Libraries/Image/RCTGIFImageDecoder.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTImageLoader.h" +#import @interface RCTGIFImageDecoder : NSObject diff --git a/Libraries/Image/RCTGIFImageDecoder.m b/Libraries/Image/RCTGIFImageDecoder.m index f32f8f876f..dc3beb7027 100644 --- a/Libraries/Image/RCTGIFImageDecoder.m +++ b/Libraries/Image/RCTGIFImageDecoder.m @@ -13,7 +13,7 @@ #import #import -#import "RCTUtils.h" +#import @implementation RCTGIFImageDecoder diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj index b098776d01..1cba816586 100644 --- a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj +++ b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj @@ -31,98 +31,70 @@ EEF314721C9B0DD30049118E /* RCTImageBlurUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF314711C9B0DD30049118E /* RCTImageBlurUtils.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A28381D9B042B00D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B5115B1A9E6B3D00147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 1304D5A71AA8C4A30002E2BE /* RCTImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageView.h; sourceTree = ""; }; 1304D5A81AA8C4A30002E2BE /* RCTImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageView.m; sourceTree = ""; }; 1304D5A91AA8C4A30002E2BE /* RCTImageViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageViewManager.h; sourceTree = ""; }; 1304D5AA1AA8C4A30002E2BE /* RCTImageViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageViewManager.m; sourceTree = ""; }; - 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTGIFImageDecoder.h; sourceTree = ""; }; + 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTGIFImageDecoder.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1304D5B11AA8C50D0002E2BE /* RCTGIFImageDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTGIFImageDecoder.m; sourceTree = ""; }; 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageUtils.h; sourceTree = ""; }; 134B00A11B54232B00EC8DFB /* RCTImageUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageUtils.m; sourceTree = ""; }; - 139A38821C4D57AD00862840 /* RCTResizeMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTResizeMode.h; sourceTree = ""; }; 139A38831C4D587C00862840 /* RCTResizeMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTResizeMode.m; sourceTree = ""; }; 13EF7F7D1BC825B1003F47DD /* RCTLocalAssetImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLocalAssetImageLoader.h; sourceTree = ""; }; 13EF7F7E1BC825B1003F47DD /* RCTLocalAssetImageLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLocalAssetImageLoader.m; sourceTree = ""; }; - 143879361AAD32A300F088A5 /* RCTImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageLoader.h; sourceTree = ""; }; 143879371AAD32A300F088A5 /* RCTImageLoader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoader.m; sourceTree = ""; }; 2D2A283A1D9B042B00D4039D /* libRCTImage-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTImage-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 35123E691B59C99D00EBAD80 /* RCTImageStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageStoreManager.h; sourceTree = ""; }; 35123E6A1B59C99D00EBAD80 /* RCTImageStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageStoreManager.m; sourceTree = ""; }; - 354631661B69857700AA0B86 /* RCTImageEditingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageEditingManager.h; sourceTree = ""; }; + 354631661B69857700AA0B86 /* RCTImageEditingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTImageEditingManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 354631671B69857700AA0B86 /* RCTImageEditingManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageEditingManager.m; sourceTree = ""; }; + 3D5FA63C1DE4B44A0058FD77 /* RCTImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageLoader.h; sourceTree = ""; }; + 3D5FA63D1DE4B44A0058FD77 /* RCTImageStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageStoreManager.h; sourceTree = ""; }; + 3D5FA63E1DE4B44A0058FD77 /* RCTResizeMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTResizeMode.h; sourceTree = ""; }; + 3D5FA68C1DE4BA290058FD77 /* libRCTNetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRCTNetwork.a; path = "../Network/build/Debug-iphoneos/libRCTNetwork.a"; sourceTree = ""; }; 58B5115D1A9E6B3D00147676 /* libRCTImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTImage.a; sourceTree = BUILT_PRODUCTS_DIR; }; - CCD34C251D4B8FE900268922 /* RCTImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageCache.h; sourceTree = ""; }; + CCD34C251D4B8FE900268922 /* RCTImageCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTImageCache.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; CCD34C261D4B8FE900268922 /* RCTImageCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageCache.m; sourceTree = ""; }; - EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageBlurUtils.h; sourceTree = ""; }; + EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTImageBlurUtils.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; EEF314711C9B0DD30049118E /* RCTImageBlurUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageBlurUtils.m; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A28371D9B042B00D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B5115A1A9E6B3D00147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ + 3D5FA68B1DE4BA290058FD77 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3D5FA68C1DE4BA290058FD77 /* libRCTNetwork.a */, + ); + name = Frameworks; + sourceTree = ""; + }; 58B511541A9E6B3D00147676 = { isa = PBXGroup; children = ( - CCD34C251D4B8FE900268922 /* RCTImageCache.h */, - CCD34C261D4B8FE900268922 /* RCTImageCache.m */, - EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */, - EEF314711C9B0DD30049118E /* RCTImageBlurUtils.m */, - 139A38821C4D57AD00862840 /* RCTResizeMode.h */, - 139A38831C4D587C00862840 /* RCTResizeMode.m */, - 13EF7F7D1BC825B1003F47DD /* RCTLocalAssetImageLoader.h */, - 13EF7F7E1BC825B1003F47DD /* RCTLocalAssetImageLoader.m */, 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */, 1304D5B11AA8C50D0002E2BE /* RCTGIFImageDecoder.m */, + EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */, + EEF314711C9B0DD30049118E /* RCTImageBlurUtils.m */, + CCD34C251D4B8FE900268922 /* RCTImageCache.h */, + CCD34C261D4B8FE900268922 /* RCTImageCache.m */, 354631661B69857700AA0B86 /* RCTImageEditingManager.h */, 354631671B69857700AA0B86 /* RCTImageEditingManager.m */, - 143879361AAD32A300F088A5 /* RCTImageLoader.h */, + 3D5FA63C1DE4B44A0058FD77 /* RCTImageLoader.h */, 143879371AAD32A300F088A5 /* RCTImageLoader.m */, + 3D5FA63D1DE4B44A0058FD77 /* RCTImageStoreManager.h */, + 35123E6A1B59C99D00EBAD80 /* RCTImageStoreManager.m */, + 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */, + 134B00A11B54232B00EC8DFB /* RCTImageUtils.m */, 1304D5A71AA8C4A30002E2BE /* RCTImageView.h */, 1304D5A81AA8C4A30002E2BE /* RCTImageView.m */, 1304D5A91AA8C4A30002E2BE /* RCTImageViewManager.h */, 1304D5AA1AA8C4A30002E2BE /* RCTImageViewManager.m */, - 35123E691B59C99D00EBAD80 /* RCTImageStoreManager.h */, - 35123E6A1B59C99D00EBAD80 /* RCTImageStoreManager.m */, - 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */, - 134B00A11B54232B00EC8DFB /* RCTImageUtils.m */, + 13EF7F7D1BC825B1003F47DD /* RCTLocalAssetImageLoader.h */, + 13EF7F7E1BC825B1003F47DD /* RCTLocalAssetImageLoader.m */, + 3D5FA63E1DE4B44A0058FD77 /* RCTResizeMode.h */, + 139A38831C4D587C00862840 /* RCTResizeMode.m */, 58B5115E1A9E6B3D00147676 /* Products */, + 3D5FA68B1DE4BA290058FD77 /* Frameworks */, ); indentWidth = 2; sourceTree = ""; @@ -145,8 +117,6 @@ buildConfigurationList = 2D2A28421D9B042B00D4039D /* Build configuration list for PBXNativeTarget "RCTImage-tvOS" */; buildPhases = ( 2D2A28361D9B042B00D4039D /* Sources */, - 2D2A28371D9B042B00D4039D /* Frameworks */, - 2D2A28381D9B042B00D4039D /* CopyFiles */, ); buildRules = ( ); @@ -162,8 +132,6 @@ buildConfigurationList = 58B511711A9E6B3D00147676 /* Build configuration list for PBXNativeTarget "RCTImage" */; buildPhases = ( 58B511591A9E6B3D00147676 /* Sources */, - 58B5115A1A9E6B3D00147676 /* Frameworks */, - 58B5115B1A9E6B3D00147676 /* CopyFiles */, ); buildRules = ( ); @@ -180,7 +148,7 @@ 58B511551A9E6B3D00147676 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0810; ORGANIZATIONNAME = Facebook; TargetAttributes = { 2D2A28391D9B042B00D4039D = { @@ -299,14 +267,18 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -321,15 +293,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Network"; WARNING_CFLAGS = ( "-Werror", "-Wall", @@ -350,14 +318,17 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; @@ -366,14 +337,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../Network"; VALIDATE_PRODUCT = YES; WARNING_CFLAGS = ( "-Werror", diff --git a/Libraries/Image/RCTImageBlurUtils.h b/Libraries/Image/RCTImageBlurUtils.h index d6c6904d91..db8c909437 100644 --- a/Libraries/Image/RCTImageBlurUtils.h +++ b/Libraries/Image/RCTImageBlurUtils.h @@ -11,6 +11,6 @@ #import #import -#import "RCTDefines.h" +#import RCT_EXTERN UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius); diff --git a/Libraries/Image/RCTImageCache.h b/Libraries/Image/RCTImageCache.h index 95f85aad98..b0cf1b6925 100644 --- a/Libraries/Image/RCTImageCache.h +++ b/Libraries/Image/RCTImageCache.h @@ -9,7 +9,7 @@ #import -#import "RCTImageLoader.h" +#import @interface RCTImageCache : NSObject @end diff --git a/Libraries/Image/RCTImageCache.m b/Libraries/Image/RCTImageCache.m index 0af2be95c0..43d5aeafeb 100644 --- a/Libraries/Image/RCTImageCache.m +++ b/Libraries/Image/RCTImageCache.m @@ -9,16 +9,16 @@ #import "RCTImageCache.h" -#import - #import - #import -#import "RCTConvert.h" +#import + +#import +#import +#import + #import "RCTImageUtils.h" -#import "RCTNetworking.h" -#import "RCTUtils.h" static const NSUInteger RCTMaxCachableDecodedImageSizeInBytes = 1048576; // 1MB diff --git a/Libraries/Image/RCTImageEditingManager.h b/Libraries/Image/RCTImageEditingManager.h index 1f45ff95fa..e2d87600db 100644 --- a/Libraries/Image/RCTImageEditingManager.h +++ b/Libraries/Image/RCTImageEditingManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import @interface RCTImageEditingManager : NSObject diff --git a/Libraries/Image/RCTImageEditingManager.m b/Libraries/Image/RCTImageEditingManager.m index bb65990ba7..89341f6526 100644 --- a/Libraries/Image/RCTImageEditingManager.m +++ b/Libraries/Image/RCTImageEditingManager.m @@ -11,13 +11,13 @@ #import -#import "RCTConvert.h" -#import "RCTLog.h" -#import "RCTUtils.h" -#import "RCTImageUtils.h" +#import +#import +#import -#import "RCTImageStoreManager.h" #import "RCTImageLoader.h" +#import "RCTImageStoreManager.h" +#import "RCTImageUtils.h" @implementation RCTImageEditingManager diff --git a/Libraries/Image/RCTImageLoader.h b/Libraries/Image/RCTImageLoader.h index 55cb27e3a6..3f7e738520 100644 --- a/Libraries/Image/RCTImageLoader.h +++ b/Libraries/Image/RCTImageLoader.h @@ -9,9 +9,9 @@ #import -#import "RCTBridge.h" -#import "RCTURLRequestHandler.h" -#import "RCTResizeMode.h" +#import +#import +#import typedef void (^RCTImageLoaderProgressBlock)(int64_t progress, int64_t total); typedef void (^RCTImageLoaderPartialLoadBlock)(UIImage *image); diff --git a/Libraries/Image/RCTImageLoader.m b/Libraries/Image/RCTImageLoader.m index cca84ba73d..0b49fe23b0 100644 --- a/Libraries/Image/RCTImageLoader.m +++ b/Libraries/Image/RCTImageLoader.m @@ -7,21 +7,20 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTImageLoader.h" +#import +#import #import -#import +#import +#import +#import +#import +#import +#import -#import - -#import "RCTConvert.h" -#import "RCTDefines.h" #import "RCTImageCache.h" #import "RCTImageUtils.h" -#import "RCTLog.h" -#import "RCTNetworking.h" -#import "RCTUtils.h" @implementation UIImage (React) diff --git a/Libraries/Image/RCTImageStoreManager.h b/Libraries/Image/RCTImageStoreManager.h index 0d789f1e37..9d7ddffd47 100644 --- a/Libraries/Image/RCTImageStoreManager.h +++ b/Libraries/Image/RCTImageStoreManager.h @@ -2,8 +2,8 @@ #import -#import "RCTBridge.h" -#import "RCTURLRequestHandler.h" +#import +#import @interface RCTImageStoreManager : NSObject diff --git a/Libraries/Image/RCTImageStoreManager.m b/Libraries/Image/RCTImageStoreManager.m index c33ee08e42..7df7a3a393 100644 --- a/Libraries/Image/RCTImageStoreManager.m +++ b/Libraries/Image/RCTImageStoreManager.m @@ -9,14 +9,16 @@ #import "RCTImageStoreManager.h" -#import #import + +#import #import -#import "RCTAssert.h" +#import +#import +#import + #import "RCTImageUtils.h" -#import "RCTLog.h" -#import "RCTUtils.h" static NSString *const RCTImageStoreURLScheme = @"rct-image-store"; diff --git a/Libraries/Image/RCTImageUtils.h b/Libraries/Image/RCTImageUtils.h index f870bda675..5012a66d22 100644 --- a/Libraries/Image/RCTImageUtils.h +++ b/Libraries/Image/RCTImageUtils.h @@ -10,8 +10,8 @@ #import -#import "RCTDefines.h" -#import "RCTResizeMode.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Libraries/Image/RCTImageUtils.m b/Libraries/Image/RCTImageUtils.m index ce7a5530bb..1fdf11e903 100644 --- a/Libraries/Image/RCTImageUtils.m +++ b/Libraries/Image/RCTImageUtils.m @@ -9,12 +9,13 @@ #import "RCTImageUtils.h" -#import -#import #import -#import "RCTLog.h" -#import "RCTUtils.h" +#import +#import + +#import +#import static CGFloat RCTCeilValue(CGFloat value, CGFloat scale) { diff --git a/Libraries/Image/RCTImageView.h b/Libraries/Image/RCTImageView.h index 230a557710..7c632b3bfa 100644 --- a/Libraries/Image/RCTImageView.h +++ b/Libraries/Image/RCTImageView.h @@ -8,7 +8,8 @@ */ #import -#import "RCTResizeMode.h" + +#import @class RCTBridge; @class RCTImageSource; diff --git a/Libraries/Image/RCTImageView.m b/Libraries/Image/RCTImageView.m index 2680990850..6387987e69 100644 --- a/Libraries/Image/RCTImageView.m +++ b/Libraries/Image/RCTImageView.m @@ -9,16 +9,16 @@ #import "RCTImageView.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" -#import "RCTImageLoader.h" -#import "RCTImageSource.h" -#import "RCTImageUtils.h" -#import "RCTUtils.h" -#import "RCTImageBlurUtils.h" +#import +#import +#import +#import +#import +#import -#import "UIView+React.h" +#import "RCTImageBlurUtils.h" +#import "RCTImageLoader.h" +#import "RCTImageUtils.h" /** * Determines whether an image of `currentSize` should be reloaded for display diff --git a/Libraries/Image/RCTImageViewManager.h b/Libraries/Image/RCTImageViewManager.h index 4e8d3fac45..60ba85df17 100644 --- a/Libraries/Image/RCTImageViewManager.h +++ b/Libraries/Image/RCTImageViewManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTImageViewManager : RCTViewManager diff --git a/Libraries/Image/RCTImageViewManager.m b/Libraries/Image/RCTImageViewManager.m index b7d2739465..2d044fb038 100644 --- a/Libraries/Image/RCTImageViewManager.m +++ b/Libraries/Image/RCTImageViewManager.m @@ -11,9 +11,10 @@ #import -#import "RCTConvert.h" +#import +#import + #import "RCTImageLoader.h" -#import "RCTImageSource.h" #import "RCTImageView.h" @implementation RCTImageViewManager diff --git a/Libraries/Image/RCTLocalAssetImageLoader.h b/Libraries/Image/RCTLocalAssetImageLoader.h index bf6e5c675a..011484f2d8 100644 --- a/Libraries/Image/RCTLocalAssetImageLoader.h +++ b/Libraries/Image/RCTLocalAssetImageLoader.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTImageLoader.h" +#import @interface RCTLocalAssetImageLoader : NSObject diff --git a/Libraries/Image/RCTLocalAssetImageLoader.m b/Libraries/Image/RCTLocalAssetImageLoader.m index 66e8f903d6..4a4258d538 100644 --- a/Libraries/Image/RCTLocalAssetImageLoader.m +++ b/Libraries/Image/RCTLocalAssetImageLoader.m @@ -11,7 +11,7 @@ #import -#import "RCTUtils.h" +#import @implementation RCTLocalAssetImageLoader diff --git a/Libraries/Image/RCTResizeMode.h b/Libraries/Image/RCTResizeMode.h index 2b79145424..52f8880738 100644 --- a/Libraries/Image/RCTResizeMode.h +++ b/Libraries/Image/RCTResizeMode.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTConvert.h" +#import typedef NS_ENUM(NSInteger, RCTResizeMode) { RCTResizeModeCover = UIViewContentModeScaleAspectFill, diff --git a/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj b/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj index 8cbdf2e3f2..e262c3f048 100644 --- a/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj +++ b/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj @@ -11,27 +11,6 @@ 2D3B5F251D9B0DE600451313 /* RCTLinkingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 148699CE1ABD045300480536 /* RCTLinkingManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A28451D9B043800D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D91A9E6C8500147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libRCTLinking.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTLinking.a; sourceTree = BUILT_PRODUCTS_DIR; }; 148699CD1ABD045300480536 /* RCTLinkingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLinkingManager.h; sourceTree = ""; }; @@ -39,23 +18,6 @@ 2D2A28471D9B043800D4039D /* libRCTLinking-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTLinking-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A28441D9B043800D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D81A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; @@ -83,8 +45,6 @@ buildConfigurationList = 2D2A284F1D9B043800D4039D /* Build configuration list for PBXNativeTarget "RCTLinking-tvOS" */; buildPhases = ( 2D2A28431D9B043800D4039D /* Sources */, - 2D2A28441D9B043800D4039D /* Frameworks */, - 2D2A28451D9B043800D4039D /* CopyFiles */, ); buildRules = ( ); @@ -100,8 +60,6 @@ buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTLinking" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, - 58B511D81A9E6C8500147676 /* Frameworks */, - 58B511D91A9E6C8500147676 /* CopyFiles */, ); buildRules = ( ); @@ -238,10 +196,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -281,10 +236,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/LinkingIOS/RCTLinkingManager.h b/Libraries/LinkingIOS/RCTLinkingManager.h index bea92bb719..b4bb4b5ce5 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.h +++ b/Libraries/LinkingIOS/RCTLinkingManager.h @@ -9,7 +9,7 @@ #import -#import "RCTEventEmitter.h" +#import @interface RCTLinkingManager : RCTEventEmitter diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m index faa1d972b1..dd1ef03810 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.m +++ b/Libraries/LinkingIOS/RCTLinkingManager.m @@ -9,9 +9,9 @@ #import "RCTLinkingManager.h" -#import "RCTBridge.h" -#import "RCTEventDispatcher.h" -#import "RCTUtils.h" +#import +#import +#import NSString *const RCTOpenURLNotification = @"RCTOpenURLNotification"; diff --git a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h index 1911c1a533..90fdf78c14 100644 --- a/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h +++ b/Libraries/NativeAnimation/Drivers/RCTAnimationDriver.h @@ -8,7 +8,8 @@ */ #import -#import "RCTBridgeModule.h" + +#import @class RCTValueAnimatedNode; diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h index 4b8eefd1fd..9fef45c83e 100644 --- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h +++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h @@ -7,10 +7,9 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import +#import #import "RCTValueAnimatedNode.h" -#import "RCTEventDispatcher.h" @interface RCTEventAnimation : NSObject diff --git a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m index b74d7811b7..40fb4137a4 100644 --- a/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m +++ b/Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m @@ -11,9 +11,10 @@ #import -#import "RCTConvert.h" +#import +#import + #import "RCTAnimationUtils.h" -#import "RCTDefines.h" #import "RCTValueAnimatedNode.h" const double SINGLE_FRAME_INTERVAL = 1.0 / 60.0; diff --git a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m index 0c787500c2..94751c8715 100644 --- a/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m +++ b/Libraries/NativeAnimation/Drivers/RCTSpringAnimation.m @@ -11,9 +11,10 @@ #import -#import "RCTConvert.h" +#import +#import + #import "RCTAnimationUtils.h" -#import "RCTDefines.h" #import "RCTValueAnimatedNode.h" @interface RCTSpringAnimation () diff --git a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m index 9f5075b622..1810109e0e 100644 --- a/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.m @@ -9,7 +9,7 @@ #import "RCTAnimatedNode.h" -#import "RCTDefines.h" +#import @implementation RCTAnimatedNode { diff --git a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m index 2bdcf5fb39..0be3102de6 100644 --- a/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTDiffClampAnimatedNode.m @@ -8,7 +8,8 @@ */ #import "RCTDiffClampAnimatedNode.h" -#import "RCTLog.h" + +#import @implementation RCTDiffClampAnimatedNode { @@ -55,7 +56,7 @@ RCTLogError(@"Illegal node ID set as an input for Animated.DiffClamp node"); return 0; } - + return inputNode.value; } diff --git a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m index ae2423e545..28a95c8467 100644 --- a/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m +++ b/Libraries/NativeAnimation/Nodes/RCTDivisionAnimatedNode.m @@ -8,7 +8,8 @@ */ #import "RCTDivisionAnimatedNode.h" -#import "RCTLog.h" + +#import @implementation RCTDivisionAnimatedNode diff --git a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h index fb0b288543..5b66520b82 100644 --- a/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h +++ b/Libraries/NativeAnimation/Nodes/RCTValueAnimatedNode.h @@ -7,9 +7,10 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTAnimatedNode.h" #import +#import "RCTAnimatedNode.h" + @class RCTValueAnimatedNode; @protocol RCTValueAnimatedNodeObserver diff --git a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj index 6a58cd09bd..3a2608e7da 100644 --- a/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj +++ b/Libraries/NativeAnimation/RCTAnimation.xcodeproj/project.pbxproj @@ -43,84 +43,46 @@ 94DAE3F91D7334A70059942F /* RCTModuloAnimatedNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 94DAE3F81D7334A70059942F /* RCTModuloAnimatedNode.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A281E1D9B03D100D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D91A9E6C8500147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libRCTAnimation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTAnimation.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAnimationUtils.h; sourceTree = ""; }; + 13E501B71D07A644005F35D8 /* RCTAnimationUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAnimationUtils.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501B81D07A644005F35D8 /* RCTAnimationUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAnimationUtils.m; sourceTree = ""; }; - 13E501BD1D07A644005F35D8 /* RCTNativeAnimatedModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNativeAnimatedModule.h; sourceTree = ""; }; + 13E501BD1D07A644005F35D8 /* RCTNativeAnimatedModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTNativeAnimatedModule.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501BE1D07A644005F35D8 /* RCTNativeAnimatedModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNativeAnimatedModule.m; sourceTree = ""; }; 13E501C71D07A644005F35D8 /* RCTViewPropertyMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTViewPropertyMapper.h; sourceTree = ""; }; 13E501C81D07A644005F35D8 /* RCTViewPropertyMapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTViewPropertyMapper.m; sourceTree = ""; }; - 13E501D61D07A6C9005F35D8 /* RCTAdditionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAdditionAnimatedNode.h; sourceTree = ""; }; + 13E501D61D07A6C9005F35D8 /* RCTAdditionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAdditionAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501D71D07A6C9005F35D8 /* RCTAdditionAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAdditionAnimatedNode.m; sourceTree = ""; }; 13E501D81D07A6C9005F35D8 /* RCTAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAnimatedNode.h; sourceTree = ""; }; 13E501D91D07A6C9005F35D8 /* RCTAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAnimatedNode.m; sourceTree = ""; }; - 13E501DC1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInterpolationAnimatedNode.h; sourceTree = ""; }; + 13E501DC1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTInterpolationAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501DD1D07A6C9005F35D8 /* RCTInterpolationAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInterpolationAnimatedNode.m; sourceTree = ""; }; - 13E501DE1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMultiplicationAnimatedNode.h; sourceTree = ""; }; + 13E501DE1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTMultiplicationAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501DF1D07A6C9005F35D8 /* RCTMultiplicationAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMultiplicationAnimatedNode.m; sourceTree = ""; }; - 13E501E01D07A6C9005F35D8 /* RCTPropsAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPropsAnimatedNode.h; sourceTree = ""; }; + 13E501E01D07A6C9005F35D8 /* RCTPropsAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTPropsAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501E11D07A6C9005F35D8 /* RCTPropsAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPropsAnimatedNode.m; sourceTree = ""; }; - 13E501E21D07A6C9005F35D8 /* RCTStyleAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTStyleAnimatedNode.h; sourceTree = ""; }; + 13E501E21D07A6C9005F35D8 /* RCTStyleAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTStyleAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501E31D07A6C9005F35D8 /* RCTStyleAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTStyleAnimatedNode.m; sourceTree = ""; }; - 13E501E41D07A6C9005F35D8 /* RCTTransformAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTransformAnimatedNode.h; sourceTree = ""; }; + 13E501E41D07A6C9005F35D8 /* RCTTransformAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTTransformAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501E51D07A6C9005F35D8 /* RCTTransformAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTransformAnimatedNode.m; sourceTree = ""; }; - 13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTValueAnimatedNode.h; sourceTree = ""; }; + 13E501E61D07A6C9005F35D8 /* RCTValueAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTValueAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13E501E71D07A6C9005F35D8 /* RCTValueAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTValueAnimatedNode.m; sourceTree = ""; }; - 193F64F21D776EC6004D1CAA /* RCTDiffClampAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDiffClampAnimatedNode.h; sourceTree = ""; }; + 193F64F21D776EC6004D1CAA /* RCTDiffClampAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDiffClampAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 193F64F31D776EC6004D1CAA /* RCTDiffClampAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDiffClampAnimatedNode.m; sourceTree = ""; }; - 19F00F201DC8847500113FEE /* RCTEventAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTEventAnimation.h; sourceTree = ""; }; + 19F00F201DC8847500113FEE /* RCTEventAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTEventAnimation.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 19F00F211DC8847500113FEE /* RCTEventAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventAnimation.m; sourceTree = ""; }; 2D2A28201D9B03D100D4039D /* libRCTAnimation-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTAnimation-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDivisionAnimatedNode.h; sourceTree = ""; }; + 5C9894931D999639008027DB /* RCTDivisionAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDivisionAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 5C9894941D999639008027DB /* RCTDivisionAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDivisionAnimatedNode.m; sourceTree = ""; }; - 94C1294A1D4069170025F25C /* RCTAnimationDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTAnimationDriver.h; sourceTree = ""; }; - 94C1294C1D4069170025F25C /* RCTFrameAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTFrameAnimation.h; sourceTree = ""; }; + 94C1294A1D4069170025F25C /* RCTAnimationDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTAnimationDriver.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 94C1294C1D4069170025F25C /* RCTFrameAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTFrameAnimation.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 94C1294D1D4069170025F25C /* RCTFrameAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTFrameAnimation.m; sourceTree = ""; }; - 94C1294E1D4069170025F25C /* RCTSpringAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTSpringAnimation.h; sourceTree = ""; }; + 94C1294E1D4069170025F25C /* RCTSpringAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTSpringAnimation.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 94C1294F1D4069170025F25C /* RCTSpringAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTSpringAnimation.m; sourceTree = ""; }; - 94DAE3F71D7334A70059942F /* RCTModuloAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTModuloAnimatedNode.h; sourceTree = ""; }; + 94DAE3F71D7334A70059942F /* RCTModuloAnimatedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTModuloAnimatedNode.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 94DAE3F81D7334A70059942F /* RCTModuloAnimatedNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTModuloAnimatedNode.m; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A281D1D9B03D100D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D81A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; @@ -197,8 +159,6 @@ buildConfigurationList = 2D2A28281D9B03D100D4039D /* Build configuration list for PBXNativeTarget "RCTAnimation-tvOS" */; buildPhases = ( 2D2A281C1D9B03D100D4039D /* Sources */, - 2D2A281D1D9B03D100D4039D /* Frameworks */, - 2D2A281E1D9B03D100D4039D /* CopyFiles */, ); buildRules = ( ); @@ -214,8 +174,6 @@ buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTAnimation" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, - 58B511D81A9E6C8500147676 /* Frameworks */, - 58B511D91A9E6C8500147676 /* CopyFiles */, ); buildRules = ( ); @@ -385,10 +343,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -429,10 +384,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.h b/Libraries/NativeAnimation/RCTAnimationUtils.h index 9f0d3c1686..dde6e697b4 100644 --- a/Libraries/NativeAnimation/RCTAnimationUtils.h +++ b/Libraries/NativeAnimation/RCTAnimationUtils.h @@ -7,14 +7,14 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import #import +#import -#import "RCTDefines.h" +#import -static NSString * const EXTRAPOLATE_TYPE_IDENTITY = @"identity"; -static NSString * const EXTRAPOLATE_TYPE_CLAMP = @"clamp"; -static NSString * const EXTRAPOLATE_TYPE_EXTEND = @"extend"; +static NSString *const EXTRAPOLATE_TYPE_IDENTITY = @"identity"; +static NSString *const EXTRAPOLATE_TYPE_CLAMP = @"clamp"; +static NSString *const EXTRAPOLATE_TYPE_EXTEND = @"extend"; RCT_EXTERN CGFloat RCTInterpolateValue(CGFloat value, CGFloat inputMin, diff --git a/Libraries/NativeAnimation/RCTAnimationUtils.m b/Libraries/NativeAnimation/RCTAnimationUtils.m index 2ba15b0af4..fc2b216121 100644 --- a/Libraries/NativeAnimation/RCTAnimationUtils.m +++ b/Libraries/NativeAnimation/RCTAnimationUtils.m @@ -9,7 +9,7 @@ #import "RCTAnimationUtils.h" -#import "RCTLog.h" +#import /** * Interpolates value by remapping it linearly fromMin->fromMax to toMin->toMax diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h index 55cdf705f7..48b0214814 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h +++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h @@ -6,10 +6,11 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import +#import +#import + #import "RCTValueAnimatedNode.h" -#import "RCTEventEmitter.h" -#import "RCTEventDispatcher.h" @interface RCTNativeAnimatedModule : RCTEventEmitter diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m index 819d3937e9..86027d3b42 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.m +++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.m @@ -8,21 +8,22 @@ */ #import "RCTNativeAnimatedModule.h" +#import +#import +#import + #import "RCTAdditionAnimatedNode.h" #import "RCTAnimationDriver.h" -#import "RCTFrameAnimation.h" -#import "RCTSpringAnimation.h" #import "RCTAnimationUtils.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTEventAnimation.h" -#import "RCTInterpolationAnimatedNode.h" -#import "RCTLog.h" #import "RCTDiffClampAnimatedNode.h" #import "RCTDivisionAnimatedNode.h" +#import "RCTEventAnimation.h" +#import "RCTFrameAnimation.h" +#import "RCTInterpolationAnimatedNode.h" #import "RCTModuloAnimatedNode.h" #import "RCTMultiplicationAnimatedNode.h" #import "RCTPropsAnimatedNode.h" +#import "RCTSpringAnimation.h" #import "RCTStyleAnimatedNode.h" #import "RCTTransformAnimatedNode.h" #import "RCTValueAnimatedNode.h" @@ -145,7 +146,7 @@ RCT_EXPORT_METHOD(startAnimatingNode:(nonnull NSNumber *)animationId RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)_animationNodes[nodeTag]; NSString *type = config[@"type"]; - idanimationDriver; + id animationDriver; if ([type isEqual:@"frames"]) { animationDriver = [[RCTFrameAnimation alloc] initWithId:animationId @@ -172,7 +173,7 @@ RCT_EXPORT_METHOD(startAnimatingNode:(nonnull NSNumber *)animationId RCT_EXPORT_METHOD(stopAnimation:(nonnull NSNumber *)animationId) { - iddriver = _animationDrivers[animationId]; + id driver = _animationDrivers[animationId]; if (driver) { [driver removeAnimation]; [_animationDrivers removeObjectForKey:animationId]; @@ -368,7 +369,7 @@ RCT_EXPORT_METHOD(removeAnimatedEventFromView:(nonnull NSNumber *)viewTag { // Step Current active animations // This also recursively marks children nodes as needing update - for (idanimationDriver in _activeAnimations) { + for (id animationDriver in _activeAnimations) { [animationDriver stepAnimation]; } @@ -379,7 +380,7 @@ RCT_EXPORT_METHOD(removeAnimatedEventFromView:(nonnull NSNumber *)viewTag } // Cleanup nodes and prepare for next cycle. Remove updated nodes from bucket. - for (iddriverNode in _activeAnimations) { + for (id driverNode in _activeAnimations) { [driverNode cleanupAnimationUpdate]; } for (RCTValueAnimatedNode *valueNode in _updatedValueNodes) { @@ -387,13 +388,13 @@ RCT_EXPORT_METHOD(removeAnimatedEventFromView:(nonnull NSNumber *)viewTag } [_updatedValueNodes removeAllObjects]; - for (iddriverNode in _activeAnimations) { + for (id driverNode in _activeAnimations) { if (driverNode.animationHasFinished) { [driverNode removeAnimation]; [_finishedAnimations addObject:driverNode]; } } - for (iddriverNode in _finishedAnimations) { + for (id driverNode in _finishedAnimations) { [_activeAnimations removeObject:driverNode]; [_animationDrivers removeObjectForKey:driverNode.animationId]; } diff --git a/Libraries/NativeAnimation/RCTViewPropertyMapper.m b/Libraries/NativeAnimation/RCTViewPropertyMapper.m index c38296b903..727d03d791 100644 --- a/Libraries/NativeAnimation/RCTViewPropertyMapper.m +++ b/Libraries/NativeAnimation/RCTViewPropertyMapper.m @@ -11,9 +11,10 @@ #import -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTUIManager.h" +#import +#import +#import + #import "RCTNativeAnimatedModule.h" @implementation RCTViewPropertyMapper diff --git a/Libraries/Network/RCTDataRequestHandler.h b/Libraries/Network/RCTDataRequestHandler.h index 81829a5c57..11f84592ec 100644 --- a/Libraries/Network/RCTDataRequestHandler.h +++ b/Libraries/Network/RCTDataRequestHandler.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTURLRequestHandler.h" -#import "RCTInvalidating.h" +#import +#import /** * This is the default RCTURLRequestHandler implementation for data URL requests. diff --git a/Libraries/Network/RCTFileRequestHandler.h b/Libraries/Network/RCTFileRequestHandler.h index 3fe5a17729..261e7a0fbf 100644 --- a/Libraries/Network/RCTFileRequestHandler.h +++ b/Libraries/Network/RCTFileRequestHandler.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTURLRequestHandler.h" -#import "RCTInvalidating.h" +#import +#import /** * This is the default RCTURLRequestHandler implementation for file requests. diff --git a/Libraries/Network/RCTFileRequestHandler.m b/Libraries/Network/RCTFileRequestHandler.m index 5e341a1fcb..da0b97968b 100644 --- a/Libraries/Network/RCTFileRequestHandler.m +++ b/Libraries/Network/RCTFileRequestHandler.m @@ -11,7 +11,7 @@ #import -#import "RCTUtils.h" +#import @implementation RCTFileRequestHandler { diff --git a/Libraries/Network/RCTHTTPRequestHandler.h b/Libraries/Network/RCTHTTPRequestHandler.h index 155491e631..b2395ce4d5 100644 --- a/Libraries/Network/RCTHTTPRequestHandler.h +++ b/Libraries/Network/RCTHTTPRequestHandler.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTURLRequestHandler.h" -#import "RCTInvalidating.h" +#import +#import /** * This is the default RCTURLRequestHandler implementation for HTTP requests. diff --git a/Libraries/Network/RCTNetInfo.h b/Libraries/Network/RCTNetInfo.h index 9c280b2cf4..fabc291e0f 100644 --- a/Libraries/Network/RCTNetInfo.h +++ b/Libraries/Network/RCTNetInfo.h @@ -9,7 +9,7 @@ #import -#import "RCTEventEmitter.h" +#import @interface RCTNetInfo : RCTEventEmitter diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m index 5981e9f7f8..2e44a42934 100644 --- a/Libraries/Network/RCTNetInfo.m +++ b/Libraries/Network/RCTNetInfo.m @@ -9,9 +9,9 @@ #import "RCTNetInfo.h" -#import "RCTAssert.h" -#import "RCTBridge.h" -#import "RCTEventDispatcher.h" +#import +#import +#import static NSString *const RCTReachabilityStateUnknown = @"unknown"; static NSString *const RCTReachabilityStateNone = @"none"; diff --git a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj index b61c43723c..b25a9b8fad 100644 --- a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj +++ b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj @@ -21,61 +21,23 @@ 58B512081A9E6CE300147676 /* RCTNetworking.mm in Sources */ = {isa = PBXBuildFile; fileRef = 58B512071A9E6CE300147676 /* RCTNetworking.mm */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A28521D9B044C00D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D91A9E6C8500147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 134E96981BCEB7F800AFFDA1 /* RCTDataRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDataRequestHandler.h; sourceTree = ""; }; 134E96991BCEB7F800AFFDA1 /* RCTDataRequestHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDataRequestHandler.m; sourceTree = ""; }; 1372B7351AB03E7B00659ED6 /* RCTNetInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTNetInfo.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1372B7361AB03E7B00659ED6 /* RCTNetInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = RCTNetInfo.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 13D6D6681B5FCF8200883BE9 /* RCTNetworkTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworkTask.h; sourceTree = ""; }; + 13D6D6681B5FCF8200883BE9 /* RCTNetworkTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTNetworkTask.h; sourceTree = ""; }; 13D6D6691B5FCF8200883BE9 /* RCTNetworkTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTNetworkTask.m; sourceTree = ""; }; 13EF800C1BCBE015003F47DD /* RCTFileRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTFileRequestHandler.h; sourceTree = ""; }; 13EF800D1BCBE015003F47DD /* RCTFileRequestHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTFileRequestHandler.m; sourceTree = ""; }; 2D2A28541D9B044C00D4039D /* libRCTNetwork-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTNetwork-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 352DA0B71B17855800AA15A8 /* RCTHTTPRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTHTTPRequestHandler.h; sourceTree = ""; }; 352DA0B81B17855800AA15A8 /* RCTHTTPRequestHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTHTTPRequestHandler.mm; sourceTree = ""; }; + 3D5FA63F1DE4B4790058FD77 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = ""; }; 58B511DB1A9E6C8500147676 /* libRCTNetwork.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTNetwork.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 58B512061A9E6CE300147676 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = ""; }; 58B512071A9E6CE300147676 /* RCTNetworking.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTNetworking.mm; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A28511D9B044C00D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D81A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 58B511D21A9E6C8500147676 = { isa = PBXGroup; @@ -90,7 +52,7 @@ 134E96991BCEB7F800AFFDA1 /* RCTDataRequestHandler.m */, 1372B7351AB03E7B00659ED6 /* RCTNetInfo.h */, 1372B7361AB03E7B00659ED6 /* RCTNetInfo.m */, - 58B512061A9E6CE300147676 /* RCTNetworking.h */, + 3D5FA63F1DE4B4790058FD77 /* RCTNetworking.h */, 58B512071A9E6CE300147676 /* RCTNetworking.mm */, 58B511DC1A9E6C8500147676 /* Products */, ); @@ -115,8 +77,6 @@ buildConfigurationList = 2D2A285C1D9B044C00D4039D /* Build configuration list for PBXNativeTarget "RCTNetwork-tvOS" */; buildPhases = ( 2D2A28501D9B044C00D4039D /* Sources */, - 2D2A28511D9B044C00D4039D /* Frameworks */, - 2D2A28521D9B044C00D4039D /* CopyFiles */, ); buildRules = ( ); @@ -132,8 +92,6 @@ buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTNetwork" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, - 58B511D81A9E6C8500147676 /* Frameworks */, - 58B511D91A9E6C8500147676 /* CopyFiles */, ); buildRules = ( ); @@ -150,7 +108,7 @@ 58B511D31A9E6C8500147676 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0810; ORGANIZATIONNAME = Facebook; TargetAttributes = { 2D2A28531D9B044C00D4039D = { @@ -259,14 +217,18 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -281,10 +243,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -309,14 +268,17 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; @@ -325,10 +287,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/Network/RCTNetworkTask.h b/Libraries/Network/RCTNetworkTask.h index 05097260f5..f39e32a50c 100644 --- a/Libraries/Network/RCTNetworkTask.h +++ b/Libraries/Network/RCTNetworkTask.h @@ -9,8 +9,8 @@ #import -#import "RCTURLRequestDelegate.h" -#import "RCTURLRequestHandler.h" +#import +#import typedef void (^RCTURLRequestCompletionBlock)(NSURLResponse *response, NSData *data, NSError *error); typedef void (^RCTURLRequestCancellationBlock)(void); diff --git a/Libraries/Network/RCTNetworkTask.m b/Libraries/Network/RCTNetworkTask.m index 1a177fca06..409da0e719 100644 --- a/Libraries/Network/RCTNetworkTask.m +++ b/Libraries/Network/RCTNetworkTask.m @@ -7,10 +7,9 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTNetworkTask.h" - -#import "RCTLog.h" -#import "RCTUtils.h" +#import +#import +#import @implementation RCTNetworkTask { diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h index a06a1eeab9..eabc411617 100644 --- a/Libraries/Network/RCTNetworking.h +++ b/Libraries/Network/RCTNetworking.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" -#import "RCTNetworkTask.h" +#import +#import @interface RCTNetworking : RCTEventEmitter diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm index 994eac4684..70d2ede18e 100644 --- a/Libraries/Network/RCTNetworking.mm +++ b/Libraries/Network/RCTNetworking.mm @@ -7,18 +7,19 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTNetworking.h" -#include +#import + +#import +#import +#import +#import +#import +#import +#import +#import -#import "RCTAssert.h" -#import "RCTConvert.h" -#import "RCTNetworkTask.h" -#import "RCTURLRequestHandler.h" -#import "RCTEventDispatcher.h" #import "RCTHTTPRequestHandler.h" -#import "RCTLog.h" -#import "RCTUtils.h" typedef RCTURLRequestCancellationBlock (^RCTHTTPQueryResult)(NSError *error, NSDictionary *result); @@ -246,7 +247,7 @@ RCT_EXPORT_MODULE() NSString *dataContentType = result[@"contentType"]; NSString *requestContentType = [request valueForHTTPHeaderField:@"Content-Type"]; BOOL isMultipart = [dataContentType hasPrefix:@"multipart"]; - + // For multipart requests we need to override caller-specified content type with one // from the data object, because it contains the boundary string if (dataContentType && ([requestContentType length] == 0 || isMultipart)) { @@ -333,43 +334,43 @@ RCT_EXPORT_MODULE() return callback(nil, nil); } -+ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData*)inputCarryData ++ (NSString *)decodeTextData:(NSData *)data fromResponse:(NSURLResponse *)response withCarryData:(NSMutableData *)inputCarryData { NSStringEncoding encoding = NSUTF8StringEncoding; if (response.textEncodingName) { CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)response.textEncodingName); encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding); } - - NSMutableData* currentCarryData = inputCarryData ?: [NSMutableData new]; + + NSMutableData *currentCarryData = inputCarryData ?: [NSMutableData new]; [currentCarryData appendData:data]; - + // Attempt to decode text NSString *encodedResponse = [[NSString alloc] initWithData:currentCarryData encoding:encoding]; - + if (!encodedResponse && data.length > 0) { if (encoding == NSUTF8StringEncoding && inputCarryData) { // If decode failed, we attempt to trim broken character bytes from the data. // At this time, only UTF-8 support is enabled. Multibyte encodings, such as UTF-16 and UTF-32, require a lot of additional work // to determine wether BOM was included in the first data packet. If so, save it, and attach it to each new data packet. If not, // an encoding has to be selected with a suitable byte order (for ARM iOS, it would be little endianness). - + CFStringEncoding cfEncoding = CFStringConvertNSStringEncodingToEncoding(encoding); // Taking a single unichar is not good enough, due to Unicode combining character sequences or characters outside the BMP. // See https://www.objc.io/issues/9-strings/unicode/#common-pitfalls // We'll attempt with a sequence of two characters, the most common combining character sequence and characters outside the BMP (emojis). CFIndex maxCharLength = CFStringGetMaximumSizeForEncoding(2, cfEncoding); - + NSUInteger removedBytes = 1; - + while (removedBytes < maxCharLength) { encodedResponse = [[NSString alloc] initWithData:[currentCarryData subdataWithRange:NSMakeRange(0, currentCarryData.length - removedBytes)] encoding:encoding]; - + if (encodedResponse != nil) { break; } - + removedBytes += 1; } } else { @@ -380,13 +381,13 @@ RCT_EXPORT_MODULE() usedLossyConversion:NULL]; } } - + if (inputCarryData) { NSUInteger encodedResponseLength = [encodedResponse dataUsingEncoding:encoding].length; - NSData* newCarryData = [currentCarryData subdataWithRange:NSMakeRange(encodedResponseLength, currentCarryData.length - encodedResponseLength)]; + NSData *newCarryData = [currentCarryData subdataWithRange:NSMakeRange(encodedResponseLength, currentCarryData.length - encodedResponseLength)]; [inputCarryData setData:newCarryData]; } - + return encodedResponse; } @@ -456,14 +457,14 @@ RCT_EXPORT_MODULE() RCTURLRequestProgressBlock downloadProgressBlock = nil; if (incrementalUpdates) { if ([responseType isEqualToString:@"text"]) { - + // We need this to carry over bytes, which could not be decoded into text (such as broken UTF-8 characters). // The incremental data block holds the ownership of this object, and will be released upon release of the block. - NSMutableData* incrementalDataCarry = [NSMutableData new]; - + NSMutableData *incrementalDataCarry = [NSMutableData new]; + incrementalDataBlock = ^(NSData *data, int64_t progress, int64_t total) { NSUInteger initialCarryLength = incrementalDataCarry.length; - + NSString *responseString = [RCTNetworking decodeTextData:data fromResponse:task.response withCarryData:incrementalDataCarry]; @@ -471,13 +472,13 @@ RCT_EXPORT_MODULE() RCTLogWarn(@"Received data was not a string, or was not a recognised encoding."); return; } - + // Update progress to include the previous carry length and reduce the current carry length. NSArray *responseJSON = @[task.requestID, responseString, @(progress + initialCarryLength - incrementalDataCarry.length), @(total)]; - + [self sendEventWithName:@"didReceiveNetworkIncrementalData" body:responseJSON]; }; } else { diff --git a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj index b5d4b09f91..6dff2d74dd 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj +++ b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj @@ -8,19 +8,10 @@ /* Begin PBXBuildFile section */ 148699CF1ABD045300480536 /* RCTPushNotificationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 148699CE1ABD045300480536 /* RCTPushNotificationManager.m */; }; - 2DD0EFEF1DA8534500B0C975 /* RCTPushNotificationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 148699CE1ABD045300480536 /* RCTPushNotificationManager.m */; }; + 3D5FA66B1DE4B7110058FD77 /* RCTPushNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 148699CD1ABD045300480536 /* RCTPushNotificationManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 2DD0EFE41DA8533A00B0C975 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 58B511D91A9E6C8500147676 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -34,19 +25,11 @@ /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libRCTPushNotification.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTPushNotification.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 148699CD1ABD045300480536 /* RCTPushNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPushNotificationManager.h; sourceTree = ""; }; + 148699CD1ABD045300480536 /* RCTPushNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTPushNotificationManager.h; sourceTree = ""; }; 148699CE1ABD045300480536 /* RCTPushNotificationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPushNotificationManager.m; sourceTree = ""; }; - 2DD0EFE61DA8533A00B0C975 /* libRCTPushNotification-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTPushNotification-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 2DD0EFE31DA8533A00B0C975 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 58B511D81A9E6C8500147676 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -71,7 +54,6 @@ 148699CD1ABD045300480536 /* RCTPushNotificationManager.h */, 148699CE1ABD045300480536 /* RCTPushNotificationManager.m */, 134814211AA4EA7D00B7C361 /* Products */, - 2DD0EFE61DA8533A00B0C975 /* libRCTPushNotification-tvOS.a */, ); indentWidth = 2; sourceTree = ""; @@ -79,28 +61,23 @@ }; /* End PBXGroup section */ -/* Begin PBXNativeTarget section */ - 2DD0EFE51DA8533A00B0C975 /* RCTPushNotification-tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2DD0EFEE1DA8533A00B0C975 /* Build configuration list for PBXNativeTarget "RCTPushNotification-tvOS" */; - buildPhases = ( - 2DD0EFE21DA8533A00B0C975 /* Sources */, - 2DD0EFE31DA8533A00B0C975 /* Frameworks */, - 2DD0EFE41DA8533A00B0C975 /* CopyFiles */, +/* Begin PBXHeadersBuildPhase section */ + 3D5FA66A1DE4B70C0058FD77 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D5FA66B1DE4B7110058FD77 /* RCTPushNotificationManager.h in Headers */, ); - buildRules = ( - ); - dependencies = ( - ); - name = "RCTPushNotification-tvOS"; - productName = "RCTPushNotification-tvOS"; - productReference = 2DD0EFE61DA8533A00B0C975 /* libRCTPushNotification-tvOS.a */; - productType = "com.apple.product-type.library.static"; + runOnlyForDeploymentPostprocessing = 0; }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ 58B511DA1A9E6C8500147676 /* RCTPushNotification */ = { isa = PBXNativeTarget; buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTPushNotification" */; buildPhases = ( + 3D5FA66A1DE4B70C0058FD77 /* Headers */, 58B511D71A9E6C8500147676 /* Sources */, 58B511D81A9E6C8500147676 /* Frameworks */, 58B511D91A9E6C8500147676 /* CopyFiles */, @@ -123,10 +100,6 @@ LastUpgradeCheck = 0610; ORGANIZATIONNAME = Facebook; TargetAttributes = { - 2DD0EFE51DA8533A00B0C975 = { - CreatedOnToolsVersion = 8.0; - ProvisioningStyle = Automatic; - }; 58B511DA1A9E6C8500147676 = { CreatedOnToolsVersion = 6.1.1; }; @@ -145,20 +118,11 @@ projectRoot = ""; targets = ( 58B511DA1A9E6C8500147676 /* RCTPushNotification */, - 2DD0EFE51DA8533A00B0C975 /* RCTPushNotification-tvOS */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ - 2DD0EFE21DA8533A00B0C975 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2DD0EFEF1DA8534500B0C975 /* RCTPushNotificationManager.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 58B511D71A9E6C8500147676 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -170,46 +134,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 2DD0EFEC1DA8533A00B0C975 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_TESTABILITY = YES; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 9.2; - }; - name = Debug; - }; - 2DD0EFED1DA8533A00B0C975 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_NO_COMMON_BLOCKS = YES; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TVOS_DEPLOYMENT_TARGET = 9.2; - }; - name = Release; - }; 58B511ED1A9E6C8500147676 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -242,10 +166,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -287,10 +208,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -329,15 +247,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 2DD0EFEE1DA8533A00B0C975 /* Build configuration list for PBXNativeTarget "RCTPushNotification-tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2DD0EFEC1DA8533A00B0C975 /* Debug */, - 2DD0EFED1DA8533A00B0C975 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTPushNotification" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h index 38988f58db..259c9e7851 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h +++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" +#import @interface RCTPushNotificationManager : RCTEventEmitter diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m index 3ccef49ba3..216c87dd5f 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m +++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m @@ -9,10 +9,10 @@ #import "RCTPushNotificationManager.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" -#import "RCTUtils.h" +#import +#import +#import +#import NSString *const RCTLocalNotificationReceived = @"LocalNotificationReceived"; NSString *const RCTRemoteNotificationReceived = @"RemoteNotificationReceived"; @@ -208,7 +208,7 @@ RCT_EXPORT_MODULE() { NSMutableDictionary *remoteNotification = [NSMutableDictionary dictionaryWithDictionary:notification.userInfo[@"notification"]]; RCTRemoteNotificationCallback completionHandler = notification.userInfo[@"completionHandler"]; - NSString* notificationId = [[NSUUID UUID] UUIDString]; + NSString *notificationId = [[NSUUID UUID] UUIDString]; remoteNotification[@"notificationId"] = notificationId; remoteNotification[@"remote"] = @YES; if (completionHandler) { @@ -255,7 +255,7 @@ RCT_EXPORT_MODULE() _requestPermissionsResolveBlock = nil; } -RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString*)notificationId fetchResult:(UIBackgroundFetchResult)result) { +RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(UIBackgroundFetchResult)result) { RCTRemoteNotificationCallback completionHandler = self.remoteNotificationCallbacks[notificationId]; if (!completionHandler) { RCTLogError(@"There is no completion handler with notification id: %@", notificationId); diff --git a/Libraries/RCTTest/RCTSnapshotManager.h b/Libraries/RCTTest/RCTSnapshotManager.h index 6d6517aa57..24486906b6 100644 --- a/Libraries/RCTTest/RCTSnapshotManager.h +++ b/Libraries/RCTTest/RCTSnapshotManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTSnapshotManager : RCTViewManager diff --git a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj index 9c2ae771dd..64beb16aed 100644 --- a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj +++ b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj @@ -295,10 +295,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -339,10 +336,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/RCTTest/RCTTestModule.h b/Libraries/RCTTest/RCTTestModule.h index bd0ffe58ee..7bf93034e2 100644 --- a/Libraries/RCTTest/RCTTestModule.h +++ b/Libraries/RCTTest/RCTTestModule.h @@ -9,8 +9,8 @@ #import -#import "RCTBridgeModule.h" -#import "RCTDefines.h" +#import +#import typedef NS_ENUM(NSInteger, RCTTestStatus) { RCTTestStatusPending = 0, diff --git a/Libraries/RCTTest/RCTTestModule.m b/Libraries/RCTTest/RCTTestModule.m index 402dbff71a..c5741e93df 100644 --- a/Libraries/RCTTest/RCTTestModule.m +++ b/Libraries/RCTTest/RCTTestModule.m @@ -9,11 +9,12 @@ #import "RCTTestModule.h" +#import +#import +#import +#import + #import "FBSnapshotTestController.h" -#import "RCTAssert.h" -#import "RCTEventDispatcher.h" -#import "RCTLog.h" -#import "RCTUIManager.h" @implementation RCTTestModule { NSMutableDictionary *_snapshotCounter; diff --git a/Libraries/RCTTest/RCTTestRunner.m b/Libraries/RCTTest/RCTTestRunner.m index ba549981a8..4c8b3b89b4 100644 --- a/Libraries/RCTTest/RCTTestRunner.m +++ b/Libraries/RCTTest/RCTTestRunner.m @@ -9,14 +9,15 @@ #import "RCTTestRunner.h" +#import +#import +#import + #import "FBSnapshotTestController.h" -#import "RCTAssert.h" -#import "RCTLog.h" +#import "RCTBridge+Private.h" +#import "RCTJSCExecutor.h" #import "RCTRootView.h" #import "RCTTestModule.h" -#import "RCTUtils.h" -#import "RCTJSCExecutor.h" -#import "RCTBridge+Private.h" static const NSTimeInterval kTestTimeoutSeconds = 120; static const NSTimeInterval kTestTeardownTimeoutSeconds = 30; diff --git a/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj b/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj index f4912a0f84..0406675d2e 100644 --- a/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj +++ b/Libraries/Settings/RCTSettings.xcodeproj/project.pbxproj @@ -11,27 +11,6 @@ 2D3B5F2C1D9B0ECA00451313 /* RCTSettingsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DBA45D1AEE749000A17CF8 /* RCTSettingsManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A285F1D9B046600D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D91A9E6C8500147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libRCTSettings.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTSettings.a; sourceTree = BUILT_PRODUCTS_DIR; }; 13DBA45C1AEE749000A17CF8 /* RCTSettingsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSettingsManager.h; sourceTree = ""; }; @@ -39,23 +18,6 @@ 2D2A28611D9B046600D4039D /* libRCTSettings-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTSettings-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A285E1D9B046600D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511D81A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 134814211AA4EA7D00B7C361 /* Products */ = { isa = PBXGroup; @@ -83,8 +45,6 @@ buildConfigurationList = 2D2A28691D9B046600D4039D /* Build configuration list for PBXNativeTarget "RCTSettings-tvOS" */; buildPhases = ( 2D2A285D1D9B046600D4039D /* Sources */, - 2D2A285E1D9B046600D4039D /* Frameworks */, - 2D2A285F1D9B046600D4039D /* CopyFiles */, ); buildRules = ( ); @@ -100,8 +60,6 @@ buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTSettings" */; buildPhases = ( 58B511D71A9E6C8500147676 /* Sources */, - 58B511D81A9E6C8500147676 /* Frameworks */, - 58B511D91A9E6C8500147676 /* CopyFiles */, ); buildRules = ( ); @@ -239,10 +197,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -283,10 +238,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/Settings/RCTSettingsManager.h b/Libraries/Settings/RCTSettingsManager.h index e0c2908806..3c6c723fba 100644 --- a/Libraries/Settings/RCTSettingsManager.h +++ b/Libraries/Settings/RCTSettingsManager.h @@ -9,7 +9,7 @@ #import -#import "RCTBridgeModule.h" +#import @interface RCTSettingsManager : NSObject diff --git a/Libraries/Settings/RCTSettingsManager.m b/Libraries/Settings/RCTSettingsManager.m index eac4e3e98f..9007c50021 100644 --- a/Libraries/Settings/RCTSettingsManager.m +++ b/Libraries/Settings/RCTSettingsManager.m @@ -9,10 +9,10 @@ #import "RCTSettingsManager.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" -#import "RCTUtils.h" +#import +#import +#import +#import @implementation RCTSettingsManager { diff --git a/Libraries/Text/RCTRawTextManager.h b/Libraries/Text/RCTRawTextManager.h index 2f1a84826a..ebf6bca743 100644 --- a/Libraries/Text/RCTRawTextManager.h +++ b/Libraries/Text/RCTRawTextManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTRawTextManager : RCTViewManager diff --git a/Libraries/Text/RCTShadowRawText.h b/Libraries/Text/RCTShadowRawText.h index 7e47d8fa09..c3724f3709 100644 --- a/Libraries/Text/RCTShadowRawText.h +++ b/Libraries/Text/RCTShadowRawText.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowView.h" +#import @interface RCTShadowRawText : RCTShadowView diff --git a/Libraries/Text/RCTShadowRawText.m b/Libraries/Text/RCTShadowRawText.m index 12db153826..f163c799b9 100644 --- a/Libraries/Text/RCTShadowRawText.m +++ b/Libraries/Text/RCTShadowRawText.m @@ -9,7 +9,7 @@ #import "RCTShadowRawText.h" -#import "RCTUIManager.h" +#import @implementation RCTShadowRawText diff --git a/Libraries/Text/RCTShadowText.h b/Libraries/Text/RCTShadowText.h index 94e82db2d4..98a667bfa4 100644 --- a/Libraries/Text/RCTShadowText.h +++ b/Libraries/Text/RCTShadowText.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowView.h" -#import "RCTTextDecorationLineType.h" +#import +#import typedef NS_ENUM(NSInteger, RCTSizeComparison) { diff --git a/Libraries/Text/RCTShadowText.m b/Libraries/Text/RCTShadowText.m index 312ae35c30..6046bdda93 100644 --- a/Libraries/Text/RCTShadowText.m +++ b/Libraries/Text/RCTShadowText.m @@ -9,16 +9,17 @@ #import "RCTShadowText.h" -#import "RCTAccessibilityManager.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTFont.h" -#import "RCTLog.h" +#import +#import +#import +#import +#import +#import +#import + #import "RCTShadowRawText.h" #import "RCTText.h" #import "RCTTextView.h" -#import "RCTUIManager.h" -#import "RCTUtils.h" NSString *const RCTShadowViewAttributeName = @"RCTShadowViewAttributeName"; NSString *const RCTIsHighlightedAttributeName = @"IsHighlightedAttributeName"; diff --git a/Libraries/Text/RCTText.m b/Libraries/Text/RCTText.m index c14b4f1176..88848f9cf4 100644 --- a/Libraries/Text/RCTText.m +++ b/Libraries/Text/RCTText.m @@ -11,9 +11,10 @@ #import +#import +#import + #import "RCTShadowText.h" -#import "RCTUtils.h" -#import "UIView+React.h" static void collectNonTextDescendants(RCTText *view, NSMutableArray *nonTextDescendants) { diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index 77b733a48e..32bb950085 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -31,27 +31,6 @@ AF3225FA1DE5574F00D3E7E7 /* RCTConvert+Text.m in Sources */ = {isa = PBXBuildFile; fileRef = AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A28791D9B048500D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511991A9E6C1200147676 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 131B6ABC1AF0CD0600FFC3E0 /* RCTTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextView.h; sourceTree = ""; }; 131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextView.m; sourceTree = ""; }; @@ -79,23 +58,6 @@ AF3225F81DE5574F00D3E7E7 /* RCTConvert+Text.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Text.m"; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A28781D9B048500D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 58B511981A9E6C1200147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 58B511921A9E6C1200147676 = { isa = PBXGroup; @@ -145,8 +107,6 @@ buildConfigurationList = 2D2A28831D9B048500D4039D /* Build configuration list for PBXNativeTarget "RCTText-tvOS" */; buildPhases = ( 2D2A28771D9B048500D4039D /* Sources */, - 2D2A28781D9B048500D4039D /* Frameworks */, - 2D2A28791D9B048500D4039D /* CopyFiles */, ); buildRules = ( ); @@ -162,8 +122,6 @@ buildConfigurationList = 58B511AF1A9E6C1300147676 /* Build configuration list for PBXNativeTarget "RCTText" */; buildPhases = ( 58B511971A9E6C1200147676 /* Sources */, - 58B511981A9E6C1200147676 /* Frameworks */, - 58B511991A9E6C1200147676 /* CopyFiles */, ); buildRules = ( ); @@ -321,10 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -365,10 +320,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/Text/RCTTextField.h b/Libraries/Text/RCTTextField.h index 7017e71525..c809f10aca 100644 --- a/Libraries/Text/RCTTextField.h +++ b/Libraries/Text/RCTTextField.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @class RCTEventDispatcher; diff --git a/Libraries/Text/RCTTextField.m b/Libraries/Text/RCTTextField.m index b72d4099ad..32650d8e60 100644 --- a/Libraries/Text/RCTTextField.m +++ b/Libraries/Text/RCTTextField.m @@ -9,11 +9,12 @@ #import "RCTTextField.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" -#import "RCTUtils.h" +#import +#import +#import +#import + #import "RCTTextSelection.h" -#import "UIView+React.h" @implementation RCTTextField { diff --git a/Libraries/Text/RCTTextFieldManager.h b/Libraries/Text/RCTTextFieldManager.h index beea00fe66..f4778122a2 100644 --- a/Libraries/Text/RCTTextFieldManager.h +++ b/Libraries/Text/RCTTextFieldManager.h @@ -7,9 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTTextFieldManager : RCTViewManager @end - diff --git a/Libraries/Text/RCTTextFieldManager.m b/Libraries/Text/RCTTextFieldManager.m index af0577b294..9a469d9031 100644 --- a/Libraries/Text/RCTTextFieldManager.m +++ b/Libraries/Text/RCTTextFieldManager.m @@ -9,10 +9,11 @@ #import "RCTTextFieldManager.h" -#import "RCTBridge.h" -#import "RCTShadowView.h" +#import +#import +#import + #import "RCTTextField.h" -#import "RCTFont.h" #import "RCTConvert+Text.h" @interface RCTTextFieldManager() diff --git a/Libraries/Text/RCTTextManager.h b/Libraries/Text/RCTTextManager.h index 91ac87ba88..0d286d5388 100644 --- a/Libraries/Text/RCTTextManager.h +++ b/Libraries/Text/RCTTextManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTTextManager : RCTViewManager diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/RCTTextManager.m index 74dd3aa58e..124f5480ef 100644 --- a/Libraries/Text/RCTTextManager.m +++ b/Libraries/Text/RCTTextManager.m @@ -10,16 +10,16 @@ #import "RCTTextManager.h" #import +#import +#import +#import +#import +#import -#import "RCTAccessibilityManager.h" -#import "RCTAssert.h" -#import "RCTConvert.h" -#import "RCTLog.h" #import "RCTShadowRawText.h" #import "RCTShadowText.h" #import "RCTText.h" #import "RCTTextView.h" -#import "UIView+React.h" static void collectDirtyNonTextDescendants(RCTShadowText *shadowView, NSMutableArray *nonTextDescendants) { for (RCTShadowView *child in shadowView.reactSubviews) { diff --git a/Libraries/Text/RCTTextSelection.h b/Libraries/Text/RCTTextSelection.h index dfb207187a..804af5f283 100644 --- a/Libraries/Text/RCTTextSelection.h +++ b/Libraries/Text/RCTTextSelection.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTConvert.h" +#import /** * Object containing information about a TextInput's selection. diff --git a/Libraries/Text/RCTTextView.h b/Libraries/Text/RCTTextView.h index 1a737ad2aa..4150fb6c75 100644 --- a/Libraries/Text/RCTTextView.h +++ b/Libraries/Text/RCTTextView.h @@ -9,8 +9,8 @@ #import -#import "RCTView.h" -#import "UIView+React.h" +#import +#import @class RCTEventDispatcher; diff --git a/Libraries/Text/RCTTextView.m b/Libraries/Text/RCTTextView.m index 058834636d..3033f11810 100644 --- a/Libraries/Text/RCTTextView.m +++ b/Libraries/Text/RCTTextView.m @@ -9,13 +9,14 @@ #import "RCTTextView.h" -#import "RCTConvert.h" -#import "RCTEventDispatcher.h" +#import +#import +#import +#import + #import "RCTShadowText.h" #import "RCTText.h" -#import "RCTUtils.h" #import "RCTTextSelection.h" -#import "UIView+React.h" @interface RCTUITextView : UITextView diff --git a/Libraries/Text/RCTTextViewManager.h b/Libraries/Text/RCTTextViewManager.h index fd2f2b44d3..9028878bd3 100644 --- a/Libraries/Text/RCTTextViewManager.h +++ b/Libraries/Text/RCTTextViewManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTTextViewManager : RCTViewManager diff --git a/Libraries/Text/RCTTextViewManager.m b/Libraries/Text/RCTTextViewManager.m index 7478f83435..b2706a5de9 100644 --- a/Libraries/Text/RCTTextViewManager.m +++ b/Libraries/Text/RCTTextViewManager.m @@ -9,11 +9,12 @@ #import "RCTTextViewManager.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTShadowView.h" +#import +#import +#import +#import + #import "RCTTextView.h" -#import "RCTFont.h" #import "RCTConvert+Text.h" @implementation RCTTextViewManager diff --git a/Libraries/Vibration/RCTVibration.h b/Libraries/Vibration/RCTVibration.h index c82901e9db..935d326699 100644 --- a/Libraries/Vibration/RCTVibration.h +++ b/Libraries/Vibration/RCTVibration.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import @interface RCTVibration : NSObject diff --git a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj index cb412a14ab..f13300d750 100644 --- a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj +++ b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj @@ -10,34 +10,12 @@ 832C819C1AAF6E1A007FA2F7 /* RCTVibration.m in Sources */ = {isa = PBXBuildFile; fileRef = 832C819B1AAF6E1A007FA2F7 /* RCTVibration.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 832C817E1AAF6DEF007FA2F7 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 832C81801AAF6DEF007FA2F7 /* libRCTVibration.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTVibration.a; sourceTree = BUILT_PRODUCTS_DIR; }; 832C819A1AAF6E1A007FA2F7 /* RCTVibration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTVibration.h; sourceTree = ""; }; 832C819B1AAF6E1A007FA2F7 /* RCTVibration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVibration.m; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 832C817D1AAF6DEF007FA2F7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 832C81771AAF6DEF007FA2F7 = { isa = PBXGroup; @@ -66,8 +44,6 @@ buildConfigurationList = 832C81941AAF6DF0007FA2F7 /* Build configuration list for PBXNativeTarget "RCTVibration" */; buildPhases = ( 832C817C1AAF6DEF007FA2F7 /* Sources */, - 832C817D1AAF6DEF007FA2F7 /* Frameworks */, - 832C817E1AAF6DEF007FA2F7 /* CopyFiles */, ); buildRules = ( ); @@ -155,10 +131,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -198,10 +171,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/WebSocket/RCTSRWebSocket.m b/Libraries/WebSocket/RCTSRWebSocket.m index 1d95258538..798b3f39b5 100644 --- a/Libraries/WebSocket/RCTSRWebSocket.m +++ b/Libraries/WebSocket/RCTSRWebSocket.m @@ -22,9 +22,8 @@ #import #import - -#import "RCTAssert.h" -#import "RCTLog.h" +#import +#import typedef NS_ENUM(NSInteger, RCTSROpCode) { RCTSROpCodeTextFrame = 0x1, diff --git a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj index 08b6c676f9..20b1ecc36e 100644 --- a/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj +++ b/Libraries/WebSocket/RCTWebSocket.xcodeproj/project.pbxproj @@ -17,18 +17,6 @@ 3DB9106F1C74B1ED00838BBE /* RCTWebSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB9106E1C74B1ED00838BBE /* RCTWebSocketManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A28861D9B049200D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 1338BBDC1B04ACC80064A9C9 /* RCTSRWebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSRWebSocket.h; sourceTree = ""; }; 1338BBDD1B04ACC80064A9C9 /* RCTSRWebSocket.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSRWebSocket.m; sourceTree = ""; }; @@ -42,23 +30,6 @@ 3DB9106E1C74B1ED00838BBE /* RCTWebSocketManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWebSocketManager.m; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXFrameworksBuildPhase section */ - 2D2A28851D9B049200D4039D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 3C86DF431ADF2C930047B81A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - /* Begin PBXGroup section */ 3C86DF3D1ADF2C930047B81A = { isa = PBXGroup; @@ -94,8 +65,6 @@ buildConfigurationList = 2D2A28901D9B049200D4039D /* Build configuration list for PBXNativeTarget "RCTWebSocket-tvOS" */; buildPhases = ( 2D2A28841D9B049200D4039D /* Sources */, - 2D2A28851D9B049200D4039D /* Frameworks */, - 2D2A28861D9B049200D4039D /* CopyFiles */, ); buildRules = ( ); @@ -111,7 +80,6 @@ buildConfigurationList = 3C86DF5A1ADF2C930047B81A /* Build configuration list for PBXNativeTarget "RCTWebSocket" */; buildPhases = ( 3C86DF421ADF2C930047B81A /* Sources */, - 3C86DF431ADF2C930047B81A /* Frameworks */, ); buildRules = ( ); @@ -253,10 +221,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -299,10 +264,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../React/**", - "$(SRCROOT)/../../ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.h b/Libraries/WebSocket/RCTWebSocketExecutor.h index 4550a347b5..733da2adb7 100644 --- a/Libraries/WebSocket/RCTWebSocketExecutor.h +++ b/Libraries/WebSocket/RCTWebSocketExecutor.h @@ -7,9 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTDefines.h" - -#import "RCTJavaScriptExecutor.h" +#import +#import #if RCT_DEV // Debug executors are only supported in dev mode diff --git a/Libraries/WebSocket/RCTWebSocketExecutor.m b/Libraries/WebSocket/RCTWebSocketExecutor.m index a6fa208729..09ccbf95e5 100644 --- a/Libraries/WebSocket/RCTWebSocketExecutor.m +++ b/Libraries/WebSocket/RCTWebSocketExecutor.m @@ -7,15 +7,15 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTDefines.h" - #import "RCTWebSocketExecutor.h" -#import "RCTAssert.h" -#import "RCTBridge.h" -#import "RCTConvert.h" -#import "RCTLog.h" -#import "RCTUtils.h" +#import +#import +#import +#import +#import +#import + #import "RCTSRWebSocket.h" #if RCT_DEV // Debug executors are only supported in dev mode diff --git a/Libraries/WebSocket/RCTWebSocketManager.h b/Libraries/WebSocket/RCTWebSocketManager.h index debc3f7676..68a97ab498 100644 --- a/Libraries/WebSocket/RCTWebSocketManager.h +++ b/Libraries/WebSocket/RCTWebSocketManager.h @@ -7,12 +7,11 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTDefines.h" +#import +#import #if RCT_DEV // Only supported in dev mode -#import "RCTWebSocketProxy.h" - @interface RCTWebSocketManager : NSObject @end diff --git a/Libraries/WebSocket/RCTWebSocketManager.m b/Libraries/WebSocket/RCTWebSocketManager.m index 16b3195835..2f60119884 100644 --- a/Libraries/WebSocket/RCTWebSocketManager.m +++ b/Libraries/WebSocket/RCTWebSocketManager.m @@ -7,17 +7,17 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTDefines.h" - -#if RCT_DEV // Only supported in dev mode - #import "RCTWebSocketManager.h" -#import "RCTConvert.h" -#import "RCTLog.h" -#import "RCTUtils.h" +#import +#import +#import +#import + #import "RCTSRWebSocket.h" +#if RCT_DEV // Only supported in dev mode + #pragma mark - RCTWebSocketObserver @interface RCTWebSocketObserver : NSObject { diff --git a/Libraries/WebSocket/RCTWebSocketModule.h b/Libraries/WebSocket/RCTWebSocketModule.h index ceead5ad9d..822b6f4f3c 100644 --- a/Libraries/WebSocket/RCTWebSocketModule.h +++ b/Libraries/WebSocket/RCTWebSocketModule.h @@ -7,9 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" -#import "RCTSRWebSocket.h" +#import -@interface RCTWebSocketModule : RCTEventEmitter +@interface RCTWebSocketModule : RCTEventEmitter @end diff --git a/Libraries/WebSocket/RCTWebSocketModule.m b/Libraries/WebSocket/RCTWebSocketModule.m index cc5dc4dc63..b345bea89f 100644 --- a/Libraries/WebSocket/RCTWebSocketModule.m +++ b/Libraries/WebSocket/RCTWebSocketModule.m @@ -11,8 +11,10 @@ #import -#import "RCTConvert.h" -#import "RCTUtils.h" +#import +#import + +#import "RCTSRWebSocket.h" @implementation RCTSRWebSocket (React) @@ -28,6 +30,10 @@ @end +@interface RCTWebSocketModule () + +@end + @implementation RCTWebSocketModule { NSMutableDictionary *_sockets; diff --git a/React/Base/RCTAssert.h b/React/Base/RCTAssert.h index cb55d58acf..c3c0008f25 100644 --- a/React/Base/RCTAssert.h +++ b/React/Base/RCTAssert.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import /* * Defined in RCTUtils.m diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m index a7de971aef..c578d1c201 100644 --- a/React/Base/RCTBatchedBridge.m +++ b/React/Base/RCTBatchedBridge.m @@ -10,10 +10,11 @@ #import #import "RCTAssert.h" -#import "RCTBridge.h" #import "RCTBridge+Private.h" +#import "RCTBridge.h" #import "RCTBridgeMethod.h" #import "RCTConvert.h" +#import "RCTDevLoadingView.h" #import "RCTDisplayLink.h" #import "RCTJSCExecutor.h" #import "RCTJavaScriptLoader.h" @@ -21,9 +22,8 @@ #import "RCTModuleData.h" #import "RCTPerformanceLogger.h" #import "RCTProfile.h" -#import "RCTUtils.h" #import "RCTRedBox.h" -#import "RCTDevLoadingView.h" +#import "RCTUtils.h" #define RCTAssertJSThread() \ RCTAssert(![NSStringFromClass([self->_javaScriptExecutor class]) isEqualToString:@"RCTJSCExecutor"] || \ diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h index f9a2a53a5e..a4c3299830 100644 --- a/React/Base/RCTBridge+Private.h +++ b/React/Base/RCTBridge+Private.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridge.h" +#import @class RCTModuleData; @protocol RCTJavaScriptExecutor; diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h index 852f3ec630..e7f76ffba3 100644 --- a/React/Base/RCTBridge.h +++ b/React/Base/RCTBridge.h @@ -9,11 +9,11 @@ #import -#import "RCTBridgeDelegate.h" -#import "RCTBridgeModule.h" -#import "RCTDefines.h" -#import "RCTFrameUpdate.h" -#import "RCTInvalidating.h" +#import +#import +#import +#import +#import @class JSValue; @class RCTBridge; diff --git a/React/Base/RCTBridgeDelegate.h b/React/Base/RCTBridgeDelegate.h index 65f823c969..343a2275dc 100644 --- a/React/Base/RCTBridgeDelegate.h +++ b/React/Base/RCTBridgeDelegate.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTJavaScriptLoader.h" +#import @class RCTBridge; @protocol RCTBridgeModule; diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h index 067ecb4927..6eb24bdb9d 100644 --- a/React/Base/RCTBridgeModule.h +++ b/React/Base/RCTBridgeModule.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import @class RCTBridge; @protocol RCTBridgeMethod; @@ -173,7 +173,7 @@ RCT_EXTERN void RCTRegisterModule(Class); \ * * MyModuleExport.m: * - * #import "RCTBridgeModule.h" + * #import * * @interface RCT_EXTERN_MODULE(MyModule, NSObject) * diff --git a/React/Base/RCTBundleURLProvider.m b/React/Base/RCTBundleURLProvider.m index 78c1093d46..488a48ebef 100644 --- a/React/Base/RCTBundleURLProvider.m +++ b/React/Base/RCTBundleURLProvider.m @@ -8,8 +8,9 @@ */ #import "RCTBundleURLProvider.h" -#import "RCTDefines.h" + #import "RCTConvert.h" +#import "RCTDefines.h" NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProviderUpdatedNotification"; diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h index 12a1be2b49..6c24058182 100644 --- a/React/Base/RCTConvert.h +++ b/React/Base/RCTConvert.h @@ -11,13 +11,12 @@ #import #import - -#import "RCTAnimationType.h" -#import "RCTBorderStyle.h" -#import "RCTTextDecorationLineType.h" -#import "RCTDefines.h" -#import "RCTLog.h" -#import "RCTPointerEvents.h" +#import +#import +#import +#import +#import +#import /** * This class provides a collection of conversion functions for mapping diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 88ae1f6d28..64bb96d205 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -7,12 +7,12 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import - #import "RCTConvert.h" #import +#import + #import "RCTDefines.h" #import "RCTImageSource.h" #import "RCTParserUtils.h" diff --git a/React/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcher.h index e65fd00343..c5e36e6450 100644 --- a/React/Base/RCTEventDispatcher.h +++ b/React/Base/RCTEventDispatcher.h @@ -9,7 +9,7 @@ #import -#import "RCTBridge.h" +#import typedef NS_ENUM(NSInteger, RCTTextEventType) { diff --git a/React/Base/RCTImageSource.h b/React/Base/RCTImageSource.h index 8511fed65f..ade263ae68 100644 --- a/React/Base/RCTImageSource.h +++ b/React/Base/RCTImageSource.h @@ -9,7 +9,7 @@ #import -#import "RCTConvert.h" +#import /** * Object containing an image URL and associated metadata. diff --git a/React/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h index 55dc458ee8..24df68852f 100644 --- a/React/Base/RCTJavaScriptExecutor.h +++ b/React/Base/RCTJavaScriptExecutor.h @@ -11,8 +11,8 @@ #import -#import "RCTBridgeModule.h" -#import "RCTInvalidating.h" +#import +#import typedef void (^RCTJavaScriptCompleteBlock)(NSError *error); typedef void (^RCTJavaScriptCallback)(id result, NSError *error); diff --git a/React/Base/RCTJavaScriptLoader.h b/React/Base/RCTJavaScriptLoader.h index 8722d4294e..1d32372cd5 100755 --- a/React/Base/RCTJavaScriptLoader.h +++ b/React/Base/RCTJavaScriptLoader.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import extern NSString *const RCTJavaScriptLoaderErrorDomain; diff --git a/React/Base/RCTLog.h b/React/Base/RCTLog.h index d6c3a215ee..5cfc89c711 100644 --- a/React/Base/RCTLog.h +++ b/React/Base/RCTLog.h @@ -9,8 +9,8 @@ #import -#import "RCTAssert.h" -#import "RCTDefines.h" +#import +#import #ifndef RCTLOG_ENABLED #define RCTLOG_ENABLED 1 diff --git a/React/Base/RCTModuleData.h b/React/Base/RCTModuleData.h index c04f716449..e4aa182dce 100644 --- a/React/Base/RCTModuleData.h +++ b/React/Base/RCTModuleData.h @@ -9,7 +9,7 @@ #import -#import "RCTInvalidating.h" +#import @protocol RCTBridgeMethod; @protocol RCTBridgeModule; diff --git a/React/Base/RCTModuleMethod.h b/React/Base/RCTModuleMethod.h index ab525e0302..977b6c13dc 100644 --- a/React/Base/RCTModuleMethod.h +++ b/React/Base/RCTModuleMethod.h @@ -9,8 +9,8 @@ #import -#import "RCTBridgeMethod.h" -#import "RCTNullability.h" +#import +#import @class RCTBridge; diff --git a/React/Base/RCTModuleMethod.m b/React/Base/RCTModuleMethod.m index 517dcc2558..3b72f9f066 100644 --- a/React/Base/RCTModuleMethod.m +++ b/React/Base/RCTModuleMethod.m @@ -12,13 +12,13 @@ #import #import "RCTAssert.h" -#import "RCTBridge.h" #import "RCTBridge+Private.h" +#import "RCTBridge.h" #import "RCTConvert.h" #import "RCTLog.h" #import "RCTParserUtils.h" -#import "RCTUtils.h" #import "RCTProfile.h" +#import "RCTUtils.h" typedef BOOL (^RCTArgumentBlock)(RCTBridge *, NSUInteger, id); diff --git a/React/Base/RCTMultipartDataTask.h b/React/Base/RCTMultipartDataTask.h index f01ef609e7..0d650b0d6a 100644 --- a/React/Base/RCTMultipartDataTask.h +++ b/React/Base/RCTMultipartDataTask.h @@ -8,7 +8,8 @@ */ #import -#import "RCTMultipartStreamReader.h" + +#import typedef void (^RCTMultipartDataTaskCallback)(NSInteger statusCode, NSDictionary *headers, NSData *content, NSError *error, BOOL done); diff --git a/React/Base/RCTParserUtils.h b/React/Base/RCTParserUtils.h index dcbe413ef7..cda4e68dba 100644 --- a/React/Base/RCTParserUtils.h +++ b/React/Base/RCTParserUtils.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import @interface RCTParserUtils : NSObject diff --git a/React/Base/RCTPlatform.h b/React/Base/RCTPlatform.h index 309c479955..57b523414a 100644 --- a/React/Base/RCTPlatform.h +++ b/React/Base/RCTPlatform.h @@ -9,7 +9,7 @@ #import -#import "RCTBridgeModule.h" +#import @interface RCTPlatform : NSObject diff --git a/React/Base/RCTRootView.h b/React/Base/RCTRootView.h index 94e8a4a0fb..aa9692b416 100644 --- a/React/Base/RCTRootView.h +++ b/React/Base/RCTRootView.h @@ -9,7 +9,7 @@ #import -#import "RCTBridge.h" +#import @protocol RCTRootViewDelegate; diff --git a/React/Base/RCTRootViewInternal.h b/React/Base/RCTRootViewInternal.h index d95cc10cdf..80c264c5ca 100644 --- a/React/Base/RCTRootViewInternal.h +++ b/React/Base/RCTRootViewInternal.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTRootView.h" +#import /** * The interface provides a set of functions that allow other internal framework diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h index d426c6b5dc..329f84df0a 100644 --- a/React/Base/RCTTouchEvent.h +++ b/React/Base/RCTTouchEvent.h @@ -9,7 +9,7 @@ #import -#import "RCTEventDispatcher.h" +#import /** * Represents a touch event, which may be composed of several touches (one for every finger). diff --git a/React/Base/RCTTouchHandler.h b/React/Base/RCTTouchHandler.h index 5ea1919930..d5f4cbb4e0 100644 --- a/React/Base/RCTTouchHandler.h +++ b/React/Base/RCTTouchHandler.h @@ -9,7 +9,7 @@ #import -#import "RCTFrameUpdate.h" +#import @class RCTBridge; diff --git a/React/Base/RCTURLRequestHandler.h b/React/Base/RCTURLRequestHandler.h index d5959e5eb0..635f367876 100644 --- a/React/Base/RCTURLRequestHandler.h +++ b/React/Base/RCTURLRequestHandler.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" -#import "RCTURLRequestDelegate.h" +#import +#import /** * Provides the interface needed to register a request handler. Request handlers diff --git a/React/Base/RCTUtils.h b/React/Base/RCTUtils.h index 0a14ef34f8..2a9ef4b4d1 100644 --- a/React/Base/RCTUtils.h +++ b/React/Base/RCTUtils.h @@ -13,8 +13,8 @@ #import #import -#import "RCTAssert.h" -#import "RCTDefines.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Base/RCTWebSocketProxy.h b/React/Base/RCTWebSocketProxy.h index e823c3c8fe..3701d605d2 100644 --- a/React/Base/RCTWebSocketProxy.h +++ b/React/Base/RCTWebSocketProxy.h @@ -7,19 +7,18 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTDefines.h" +#import +#import #if RCT_DEV // Only supported in dev mode -#import "RCTWebSocketProxyDelegate.h" - @protocol RCTWebSocketProxy + (instancetype)sharedInstance; - (void)setDelegate:(id)delegate forURL:(NSURL *)url; -- (instancetype) init __attribute__((unavailable("init not available, call sharedInstance instead"))); +- (instancetype)init __attribute__((unavailable("init not available, call sharedInstance instead"))); @end diff --git a/React/Base/RCTWebSocketProxyDelegate.h b/React/Base/RCTWebSocketProxyDelegate.h index f668bf1610..5e4a494517 100644 --- a/React/Base/RCTWebSocketProxyDelegate.h +++ b/React/Base/RCTWebSocketProxyDelegate.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTDefines.h" +#import #if RCT_DEV // Only supported in dev mode diff --git a/React/Executors/RCTJSCErrorHandling.h b/React/Executors/RCTJSCErrorHandling.h index dbc0d52d6a..ad2f0c9284 100644 --- a/React/Executors/RCTJSCErrorHandling.h +++ b/React/Executors/RCTJSCErrorHandling.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import typedef struct RCTJSCWrapper RCTJSCWrapper; diff --git a/React/Executors/RCTJSCExecutor.h b/React/Executors/RCTJSCExecutor.h index 96dd1f6cfc..1a96c2e8e8 100644 --- a/React/Executors/RCTJSCExecutor.h +++ b/React/Executors/RCTJSCExecutor.h @@ -9,7 +9,7 @@ #import -#import "RCTJavaScriptExecutor.h" +#import typedef void (^RCTJavaScriptValueCallback)(JSValue *result, NSError *error); diff --git a/React/Executors/RCTJSCExecutor.mm b/React/Executors/RCTJSCExecutor.mm index 41333d86d9..d698115283 100644 --- a/React/Executors/RCTJSCExecutor.mm +++ b/React/Executors/RCTJSCExecutor.mm @@ -19,19 +19,19 @@ #import +#import "JSCSamplingProfiler.h" #import "RCTAssert.h" #import "RCTBridge+Private.h" #import "RCTDefines.h" #import "RCTDevMenu.h" -#import "RCTJavaScriptLoader.h" -#import "RCTLog.h" -#import "RCTProfile.h" -#import "RCTPerformanceLogger.h" -#import "RCTUtils.h" +#import "RCTJSCErrorHandling.h" #import "RCTJSCProfiler.h" #import "RCTJSCWrapper.h" -#import "RCTJSCErrorHandling.h" -#import "JSCSamplingProfiler.h" +#import "RCTJavaScriptLoader.h" +#import "RCTLog.h" +#import "RCTPerformanceLogger.h" +#import "RCTProfile.h" +#import "RCTUtils.h" NSString *const RCTJSCThreadName = @"com.facebook.react.JavaScript"; NSString *const RCTJavaScriptContextCreatedNotification = @"RCTJavaScriptContextCreatedNotification"; diff --git a/React/Modules/JSCSamplingProfiler.h b/React/Modules/JSCSamplingProfiler.h index 4e727a6703..eec9e9bf2e 100644 --- a/React/Modules/JSCSamplingProfiler.h +++ b/React/Modules/JSCSamplingProfiler.h @@ -9,7 +9,7 @@ #import -#import "RCTBridgeModule.h" +#import @interface JSCSamplingProfiler : NSObject diff --git a/React/Modules/RCTAccessibilityManager.h b/React/Modules/RCTAccessibilityManager.h index 8e14ccd889..6884894dcc 100644 --- a/React/Modules/RCTAccessibilityManager.h +++ b/React/Modules/RCTAccessibilityManager.h @@ -9,8 +9,8 @@ #import -#import "RCTBridgeModule.h" -#import "RCTBridge.h" +#import +#import extern NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification; // posted when multiplier is changed diff --git a/React/Modules/RCTAlertManager.h b/React/Modules/RCTAlertManager.h index e4247602c0..e576329185 100644 --- a/React/Modules/RCTAlertManager.h +++ b/React/Modules/RCTAlertManager.h @@ -9,8 +9,8 @@ #import -#import "RCTBridgeModule.h" -#import "RCTInvalidating.h" +#import +#import typedef NS_ENUM(NSInteger, RCTAlertViewStyle) { RCTAlertViewStyleDefault = 0, diff --git a/React/Modules/RCTAppState.h b/React/Modules/RCTAppState.h index 99553d7568..225b14d030 100644 --- a/React/Modules/RCTAppState.h +++ b/React/Modules/RCTAppState.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" +#import @interface RCTAppState : RCTEventEmitter diff --git a/React/Modules/RCTAsyncLocalStorage.h b/React/Modules/RCTAsyncLocalStorage.h index e6c129ef2f..cbb8cb42be 100644 --- a/React/Modules/RCTAsyncLocalStorage.h +++ b/React/Modules/RCTAsyncLocalStorage.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" -#import "RCTInvalidating.h" +#import +#import /** * A simple, asynchronous, persistent, key-value storage system designed as a diff --git a/React/Modules/RCTClipboard.h b/React/Modules/RCTClipboard.h index bc65c62390..45ff6e32bf 100644 --- a/React/Modules/RCTClipboard.h +++ b/React/Modules/RCTClipboard.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import @interface RCTClipboard : NSObject diff --git a/React/Modules/RCTDevLoadingView.h b/React/Modules/RCTDevLoadingView.h index 2d9f15c4aa..16e8ae4c3c 100644 --- a/React/Modules/RCTDevLoadingView.h +++ b/React/Modules/RCTDevLoadingView.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import @interface RCTDevLoadingView : NSObject diff --git a/React/Modules/RCTDevMenu.h b/React/Modules/RCTDevMenu.h index ef2230e80d..9184a3a804 100644 --- a/React/Modules/RCTDevMenu.h +++ b/React/Modules/RCTDevMenu.h @@ -9,8 +9,8 @@ #import -#import "RCTBridge.h" -#import "RCTBridgeModule.h" +#import +#import @class RCTDevMenuItem; diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h index 260c1d750f..58d37b0ab7 100644 --- a/React/Modules/RCTEventEmitter.h +++ b/React/Modules/RCTEventEmitter.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridge.h" +#import /** * RCTEventEmitter is an abstract base class to be used for modules that emit diff --git a/React/Modules/RCTExceptionsManager.h b/React/Modules/RCTExceptionsManager.h index ad5625287e..684adc1402 100644 --- a/React/Modules/RCTExceptionsManager.h +++ b/React/Modules/RCTExceptionsManager.h @@ -9,7 +9,7 @@ #import -#import "RCTBridgeModule.h" +#import @protocol RCTExceptionsManagerDelegate diff --git a/React/Modules/RCTI18nManager.h b/React/Modules/RCTI18nManager.h index 5a36d0f2c7..d246249577 100644 --- a/React/Modules/RCTI18nManager.h +++ b/React/Modules/RCTI18nManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTBridgeModule.h" +#import /** * @experimental diff --git a/React/Modules/RCTKeyboardObserver.h b/React/Modules/RCTKeyboardObserver.h index 89bba89996..5ae5637e35 100644 --- a/React/Modules/RCTKeyboardObserver.h +++ b/React/Modules/RCTKeyboardObserver.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" +#import @interface RCTKeyboardObserver : RCTEventEmitter diff --git a/React/Modules/RCTRedBox.h b/React/Modules/RCTRedBox.h index 40f5c62d27..8d7df0bd51 100644 --- a/React/Modules/RCTRedBox.h +++ b/React/Modules/RCTRedBox.h @@ -9,9 +9,9 @@ #import -#import "RCTBridge.h" -#import "RCTBridgeModule.h" -#import "RCTErrorCustomizer.h" +#import +#import +#import @interface RCTRedBox : NSObject diff --git a/React/Modules/RCTRedBox.m b/React/Modules/RCTRedBox.m index c07625850c..8c78c377e0 100644 --- a/React/Modules/RCTRedBox.m +++ b/React/Modules/RCTRedBox.m @@ -13,8 +13,8 @@ #import "RCTConvert.h" #import "RCTDefines.h" #import "RCTErrorInfo.h" -#import "RCTUtils.h" #import "RCTJSStackFrame.h" +#import "RCTUtils.h" #if RCT_DEBUG diff --git a/React/Modules/RCTSourceCode.h b/React/Modules/RCTSourceCode.h index bd39a01ecc..29218749fd 100644 --- a/React/Modules/RCTSourceCode.h +++ b/React/Modules/RCTSourceCode.h @@ -9,7 +9,7 @@ #import -#import "RCTBridgeModule.h" +#import @interface RCTSourceCode : NSObject diff --git a/React/Modules/RCTStatusBarManager.h b/React/Modules/RCTStatusBarManager.h index 3d11a930dd..6960da5ec6 100644 --- a/React/Modules/RCTStatusBarManager.h +++ b/React/Modules/RCTStatusBarManager.h @@ -9,8 +9,8 @@ #import -#import "RCTEventEmitter.h" -#import "RCTConvert.h" +#import +#import @interface RCTConvert (UIStatusBar) diff --git a/React/Modules/RCTTiming.h b/React/Modules/RCTTiming.h index c6d63bcfc8..0ccb48ace3 100644 --- a/React/Modules/RCTTiming.h +++ b/React/Modules/RCTTiming.h @@ -9,9 +9,9 @@ #import -#import "RCTBridgeModule.h" -#import "RCTFrameUpdate.h" -#import "RCTInvalidating.h" +#import +#import +#import @interface RCTTiming : NSObject diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h index 4d65dd03d9..e31ca39ec8 100644 --- a/React/Modules/RCTUIManager.h +++ b/React/Modules/RCTUIManager.h @@ -9,11 +9,11 @@ #import -#import "RCTBridge.h" -#import "RCTBridgeModule.h" -#import "RCTInvalidating.h" -#import "RCTViewManager.h" -#import "RCTRootView.h" +#import +#import +#import +#import +#import /** * UIManager queue diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m index 74d8862221..aa4d54adaf 100644 --- a/React/Modules/RCTUIManager.m +++ b/React/Modules/RCTUIManager.m @@ -16,8 +16,8 @@ #import "RCTAccessibilityManager.h" #import "RCTAnimationType.h" #import "RCTAssert.h" -#import "RCTBridge.h" #import "RCTBridge+Private.h" +#import "RCTBridge.h" #import "RCTComponent.h" #import "RCTComponentData.h" #import "RCTConvert.h" diff --git a/React/Profiler/RCTFPSGraph.h b/React/Profiler/RCTFPSGraph.h index ecec7aa5b6..7179cb9cb5 100644 --- a/React/Profiler/RCTFPSGraph.h +++ b/React/Profiler/RCTFPSGraph.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import #if RCT_DEV diff --git a/React/Profiler/RCTJSCProfiler.h b/React/Profiler/RCTJSCProfiler.h index 5f8e23b178..19cc304b4b 100644 --- a/React/Profiler/RCTJSCProfiler.h +++ b/React/Profiler/RCTJSCProfiler.h @@ -9,7 +9,7 @@ #import -#import "RCTDefines.h" +#import /** The API is not thread-safe. */ diff --git a/React/Profiler/RCTProfile.h b/React/Profiler/RCTProfile.h index 74dd230942..08836964f2 100644 --- a/React/Profiler/RCTProfile.h +++ b/React/Profiler/RCTProfile.h @@ -9,8 +9,8 @@ #import -#import "RCTDefines.h" -#import "RCTAssert.h" +#import +#import /** * RCTProfile diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index 328f18fb82..12e0d02109 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -13,8 +13,6 @@ 008341F61D1DB34400876D9A /* RCTJSStackFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 008341F41D1DB34400876D9A /* RCTJSStackFrame.m */; }; 131B6AF41AF1093D00FFC3E0 /* RCTSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6AF11AF1093D00FFC3E0 /* RCTSegmentedControl.m */; }; 131B6AF51AF1093D00FFC3E0 /* RCTSegmentedControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6AF31AF1093D00FFC3E0 /* RCTSegmentedControlManager.m */; }; - 1321C8D01D3EB50800D58318 /* CSSNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* CSSNodeList.c */; }; - 133683521D37ACA10077D0C3 /* CSSLayout.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* CSSLayout.c */; }; 133CAE8E1B8E5CFD00F6AD92 /* RCTDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 133CAE8D1B8E5CFD00F6AD92 /* RCTDatePicker.m */; }; 13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */; }; 13456E961ADAD482009F94A7 /* RCTConvert+MapKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E951ADAD482009F94A7 /* RCTConvert+MapKit.m */; }; @@ -100,9 +98,6 @@ 2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; }; 2D3B5EA71D9B08CE00451313 /* RCTTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA971A6020BB00E9B192 /* RCTTouchHandler.m */; }; 2D3B5EA81D9B08D300451313 /* RCTUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 83CBBA501A601E3B00E9B192 /* RCTUtils.m */; }; - 2D3B5EA91D9B08E300451313 /* CSSNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* CSSNodeList.c */; }; - 2D3B5EAA1D9B08E600451313 /* CSSLayout.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* CSSLayout.c */; }; - 2D3B5EAB1D9B08EC00451313 /* RCTJSCErrorHandling.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DC724311D8BF99A00808C32 /* RCTJSCErrorHandling.m */; }; 2D3B5EAC1D9B08EF00451313 /* RCTJSCExecutor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */; }; 2D3B5EAD1D9B08F200451313 /* RCTJSCWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 85C199ED1CD2407900DAD810 /* RCTJSCWrapper.mm */; }; 2D3B5EAE1D9B08F800451313 /* RCTEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 13D9FEEA1CDCCECF00158BD7 /* RCTEventEmitter.m */; }; @@ -169,7 +164,269 @@ 369123E11DDC75850095B341 /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; }; 391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 391E86A21C623EC800009732 /* RCTTouchEvent.m */; }; 3D1E68DB1CABD13900DD7465 /* RCTDisplayLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */; }; + 3D1FA07C1DE4F2EA00E03CC6 /* RCTNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA07D1DE4F2EA00E03CC6 /* RCTNetworkTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA07B1DE4F2EA00E03CC6 /* RCTNetworkTask.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA07E1DE4F2F100E03CC6 /* RCTNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA07F1DE4F2F100E03CC6 /* RCTNetworkTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA07B1DE4F2EA00E03CC6 /* RCTNetworkTask.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0861DE4F3A000E03CC6 /* RCTImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0871DE4F3A000E03CC6 /* RCTImageStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0881DE4F3A000E03CC6 /* RCTResizeMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA08C1DE4F4DD00E03CC6 /* RCTLinkingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA08B1DE4F4DD00E03CC6 /* RCTLinkingManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA08E1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA08D1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0961DE4F50100E03CC6 /* RCTImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0971DE4F50100E03CC6 /* RCTImageStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0981DE4F50100E03CC6 /* RCTResizeMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA0991DE4F50100E03CC6 /* RCTLinkingManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA08B1DE4F4DD00E03CC6 /* RCTLinkingManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D1FA09A1DE4F50100E03CC6 /* RCTPushNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1FA08D1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D37B5821D522B190042D5B5 /* RCTFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D37B5811D522B190042D5B5 /* RCTFont.mm */; }; + 3D3C04AB1DE3337C00C268FA /* RCTAlertManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C083B1DE334D900C268FA /* CSSEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D10A3C81DDF3D16004A0F9D /* CSSEnums.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C083C1DE334D900C268FA /* CSSLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 133683451D37ACA10077D0C3 /* CSSLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C083D1DE334D900C268FA /* CSSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 133683481D37ACA10077D0C3 /* CSSMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C083E1DE334D900C268FA /* CSSNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1321C8CF1D3EB50800D58318 /* CSSNodeList.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C083F1DE334DA00C268FA /* CSSEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D10A3C81DDF3D16004A0F9D /* CSSEnums.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C08401DE334DA00C268FA /* CSSLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 133683451D37ACA10077D0C3 /* CSSLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C08411DE334DA00C268FA /* CSSMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 133683481D37ACA10077D0C3 /* CSSMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C08421DE334DA00C268FA /* CSSNodeList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1321C8CF1D3EB50800D58318 /* CSSNodeList.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D3C085A1DE33E4400C268FA /* CSSLayout.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* CSSLayout.c */; }; + 3D3C085C1DE33E4E00C268FA /* CSSLayout.c in Sources */ = {isa = PBXBuildFile; fileRef = 133683441D37ACA10077D0C3 /* CSSLayout.c */; }; + 3D3C085E1DE33E6100C268FA /* CSSNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* CSSNodeList.c */; }; + 3D3C085F1DE33E6100C268FA /* CSSNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 1321C8CE1D3EB50800D58318 /* CSSNodeList.c */; }; + 3D3C08891DE342FB00C268FA /* libCSSLayout.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C059A1DE3340900C268FA /* libCSSLayout.a */; }; + 3D3C088C1DE3430500C268FA /* libCSSLayout-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3C06751DE3340C00C268FA /* libCSSLayout-tvOS.a */; }; + 3D4545AC1DE32FB300C6C478 /* RCTAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545AD1DE32FB300C6C478 /* RCTBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545AE1DE32FB300C6C478 /* RCTBridge+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; }; + 3D4545AF1DE32FB300C6C478 /* RCTBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B01DE32FB300C6C478 /* RCTBridgeMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B11DE32FB300C6C478 /* RCTBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 830213F31A654E0800B993E6 /* RCTBridgeModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B21DE32FB300C6C478 /* RCTBundleURLProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 68EFE4EC1CF6EB3000A1DE13 /* RCTBundleURLProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B31DE32FB300C6C478 /* RCTConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBACA1A6023D300E9B192 /* RCTConvert.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B41DE32FB300C6C478 /* RCTDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AF1F851AE6E777005F5298 /* RCTDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B51DE32FB300C6C478 /* RCTDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B61DE32FB300C6C478 /* RCTErrorCustomizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B71DE32FB300C6C478 /* RCTErrorInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B81DE32FB300C6C478 /* RCTEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA651A601EF300E9B192 /* RCTEventDispatcher.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545B91DE32FB300C6C478 /* RCTFrameUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1436DD071ADE7AA000A5ED7D /* RCTFrameUpdate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545BA1DE32FB300C6C478 /* RCTImageSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 13BB3D001BECD54500932C10 /* RCTImageSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545BB1DE32FB300C6C478 /* RCTInvalidating.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4C1A601E3B00E9B192 /* RCTInvalidating.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545BC1DE32FB300C6C478 /* RCTJavaScriptExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545BD1DE32FB300C6C478 /* RCTJavaScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 14200DA81AC179B3008EE6BA /* RCTJavaScriptLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545BE1DE32FB300C6C478 /* RCTJSStackFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 008341F51D1DB34400876D9A /* RCTJSStackFrame.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545BF1DE32FB300C6C478 /* RCTKeyCommands.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C01DE32FB300C6C478 /* RCTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4D1A601E3B00E9B192 /* RCTLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C11DE32FB300C6C478 /* RCTModuleData.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C2CA721B3AC64300E6CBB2 /* RCTModuleData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C21DE32FB300C6C478 /* RCTModuleMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C2CA6F1B3AC63800E6CBB2 /* RCTModuleMethod.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C31DE32FB300C6C478 /* RCTMultipartDataTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 006FC4121D9B20820057AAAD /* RCTMultipartDataTask.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C41DE32FB300C6C478 /* RCTMultipartStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 001BFCCE1D8381DE008E587E /* RCTMultipartStreamReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C51DE32FB300C6C478 /* RCTNullability.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A6E20F1C19ABC700845B82 /* RCTNullability.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C61DE32FB300C6C478 /* RCTParserUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A6E20C1C19AA0C00845B82 /* RCTParserUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C71DE32FB300C6C478 /* RCTPerformanceLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 142014181B32094000CC17BA /* RCTPerformanceLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C81DE32FB300C6C478 /* RCTPlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7749421DC1065C007EC8D8 /* RCTPlatform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545C91DE32FB300C6C478 /* RCTRootView.h in Headers */ = {isa = PBXBuildFile; fileRef = 830A229C1A66C68A008503DA /* RCTRootView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545CA1DE32FB300C6C478 /* RCTRootViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA21C07287B00BBAEAA /* RCTRootViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545CB1DE32FB300C6C478 /* RCTRootViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A15FB0C1BDF663500531DFB /* RCTRootViewInternal.h */; }; + 3D4545CC1DE32FB300C6C478 /* RCTTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 391E86A31C623EC800009732 /* RCTTouchEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545CD1DE32FB300C6C478 /* RCTTouchHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA961A6020BB00E9B192 /* RCTTouchHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545CE1DE32FB300C6C478 /* RCTURLRequestDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545CF1DE32FB300C6C478 /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D01DE32FB300C6C478 /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D11DE32FB300C6C478 /* RCTWebSocketProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketProxy.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D21DE32FB300C6C478 /* RCTWebSocketProxyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910711C74B21600838BBE /* RCTWebSocketProxyDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D31DE32FB300C6C478 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D41DE32FB300C6C478 /* RCTJSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D51DE32FB300C6C478 /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D61DE32FB300C6C478 /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D81DE32FB300C6C478 /* RCTAppState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1372B7081AB030C200659ED6 /* RCTAppState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545D91DE32FB300C6C478 /* RCTAsyncLocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A4F1AAE93D500E7D092 /* RCTAsyncLocalStorage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545DA1DE32FB300C6C478 /* RCTClipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 13D033611C1837FE0021DC29 /* RCTClipboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545DB1DE32FB300C6C478 /* RCTDevLoadingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545DC1DE32FB300C6C478 /* RCTDevMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545DD1DE32FB300C6C478 /* RCTEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 13D9FEE91CDCCECF00158BD7 /* RCTEventEmitter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545DE1DE32FB300C6C478 /* RCTExceptionsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE91A69327A00A75B9A /* RCTExceptionsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545DF1DE32FB300C6C478 /* RCTI18nManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B233E6E81D2D843200BC68BA /* RCTI18nManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E01DE32FB300C6C478 /* RCTI18nUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 352DCFEE1D19F4C20056D623 /* RCTI18nUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E11DE32FB300C6C478 /* RCTKeyboardObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 13D9FEEC1CDCD93000158BD7 /* RCTKeyboardObserver.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E21DE32FB300C6C478 /* RCTRedBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 13F17A831B8493E5007D4C75 /* RCTRedBox.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E31DE32FB300C6C478 /* RCTSourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 000E6CE91AB0E97F000CDF4D /* RCTSourceCode.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E41DE32FB300C6C478 /* RCTStatusBarManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13723B4E1A82FD3C00F88898 /* RCTStatusBarManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E51DE32FB300C6C478 /* RCTTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FED1A69327A00A75B9A /* RCTTiming.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E61DE32FB300C6C478 /* RCTUIManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067481A70F434002CDEE1 /* RCTUIManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E71DE32FB300C6C478 /* RCTFPSGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E81DE32FB300C6C478 /* RCTJSCProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545E91DE32FB300C6C478 /* RCTMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BF71811C04795500C97D0C /* RCTMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545EA1DE32FB300C6C478 /* RCTProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 1450FF801BCFF28A00208362 /* RCTProfile.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545EB1DE32FB300C6C478 /* RCTActivityIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545EC1DE32FB300C6C478 /* RCTActivityIndicatorViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080181A69489C00A75B9A /* RCTActivityIndicatorViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545ED1DE32FB300C6C478 /* RCTAnimationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF21AA90E0B0037E5B0 /* RCTAnimationType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545EE1DE32FB300C6C478 /* RCTAutoInsetsProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325261AA63B6A0048765F /* RCTAutoInsetsProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545EF1DE32FB300C6C478 /* RCTBorderDrawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 13CC8A801B17642100940AE7 /* RCTBorderDrawing.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F01DE32FB300C6C478 /* RCTBorderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = ACDD3FDA1BC7430D00E7DE33 /* RCTBorderStyle.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F11DE32FB300C6C478 /* RCTComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325281AA63B6A0048765F /* RCTComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F21DE32FB300C6C478 /* RCTComponentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AB90BF1B6FA36700713B4F /* RCTComponentData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F31DE32FB300C6C478 /* RCTConvert+CoreLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F41DE32FB300C6C478 /* RCTConvert+MapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F51DE32FB300C6C478 /* RCTDatePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 133CAE8C1B8E5CFD00F6AD92 /* RCTDatePicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F61DE32FB300C6C478 /* RCTDatePickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F71DE32FB300C6C478 /* RCTFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D37B5801D522B190042D5B5 /* RCTFont.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F81DE32FB300C6C478 /* RCTMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE11AAC4AE100FC20F4 /* RCTMap.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545F91DE32FB300C6C478 /* RCTMapAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545FA1DE32FB300C6C478 /* RCTMapManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545FB1DE32FB300C6C478 /* RCTMapOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545FC1DE32FB300C6C478 /* RCTModalHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545FD1DE32FB300C6C478 /* RCTModalHostViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545FE1DE32FB300C6C478 /* RCTModalHostViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4545FF1DE32FB300C6C478 /* RCTNavigator.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800C1A69489C00A75B9A /* RCTNavigator.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546001DE32FB300C6C478 /* RCTNavigatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546011DE32FB300C6C478 /* RCTNavItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080101A69489C00A75B9A /* RCTNavItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546021DE32FB300C6C478 /* RCTNavItemManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080121A69489C00A75B9A /* RCTNavItemManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546031DE32FB300C6C478 /* RCTPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A121AAE854800E7D092 /* RCTPicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546041DE32FB300C6C478 /* RCTPickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A141AAE854800E7D092 /* RCTPickerManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546051DE32FB300C6C478 /* RCTPointerEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF31AA90E0B0037E5B0 /* RCTPointerEvents.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546061DE32FB300C6C478 /* RCTProgressViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13513F3A1B1F43F400FCE529 /* RCTProgressViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546071DE32FB300C6C478 /* RCTRefreshControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 191E3EBF1C29DC3800C180A6 /* RCTRefreshControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546081DE32FB300C6C478 /* RCTRefreshControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 191E3EBC1C29D9AF00C180A6 /* RCTRefreshControlManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546091DE32FB300C6C478 /* RCTRootShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13BCE8071C99CB9D00DD7AAD /* RCTRootShadowView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45460A1DE32FB300C6C478 /* RCTScrollableProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325271AA63B6A0048765F /* RCTScrollableProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45460B1DE32FB300C6C478 /* RCTScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FF61A6947C200A75B9A /* RCTScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45460C1DE32FB300C6C478 /* RCTScrollViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FF81A6947C200A75B9A /* RCTScrollViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45460D1DE32FB300C6C478 /* RCTSegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 131B6AF01AF1093D00FFC3E0 /* RCTSegmentedControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45460E1DE32FB300C6C478 /* RCTSegmentedControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 131B6AF21AF1093D00FFC3E0 /* RCTSegmentedControlManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45460F1DE32FB300C6C478 /* RCTShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E0674B1A70F44B002CDEE1 /* RCTShadowView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546101DE32FB300C6C478 /* RCTSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AF20431AE707F8005F5298 /* RCTSlider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546111DE32FB300C6C478 /* RCTSliderManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F484541AABFCE100FDF6B9 /* RCTSliderManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546121DE32FB300C6C478 /* RCTSwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F362071AABD06A001CE568 /* RCTSwitch.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546131DE32FB300C6C478 /* RCTSwitchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F362091AABD06A001CE568 /* RCTSwitchManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546141DE32FB300C6C478 /* RCTTabBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327DF1AA5CF210034F82E /* RCTTabBar.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546151DE32FB300C6C478 /* RCTTabBarItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327E11AA5CF210034F82E /* RCTTabBarItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546161DE32FB300C6C478 /* RCTTabBarItemManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327E31AA5CF210034F82E /* RCTTabBarItemManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546171DE32FB300C6C478 /* RCTTabBarManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327E51AA5CF210034F82E /* RCTTabBarManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546181DE32FB300C6C478 /* RCTTextDecorationLineType.h in Headers */ = {isa = PBXBuildFile; fileRef = E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546191DE32FB300C6C478 /* RCTView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E0674F1A70F44B002CDEE1 /* RCTView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45461A1DE32FB300C6C478 /* RCTViewControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF41AA90E0B0037E5B0 /* RCTViewControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45461B1DE32FB300C6C478 /* RCTViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E0674D1A70F44B002CDEE1 /* RCTViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45461C1DE32FB300C6C478 /* RCTWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C156011AB1A2840079392D /* RCTWebView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45461D1DE32FB300C6C478 /* RCTWebViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C156031AB1A2840079392D /* RCTWebViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45461E1DE32FB300C6C478 /* RCTWrapperViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546201DE32FB300C6C478 /* UIView+React.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546221DE32FEC00C6C478 /* RCTAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546231DE32FEC00C6C478 /* RCTBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546241DE32FEC00C6C478 /* RCTBridge+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DB81C1F849600794BC8 /* RCTBridge+Private.h */; }; + 3D4546251DE32FEC00C6C478 /* RCTBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482F9E61B55B927000ADFF3 /* RCTBridgeDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546261DE32FEC00C6C478 /* RCTBridgeMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA11C07287B00BBAEAA /* RCTBridgeMethod.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546271DE32FEC00C6C478 /* RCTBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 830213F31A654E0800B993E6 /* RCTBridgeModule.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546281DE32FEC00C6C478 /* RCTBundleURLProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 68EFE4EC1CF6EB3000A1DE13 /* RCTBundleURLProvider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546291DE32FEC00C6C478 /* RCTConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBACA1A6023D300E9B192 /* RCTConvert.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45462A1DE32FEC00C6C478 /* RCTDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AF1F851AE6E777005F5298 /* RCTDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45462B1DE32FEC00C6C478 /* RCTDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45462C1DE32FEC00C6C478 /* RCTErrorCustomizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EDCA8A21D3591E700450C31 /* RCTErrorCustomizer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45462D1DE32FEC00C6C478 /* RCTErrorInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EDCA8A31D3591E700450C31 /* RCTErrorInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45462E1DE32FEC00C6C478 /* RCTEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA651A601EF300E9B192 /* RCTEventDispatcher.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45462F1DE32FEC00C6C478 /* RCTFrameUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1436DD071ADE7AA000A5ED7D /* RCTFrameUpdate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546301DE32FEC00C6C478 /* RCTImageSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 13BB3D001BECD54500932C10 /* RCTImageSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546311DE32FEC00C6C478 /* RCTInvalidating.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4C1A601E3B00E9B192 /* RCTInvalidating.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546321DE32FEC00C6C478 /* RCTJavaScriptExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546331DE32FEC00C6C478 /* RCTJavaScriptLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 14200DA81AC179B3008EE6BA /* RCTJavaScriptLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546341DE32FEC00C6C478 /* RCTJSStackFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 008341F51D1DB34400876D9A /* RCTJSStackFrame.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546351DE32FEC00C6C478 /* RCTKeyCommands.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546361DE32FEC00C6C478 /* RCTLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4D1A601E3B00E9B192 /* RCTLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546371DE32FEC00C6C478 /* RCTModuleData.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C2CA721B3AC64300E6CBB2 /* RCTModuleData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546381DE32FEC00C6C478 /* RCTModuleMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C2CA6F1B3AC63800E6CBB2 /* RCTModuleMethod.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546391DE32FEC00C6C478 /* RCTMultipartDataTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 006FC4121D9B20820057AAAD /* RCTMultipartDataTask.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45463A1DE32FEC00C6C478 /* RCTMultipartStreamReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 001BFCCE1D8381DE008E587E /* RCTMultipartStreamReader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45463B1DE32FEC00C6C478 /* RCTNullability.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A6E20F1C19ABC700845B82 /* RCTNullability.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45463C1DE32FEC00C6C478 /* RCTParserUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A6E20C1C19AA0C00845B82 /* RCTParserUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45463D1DE32FEC00C6C478 /* RCTPerformanceLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 142014181B32094000CC17BA /* RCTPerformanceLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45463E1DE32FEC00C6C478 /* RCTPlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7749421DC1065C007EC8D8 /* RCTPlatform.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45463F1DE32FEC00C6C478 /* RCTRootView.h in Headers */ = {isa = PBXBuildFile; fileRef = 830A229C1A66C68A008503DA /* RCTRootView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546401DE32FEC00C6C478 /* RCTRootViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBCA21C07287B00BBAEAA /* RCTRootViewDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546411DE32FEC00C6C478 /* RCTRootViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A15FB0C1BDF663500531DFB /* RCTRootViewInternal.h */; }; + 3D4546421DE32FEC00C6C478 /* RCTTouchEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 391E86A31C623EC800009732 /* RCTTouchEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546431DE32FEC00C6C478 /* RCTTouchHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA961A6020BB00E9B192 /* RCTTouchHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546441DE32FEC00C6C478 /* RCTURLRequestDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546451DE32FEC00C6C478 /* RCTURLRequestHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546461DE32FEC00C6C478 /* RCTUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 83CBBA4F1A601E3B00E9B192 /* RCTUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546471DE32FEC00C6C478 /* RCTWebSocketProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910701C74B21600838BBE /* RCTWebSocketProxy.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546481DE32FEC00C6C478 /* RCTWebSocketProxyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DB910711C74B21600838BBE /* RCTWebSocketProxyDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546491DE32FEC00C6C478 /* RCTJSCErrorHandling.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DC724301D8BF99A00808C32 /* RCTJSCErrorHandling.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45464A1DE32FEC00C6C478 /* RCTJSCExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45464B1DE32FEC00C6C478 /* JSCSamplingProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 369123DF1DDC75850095B341 /* JSCSamplingProfiler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45464C1DE32FEC00C6C478 /* RCTAccessibilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E9B20B791B500126007A2DA7 /* RCTAccessibilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45464D1DE32FEC00C6C478 /* RCTAlertManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45464E1DE32FEC00C6C478 /* RCTAppState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1372B7081AB030C200659ED6 /* RCTAppState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45464F1DE32FEC00C6C478 /* RCTAsyncLocalStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A4F1AAE93D500E7D092 /* RCTAsyncLocalStorage.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546501DE32FEC00C6C478 /* RCTClipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 13D033611C1837FE0021DC29 /* RCTClipboard.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546511DE32FEC00C6C478 /* RCTDevLoadingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546521DE32FEC00C6C478 /* RCTDevMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546531DE32FEC00C6C478 /* RCTEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 13D9FEE91CDCCECF00158BD7 /* RCTEventEmitter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546541DE32FEC00C6C478 /* RCTExceptionsManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FE91A69327A00A75B9A /* RCTExceptionsManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546551DE32FEC00C6C478 /* RCTI18nManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B233E6E81D2D843200BC68BA /* RCTI18nManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546561DE32FEC00C6C478 /* RCTI18nUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 352DCFEE1D19F4C20056D623 /* RCTI18nUtil.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546571DE32FEC00C6C478 /* RCTKeyboardObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 13D9FEEC1CDCD93000158BD7 /* RCTKeyboardObserver.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546581DE32FEC00C6C478 /* RCTRedBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 13F17A831B8493E5007D4C75 /* RCTRedBox.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546591DE32FEC00C6C478 /* RCTSourceCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 000E6CE91AB0E97F000CDF4D /* RCTSourceCode.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45465A1DE32FEC00C6C478 /* RCTStatusBarManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13723B4E1A82FD3C00F88898 /* RCTStatusBarManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45465B1DE32FEC00C6C478 /* RCTTiming.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FED1A69327A00A75B9A /* RCTTiming.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45465C1DE32FEC00C6C478 /* RCTUIManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067481A70F434002CDEE1 /* RCTUIManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45465D1DE32FEC00C6C478 /* RCTFPSGraph.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45465E1DE32FEC00C6C478 /* RCTJSCProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A43DF11C20B1C900794BC8 /* RCTJSCProfiler.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45465F1DE32FEC00C6C478 /* RCTMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 14BF71811C04795500C97D0C /* RCTMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546601DE32FEC00C6C478 /* RCTProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 1450FF801BCFF28A00208362 /* RCTProfile.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546611DE32FEC00C6C478 /* RCTActivityIndicatorView.h in Headers */ = {isa = PBXBuildFile; fileRef = B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546621DE32FEC00C6C478 /* RCTActivityIndicatorViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080181A69489C00A75B9A /* RCTActivityIndicatorViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546631DE32FEC00C6C478 /* RCTAnimationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF21AA90E0B0037E5B0 /* RCTAnimationType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546641DE32FEC00C6C478 /* RCTAutoInsetsProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325261AA63B6A0048765F /* RCTAutoInsetsProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546651DE32FEC00C6C478 /* RCTBorderDrawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 13CC8A801B17642100940AE7 /* RCTBorderDrawing.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546661DE32FEC00C6C478 /* RCTBorderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = ACDD3FDA1BC7430D00E7DE33 /* RCTBorderStyle.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546671DE32FEC00C6C478 /* RCTComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325281AA63B6A0048765F /* RCTComponent.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546681DE32FEC00C6C478 /* RCTComponentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AB90BF1B6FA36700713B4F /* RCTComponentData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546691DE32FEC00C6C478 /* RCTConvert+CoreLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E911ADAD2DE009F94A7 /* RCTConvert+CoreLocation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45466A1DE32FEC00C6C478 /* RCTConvert+MapKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 13456E941ADAD482009F94A7 /* RCTConvert+MapKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45466B1DE32FEC00C6C478 /* RCTDatePicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 133CAE8C1B8E5CFD00F6AD92 /* RCTDatePicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45466C1DE32FEC00C6C478 /* RCTDatePickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45466D1DE32FEC00C6C478 /* RCTFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D37B5801D522B190042D5B5 /* RCTFont.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45466E1DE32FEC00C6C478 /* RCTMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE11AAC4AE100FC20F4 /* RCTMap.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45466F1DE32FEC00C6C478 /* RCTMapAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546701DE32FEC00C6C478 /* RCTMapManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14435CE31AAC4AE100FC20F4 /* RCTMapManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546711DE32FEC00C6C478 /* RCTMapOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AFBC9E1C07247D00BBAEAA /* RCTMapOverlay.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546721DE32FEC00C6C478 /* RCTModalHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546731DE32FEC00C6C478 /* RCTModalHostViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546741DE32FEC00C6C478 /* RCTModalHostViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546751DE32FEC00C6C478 /* RCTNavigator.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800C1A69489C00A75B9A /* RCTNavigator.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546761DE32FEC00C6C478 /* RCTNavigatorManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B0800E1A69489C00A75B9A /* RCTNavigatorManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546771DE32FEC00C6C478 /* RCTNavItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080101A69489C00A75B9A /* RCTNavItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546781DE32FEC00C6C478 /* RCTNavItemManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080121A69489C00A75B9A /* RCTNavItemManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546791DE32FEC00C6C478 /* RCTPicker.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A121AAE854800E7D092 /* RCTPicker.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45467A1DE32FEC00C6C478 /* RCTPickerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 58114A141AAE854800E7D092 /* RCTPickerManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45467B1DE32FEC00C6C478 /* RCTPointerEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF31AA90E0B0037E5B0 /* RCTPointerEvents.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45467C1DE32FEC00C6C478 /* RCTProgressViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13513F3A1B1F43F400FCE529 /* RCTProgressViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45467D1DE32FEC00C6C478 /* RCTRefreshControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 191E3EBF1C29DC3800C180A6 /* RCTRefreshControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45467E1DE32FEC00C6C478 /* RCTRefreshControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 191E3EBC1C29D9AF00C180A6 /* RCTRefreshControlManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45467F1DE32FEC00C6C478 /* RCTRootShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13BCE8071C99CB9D00DD7AAD /* RCTRootShadowView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546801DE32FEC00C6C478 /* RCTScrollableProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C325271AA63B6A0048765F /* RCTScrollableProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546811DE32FEC00C6C478 /* RCTScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FF61A6947C200A75B9A /* RCTScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546821DE32FEC00C6C478 /* RCTScrollViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B07FF81A6947C200A75B9A /* RCTScrollViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546831DE32FEC00C6C478 /* RCTSegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 131B6AF01AF1093D00FFC3E0 /* RCTSegmentedControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546841DE32FEC00C6C478 /* RCTSegmentedControlManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 131B6AF21AF1093D00FFC3E0 /* RCTSegmentedControlManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546851DE32FEC00C6C478 /* RCTShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E0674B1A70F44B002CDEE1 /* RCTShadowView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546861DE32FEC00C6C478 /* RCTSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 13AF20431AE707F8005F5298 /* RCTSlider.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546871DE32FEC00C6C478 /* RCTSliderManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F484541AABFCE100FDF6B9 /* RCTSliderManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546881DE32FEC00C6C478 /* RCTSwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F362071AABD06A001CE568 /* RCTSwitch.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546891DE32FEC00C6C478 /* RCTSwitchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F362091AABD06A001CE568 /* RCTSwitchManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45468A1DE32FEC00C6C478 /* RCTTabBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327DF1AA5CF210034F82E /* RCTTabBar.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45468B1DE32FEC00C6C478 /* RCTTabBarItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327E11AA5CF210034F82E /* RCTTabBarItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45468C1DE32FEC00C6C478 /* RCTTabBarItemManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327E31AA5CF210034F82E /* RCTTabBarItemManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45468D1DE32FEC00C6C478 /* RCTTabBarManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 137327E51AA5CF210034F82E /* RCTTabBarManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45468E1DE32FEC00C6C478 /* RCTTextDecorationLineType.h in Headers */ = {isa = PBXBuildFile; fileRef = E3BBC8EB1ADE6F47001BBD81 /* RCTTextDecorationLineType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D45468F1DE32FEC00C6C478 /* RCTView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E0674F1A70F44B002CDEE1 /* RCTView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546901DE32FEC00C6C478 /* RCTViewControllerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 13442BF41AA90E0B0037E5B0 /* RCTViewControllerProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546911DE32FEC00C6C478 /* RCTViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E0674D1A70F44B002CDEE1 /* RCTViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546921DE32FEC00C6C478 /* RCTWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C156011AB1A2840079392D /* RCTWebView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546931DE32FEC00C6C478 /* RCTWebViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 13C156031AB1A2840079392D /* RCTWebViewManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546941DE32FEC00C6C478 /* RCTWrapperViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D4546961DE32FEC00C6C478 /* UIView+React.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3D5FA6881DE4B9B30058FD77 /* RCTJSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C199EC1CD2407900DAD810 /* RCTJSCWrapper.h */; }; + 3D5FA6891DE4B9B30058FD77 /* RCTJSCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 85C199EC1CD2407900DAD810 /* RCTJSCWrapper.h */; }; 3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */; }; 3DC724321D8BF99A00808C32 /* RCTJSCErrorHandling.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DC724311D8BF99A00808C32 /* RCTJSCErrorHandling.m */; }; 3DDEC1521DDCE0CA0020BBDF /* JSCSamplingProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 369123E01DDC75850095B341 /* JSCSamplingProfiler.m */; }; @@ -198,27 +455,22 @@ E9B20B7B1B500126007A2DA7 /* RCTAccessibilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9B20B7A1B500126007A2DA7 /* RCTAccessibilityManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - 2D2A28111D9B038B00D4039D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; +/* Begin PBXContainerItemProxy section */ + 3D14D9F11DE48E1600386448 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3D3C059B1DE3340C00C268FA; + remoteInfo = "CSSLayout-tvOS"; }; - 83CBBA2C1A601D0E00E9B192 /* Copy Files */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "include/$(PRODUCT_NAME)"; - dstSubfolderSpec = 16; - files = ( - ); - name = "Copy Files"; - runOnlyForDeploymentPostprocessing = 0; + 3D14D9F31DE48E1F00386448 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3D3C04B91DE3340900C268FA; + remoteInfo = CSSLayout; }; -/* End PBXCopyFilesBuildPhase section */ +/* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 000E6CE91AB0E97F000CDF4D /* RCTSourceCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSourceCode.h; sourceTree = ""; }; @@ -249,7 +501,7 @@ 13456E951ADAD482009F94A7 /* RCTConvert+MapKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+MapKit.m"; sourceTree = ""; }; 1345A83A1B265A0E00583190 /* RCTURLRequestDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTURLRequestDelegate.h; sourceTree = ""; }; 1345A83B1B265A0E00583190 /* RCTURLRequestHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTURLRequestHandler.h; sourceTree = ""; }; - 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCExecutor.h; sourceTree = ""; }; + 134FCB391A6E7F0800051CC8 /* RCTJSCExecutor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTJSCExecutor.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 134FCB3A1A6E7F0800051CC8 /* RCTJSCExecutor.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJSCExecutor.mm; sourceTree = ""; }; 13513F3A1B1F43F400FCE529 /* RCTProgressViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTProgressViewManager.h; sourceTree = ""; }; 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTProgressViewManager.m; sourceTree = ""; }; @@ -265,9 +517,9 @@ 137327E41AA5CF210034F82E /* RCTTabBarItemManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarItemManager.m; sourceTree = ""; }; 137327E51AA5CF210034F82E /* RCTTabBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTabBarManager.h; sourceTree = ""; }; 137327E61AA5CF210034F82E /* RCTTabBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTabBarManager.m; sourceTree = ""; }; - 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDevLoadingView.h; sourceTree = ""; }; + 13A0C2851B74F71200B29F6F /* RCTDevLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevLoadingView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13A0C2861B74F71200B29F6F /* RCTDevLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevLoadingView.m; sourceTree = ""; }; - 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDevMenu.h; sourceTree = ""; }; + 13A0C2871B74F71200B29F6F /* RCTDevMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDevMenu.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13A0C2881B74F71200B29F6F /* RCTDevMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevMenu.m; sourceTree = ""; }; 13A1F71C1A75392D00D3D453 /* RCTKeyCommands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTKeyCommands.h; sourceTree = ""; }; 13A1F71D1A75392D00D3D453 /* RCTKeyCommands.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTKeyCommands.m; sourceTree = ""; }; @@ -285,7 +537,7 @@ 13AFBCA21C07287B00BBAEAA /* RCTRootViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootViewDelegate.h; sourceTree = ""; }; 13B07FE71A69327A00A75B9A /* RCTAlertManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAlertManager.h; sourceTree = ""; }; 13B07FE81A69327A00A75B9A /* RCTAlertManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAlertManager.m; sourceTree = ""; }; - 13B07FE91A69327A00A75B9A /* RCTExceptionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTExceptionsManager.h; sourceTree = ""; }; + 13B07FE91A69327A00A75B9A /* RCTExceptionsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTExceptionsManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13B07FEA1A69327A00A75B9A /* RCTExceptionsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTExceptionsManager.m; sourceTree = ""; }; 13B07FED1A69327A00A75B9A /* RCTTiming.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTiming.h; sourceTree = ""; }; 13B07FEE1A69327A00A75B9A /* RCTTiming.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTiming.m; sourceTree = ""; }; @@ -307,7 +559,7 @@ 13B080241A694A8400A75B9A /* RCTWrapperViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTWrapperViewController.m; sourceTree = ""; }; 13B202021BFB948C00C07393 /* RCTMapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMapAnnotation.h; sourceTree = ""; }; 13B202031BFB948C00C07393 /* RCTMapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMapAnnotation.m; sourceTree = ""; }; - 13BB3D001BECD54500932C10 /* RCTImageSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageSource.h; sourceTree = ""; }; + 13BB3D001BECD54500932C10 /* RCTImageSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTImageSource.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13BB3D011BECD54500932C10 /* RCTImageSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageSource.m; sourceTree = ""; }; 13BCE8071C99CB9D00DD7AAD /* RCTRootShadowView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootShadowView.h; sourceTree = ""; }; 13BCE8081C99CB9D00DD7AAD /* RCTRootShadowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootShadowView.m; sourceTree = ""; }; @@ -322,7 +574,7 @@ 13CC8A811B17642100940AE7 /* RCTBorderDrawing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBorderDrawing.m; sourceTree = ""; }; 13D033611C1837FE0021DC29 /* RCTClipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTClipboard.h; sourceTree = ""; }; 13D033621C1837FE0021DC29 /* RCTClipboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTClipboard.m; sourceTree = ""; }; - 13D9FEE91CDCCECF00158BD7 /* RCTEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTEventEmitter.h; sourceTree = ""; }; + 13D9FEE91CDCCECF00158BD7 /* RCTEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTEventEmitter.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 13D9FEEA1CDCCECF00158BD7 /* RCTEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventEmitter.m; sourceTree = ""; }; 13D9FEEC1CDCD93000158BD7 /* RCTKeyboardObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTKeyboardObserver.h; sourceTree = ""; }; 13D9FEED1CDCD93000158BD7 /* RCTKeyboardObserver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTKeyboardObserver.m; sourceTree = ""; }; @@ -370,7 +622,7 @@ 14F484541AABFCE100FDF6B9 /* RCTSliderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSliderManager.h; sourceTree = ""; }; 14F484551AABFCE100FDF6B9 /* RCTSliderManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSliderManager.m; sourceTree = ""; }; 14F7A0EB1BDA3B3C003C6C10 /* RCTPerfMonitor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPerfMonitor.m; sourceTree = ""; }; - 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTFPSGraph.h; sourceTree = ""; }; + 14F7A0EE1BDA714B003C6C10 /* RCTFPSGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTFPSGraph.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 14F7A0EF1BDA714B003C6C10 /* RCTFPSGraph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTFPSGraph.m; sourceTree = ""; }; 191E3EBC1C29D9AF00C180A6 /* RCTRefreshControlManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRefreshControlManager.h; sourceTree = ""; }; 191E3EBD1C29D9AF00C180A6 /* RCTRefreshControlManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRefreshControlManager.m; sourceTree = ""; }; @@ -386,8 +638,17 @@ 3D10A3C81DDF3D16004A0F9D /* CSSEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSEnums.h; sourceTree = ""; }; 3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = ""; }; 3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = ""; }; - 3D37B5801D522B190042D5B5 /* RCTFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTFont.h; sourceTree = ""; }; + 3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworking.h; sourceTree = ""; }; + 3D1FA07B1DE4F2EA00E03CC6 /* RCTNetworkTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworkTask.h; sourceTree = ""; }; + 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageLoader.h; sourceTree = ""; }; + 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageStoreManager.h; sourceTree = ""; }; + 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTResizeMode.h; sourceTree = ""; }; + 3D1FA08B1DE4F4DD00E03CC6 /* RCTLinkingManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLinkingManager.h; sourceTree = ""; }; + 3D1FA08D1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTPushNotificationManager.h; path = PushNotificationIOS/RCTPushNotificationManager.h; sourceTree = ""; }; + 3D37B5801D522B190042D5B5 /* RCTFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTFont.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 3D37B5811D522B190042D5B5 /* RCTFont.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTFont.mm; sourceTree = ""; }; + 3D3C059A1DE3340900C268FA /* libCSSLayout.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCSSLayout.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 3D3C06751DE3340C00C268FA /* libCSSLayout-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCSSLayout-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3D7749421DC1065C007EC8D8 /* RCTPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTPlatform.h; sourceTree = ""; }; 3D7749431DC1065C007EC8D8 /* RCTPlatform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTPlatform.m; sourceTree = ""; }; 3DB910701C74B21600838BBE /* RCTWebSocketProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTWebSocketProxy.h; sourceTree = ""; }; @@ -404,7 +665,7 @@ 58114A4E1AAE93D500E7D092 /* RCTAsyncLocalStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAsyncLocalStorage.m; sourceTree = ""; }; 58114A4F1AAE93D500E7D092 /* RCTAsyncLocalStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAsyncLocalStorage.h; sourceTree = ""; }; 58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDatePickerManager.m; sourceTree = ""; }; - 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDatePickerManager.h; sourceTree = ""; }; + 58C571C01AA56C1900CDF9C8 /* RCTDatePickerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTDatePickerManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 68EFE4EC1CF6EB3000A1DE13 /* RCTBundleURLProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBundleURLProvider.h; sourceTree = ""; }; 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBundleURLProvider.m; sourceTree = ""; }; 6A15FB0C1BDF663500531DFB /* RCTRootViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootViewInternal.h; sourceTree = ""; }; @@ -427,12 +688,12 @@ 83CBBA501A601E3B00E9B192 /* RCTUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUtils.m; sourceTree = ""; }; 83CBBA5E1A601EAA00E9B192 /* RCTBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBridge.h; sourceTree = ""; }; 83CBBA5F1A601EAA00E9B192 /* RCTBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBridge.m; sourceTree = ""; }; - 83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTJavaScriptExecutor.h; sourceTree = ""; }; - 83CBBA651A601EF300E9B192 /* RCTEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTEventDispatcher.h; sourceTree = ""; }; + 83CBBA631A601ECA00E9B192 /* RCTJavaScriptExecutor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTJavaScriptExecutor.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 83CBBA651A601EF300E9B192 /* RCTEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTEventDispatcher.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 83CBBA661A601EF300E9B192 /* RCTEventDispatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTEventDispatcher.m; sourceTree = ""; }; 83CBBA961A6020BB00E9B192 /* RCTTouchHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTouchHandler.h; sourceTree = ""; }; 83CBBA971A6020BB00E9B192 /* RCTTouchHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTouchHandler.m; sourceTree = ""; }; - 83CBBACA1A6023D300E9B192 /* RCTConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTConvert.h; sourceTree = ""; }; + 83CBBACA1A6023D300E9B192 /* RCTConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTConvert.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 83CBBACB1A6023D300E9B192 /* RCTConvert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTConvert.m; sourceTree = ""; }; 83F15A171B7CC46900F10295 /* UIView+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Private.h"; sourceTree = ""; }; 85C199EC1CD2407900DAD810 /* RCTJSCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSCWrapper.h; sourceTree = ""; }; @@ -442,7 +703,7 @@ AC70D2EC1DE48A22002E6351 /* JSBundleType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSBundleType.h; path = cxxreact/JSBundleType.h; sourceTree = ""; }; AC70D2EE1DE48AC5002E6351 /* oss-compat-util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "oss-compat-util.h"; path = "cxxreact/oss-compat-util.h"; sourceTree = ""; }; ACDD3FDA1BC7430D00E7DE33 /* RCTBorderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBorderStyle.h; sourceTree = ""; }; - B233E6E81D2D843200BC68BA /* RCTI18nManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTI18nManager.h; sourceTree = ""; }; + B233E6E81D2D843200BC68BA /* RCTI18nManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = RCTI18nManager.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTI18nManager.m; sourceTree = ""; }; B95154301D1B34B200FE7B80 /* RCTActivityIndicatorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTActivityIndicatorView.h; sourceTree = ""; }; B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTActivityIndicatorView.m; sourceTree = ""; }; @@ -452,17 +713,19 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 2D2A28101D9B038B00D4039D /* Frameworks */ = { + 3D3C08881DE342EE00C268FA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3D3C08891DE342FB00C268FA /* libCSSLayout.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 83CBBA2B1A601D0E00E9B192 /* Frameworks */ = { + 3D3C088B1DE342FE00C268FA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3D3C088C1DE3430500C268FA /* libCSSLayout-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -674,9 +937,57 @@ path = ../ReactCommon; sourceTree = ""; }; + 3D1FA0781DE4F2CD00E03CC6 /* Libraries */ = { + isa = PBXGroup; + children = ( + 3D1FA0821DE4F36600E03CC6 /* Image */, + 3D1FA0891DE4F4B900E03CC6 /* LinkingIOS */, + 3D1FA0791DE4F2D200E03CC6 /* Network */, + 3D1FA08A1DE4F4D600E03CC6 /* PushNotificationIOS */, + ); + name = Libraries; + path = ../Libraries; + sourceTree = ""; + }; + 3D1FA0791DE4F2D200E03CC6 /* Network */ = { + isa = PBXGroup; + children = ( + 3D1FA07A1DE4F2EA00E03CC6 /* RCTNetworking.h */, + 3D1FA07B1DE4F2EA00E03CC6 /* RCTNetworkTask.h */, + ); + path = Network; + sourceTree = ""; + }; + 3D1FA0821DE4F36600E03CC6 /* Image */ = { + isa = PBXGroup; + children = ( + 3D1FA0831DE4F3A000E03CC6 /* RCTImageLoader.h */, + 3D1FA0841DE4F3A000E03CC6 /* RCTImageStoreManager.h */, + 3D1FA0851DE4F3A000E03CC6 /* RCTResizeMode.h */, + ); + path = Image; + sourceTree = ""; + }; + 3D1FA0891DE4F4B900E03CC6 /* LinkingIOS */ = { + isa = PBXGroup; + children = ( + 3D1FA08B1DE4F4DD00E03CC6 /* RCTLinkingManager.h */, + ); + path = LinkingIOS; + sourceTree = ""; + }; + 3D1FA08A1DE4F4D600E03CC6 /* PushNotificationIOS */ = { + isa = PBXGroup; + children = ( + 3D1FA08D1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h */, + ); + name = PushNotificationIOS; + sourceTree = ""; + }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + 3D1FA0781DE4F2CD00E03CC6 /* Libraries */, 83CBBA2F1A601D0F00E9B192 /* React */, 3D10A3C71DDF3CED004A0F9D /* ReactCommon */, 83CBBA001A601CBA00E9B192 /* Products */, @@ -690,6 +1001,8 @@ children = ( 83CBBA2E1A601D0E00E9B192 /* libReact.a */, 2D2A28131D9B038B00D4039D /* libReact-tvOS.a */, + 3D3C059A1DE3340900C268FA /* libCSSLayout.a */, + 3D3C06751DE3340C00C268FA /* libCSSLayout-tvOS.a */, ); name = Products; sourceTree = ""; @@ -789,39 +1102,360 @@ }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 3D3C04BB1DE3340900C268FA /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D3C083D1DE334D900C268FA /* CSSMacros.h in Headers */, + 3D3C083C1DE334D900C268FA /* CSSLayout.h in Headers */, + 3D3C083E1DE334D900C268FA /* CSSNodeList.h in Headers */, + 3D3C083B1DE334D900C268FA /* CSSEnums.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3D3C059D1DE3340C00C268FA /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D3C08411DE334DA00C268FA /* CSSMacros.h in Headers */, + 3D3C08401DE334DA00C268FA /* CSSLayout.h in Headers */, + 3D3C08421DE334DA00C268FA /* CSSNodeList.h in Headers */, + 3D3C083F1DE334DA00C268FA /* CSSEnums.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3D4545AB1DE32F8E00C6C478 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D4545AC1DE32FB300C6C478 /* RCTAssert.h in Headers */, + 3D4545AD1DE32FB300C6C478 /* RCTBridge.h in Headers */, + 3D4545AE1DE32FB300C6C478 /* RCTBridge+Private.h in Headers */, + 3D4545AF1DE32FB300C6C478 /* RCTBridgeDelegate.h in Headers */, + 3D4545B01DE32FB300C6C478 /* RCTBridgeMethod.h in Headers */, + 3D4545B11DE32FB300C6C478 /* RCTBridgeModule.h in Headers */, + 3D4545B21DE32FB300C6C478 /* RCTBundleURLProvider.h in Headers */, + 3D4545B31DE32FB300C6C478 /* RCTConvert.h in Headers */, + 3D4545B41DE32FB300C6C478 /* RCTDefines.h in Headers */, + 3D1FA0861DE4F3A000E03CC6 /* RCTImageLoader.h in Headers */, + 3D4545B51DE32FB300C6C478 /* RCTDisplayLink.h in Headers */, + 3D4545B61DE32FB300C6C478 /* RCTErrorCustomizer.h in Headers */, + 3D4545B71DE32FB300C6C478 /* RCTErrorInfo.h in Headers */, + 3D4545B81DE32FB300C6C478 /* RCTEventDispatcher.h in Headers */, + 3D4545B91DE32FB300C6C478 /* RCTFrameUpdate.h in Headers */, + 3D4545BA1DE32FB300C6C478 /* RCTImageSource.h in Headers */, + 3D4545BB1DE32FB300C6C478 /* RCTInvalidating.h in Headers */, + 3D4545BC1DE32FB300C6C478 /* RCTJavaScriptExecutor.h in Headers */, + 3D4545BD1DE32FB300C6C478 /* RCTJavaScriptLoader.h in Headers */, + 3D1FA0871DE4F3A000E03CC6 /* RCTImageStoreManager.h in Headers */, + 3D4545BE1DE32FB300C6C478 /* RCTJSStackFrame.h in Headers */, + 3D1FA08E1DE4F4EE00E03CC6 /* RCTPushNotificationManager.h in Headers */, + 3D4545BF1DE32FB300C6C478 /* RCTKeyCommands.h in Headers */, + 3D4545C01DE32FB300C6C478 /* RCTLog.h in Headers */, + 3D4545C11DE32FB300C6C478 /* RCTModuleData.h in Headers */, + 3D4545C21DE32FB300C6C478 /* RCTModuleMethod.h in Headers */, + 3D4545C31DE32FB300C6C478 /* RCTMultipartDataTask.h in Headers */, + 3D4545C41DE32FB300C6C478 /* RCTMultipartStreamReader.h in Headers */, + 3D4545C51DE32FB300C6C478 /* RCTNullability.h in Headers */, + 3D4545C61DE32FB300C6C478 /* RCTParserUtils.h in Headers */, + 3D4545C71DE32FB300C6C478 /* RCTPerformanceLogger.h in Headers */, + 3D4545C81DE32FB300C6C478 /* RCTPlatform.h in Headers */, + 3D1FA07D1DE4F2EA00E03CC6 /* RCTNetworkTask.h in Headers */, + 3D4545C91DE32FB300C6C478 /* RCTRootView.h in Headers */, + 3D4545CA1DE32FB300C6C478 /* RCTRootViewDelegate.h in Headers */, + 3D4545CB1DE32FB300C6C478 /* RCTRootViewInternal.h in Headers */, + 3D4545CC1DE32FB300C6C478 /* RCTTouchEvent.h in Headers */, + 3D4545CD1DE32FB300C6C478 /* RCTTouchHandler.h in Headers */, + 3D1FA07C1DE4F2EA00E03CC6 /* RCTNetworking.h in Headers */, + 3D4545CE1DE32FB300C6C478 /* RCTURLRequestDelegate.h in Headers */, + 3D4545CF1DE32FB300C6C478 /* RCTURLRequestHandler.h in Headers */, + 3D4545D01DE32FB300C6C478 /* RCTUtils.h in Headers */, + 3D4545D11DE32FB300C6C478 /* RCTWebSocketProxy.h in Headers */, + 3D4545D21DE32FB300C6C478 /* RCTWebSocketProxyDelegate.h in Headers */, + 3D5FA6881DE4B9B30058FD77 /* RCTJSCWrapper.h in Headers */, + 3D4545D31DE32FB300C6C478 /* RCTJSCErrorHandling.h in Headers */, + 3D4545D41DE32FB300C6C478 /* RCTJSCExecutor.h in Headers */, + 3D4545D51DE32FB300C6C478 /* JSCSamplingProfiler.h in Headers */, + 3D4545D61DE32FB300C6C478 /* RCTAccessibilityManager.h in Headers */, + 3D4545D81DE32FB300C6C478 /* RCTAppState.h in Headers */, + 3D4545D91DE32FB300C6C478 /* RCTAsyncLocalStorage.h in Headers */, + 3D4545DA1DE32FB300C6C478 /* RCTClipboard.h in Headers */, + 3D4545DB1DE32FB300C6C478 /* RCTDevLoadingView.h in Headers */, + 3D4545DC1DE32FB300C6C478 /* RCTDevMenu.h in Headers */, + 3D4545DD1DE32FB300C6C478 /* RCTEventEmitter.h in Headers */, + 3D4545DE1DE32FB300C6C478 /* RCTExceptionsManager.h in Headers */, + 3D1FA0881DE4F3A000E03CC6 /* RCTResizeMode.h in Headers */, + 3D4545DF1DE32FB300C6C478 /* RCTI18nManager.h in Headers */, + 3D4545E01DE32FB300C6C478 /* RCTI18nUtil.h in Headers */, + 3D1FA08C1DE4F4DD00E03CC6 /* RCTLinkingManager.h in Headers */, + 3D4545E11DE32FB300C6C478 /* RCTKeyboardObserver.h in Headers */, + 3D4545E21DE32FB300C6C478 /* RCTRedBox.h in Headers */, + 3D4545E31DE32FB300C6C478 /* RCTSourceCode.h in Headers */, + 3D4545E41DE32FB300C6C478 /* RCTStatusBarManager.h in Headers */, + 3D4545E51DE32FB300C6C478 /* RCTTiming.h in Headers */, + 3D4545E61DE32FB300C6C478 /* RCTUIManager.h in Headers */, + 3D4545E71DE32FB300C6C478 /* RCTFPSGraph.h in Headers */, + 3D4545E81DE32FB300C6C478 /* RCTJSCProfiler.h in Headers */, + 3D4545E91DE32FB300C6C478 /* RCTMacros.h in Headers */, + 3D4545EA1DE32FB300C6C478 /* RCTProfile.h in Headers */, + 3D4545EB1DE32FB300C6C478 /* RCTActivityIndicatorView.h in Headers */, + 3D4545EC1DE32FB300C6C478 /* RCTActivityIndicatorViewManager.h in Headers */, + 3D4545ED1DE32FB300C6C478 /* RCTAnimationType.h in Headers */, + 3D4545EE1DE32FB300C6C478 /* RCTAutoInsetsProtocol.h in Headers */, + 3D4545EF1DE32FB300C6C478 /* RCTBorderDrawing.h in Headers */, + 3D4545F01DE32FB300C6C478 /* RCTBorderStyle.h in Headers */, + 3D4545F11DE32FB300C6C478 /* RCTComponent.h in Headers */, + 3D4545F21DE32FB300C6C478 /* RCTComponentData.h in Headers */, + 3D4545F31DE32FB300C6C478 /* RCTConvert+CoreLocation.h in Headers */, + 3D4545F41DE32FB300C6C478 /* RCTConvert+MapKit.h in Headers */, + 3D4545F51DE32FB300C6C478 /* RCTDatePicker.h in Headers */, + 3D4545F61DE32FB300C6C478 /* RCTDatePickerManager.h in Headers */, + 3D4545F71DE32FB300C6C478 /* RCTFont.h in Headers */, + 3D4545F81DE32FB300C6C478 /* RCTMap.h in Headers */, + 3D4545F91DE32FB300C6C478 /* RCTMapAnnotation.h in Headers */, + 3D4545FA1DE32FB300C6C478 /* RCTMapManager.h in Headers */, + 3D4545FB1DE32FB300C6C478 /* RCTMapOverlay.h in Headers */, + 3D3C04AB1DE3337C00C268FA /* RCTAlertManager.h in Headers */, + 3D4545FC1DE32FB300C6C478 /* RCTModalHostView.h in Headers */, + 3D4545FD1DE32FB300C6C478 /* RCTModalHostViewController.h in Headers */, + 3D4545FE1DE32FB300C6C478 /* RCTModalHostViewManager.h in Headers */, + 3D4545FF1DE32FB300C6C478 /* RCTNavigator.h in Headers */, + 3D4546001DE32FB300C6C478 /* RCTNavigatorManager.h in Headers */, + 3D4546011DE32FB300C6C478 /* RCTNavItem.h in Headers */, + 3D4546021DE32FB300C6C478 /* RCTNavItemManager.h in Headers */, + 3D4546031DE32FB300C6C478 /* RCTPicker.h in Headers */, + 3D4546041DE32FB300C6C478 /* RCTPickerManager.h in Headers */, + 3D4546051DE32FB300C6C478 /* RCTPointerEvents.h in Headers */, + 3D4546061DE32FB300C6C478 /* RCTProgressViewManager.h in Headers */, + 3D4546071DE32FB300C6C478 /* RCTRefreshControl.h in Headers */, + 3D4546081DE32FB300C6C478 /* RCTRefreshControlManager.h in Headers */, + 3D4546091DE32FB300C6C478 /* RCTRootShadowView.h in Headers */, + 3D45460A1DE32FB300C6C478 /* RCTScrollableProtocol.h in Headers */, + 3D45460B1DE32FB300C6C478 /* RCTScrollView.h in Headers */, + 3D45460C1DE32FB300C6C478 /* RCTScrollViewManager.h in Headers */, + 3D45460D1DE32FB300C6C478 /* RCTSegmentedControl.h in Headers */, + 3D45460E1DE32FB300C6C478 /* RCTSegmentedControlManager.h in Headers */, + 3D45460F1DE32FB300C6C478 /* RCTShadowView.h in Headers */, + 3D4546101DE32FB300C6C478 /* RCTSlider.h in Headers */, + 3D4546111DE32FB300C6C478 /* RCTSliderManager.h in Headers */, + 3D4546121DE32FB300C6C478 /* RCTSwitch.h in Headers */, + 3D4546131DE32FB300C6C478 /* RCTSwitchManager.h in Headers */, + 3D4546141DE32FB300C6C478 /* RCTTabBar.h in Headers */, + 3D4546151DE32FB300C6C478 /* RCTTabBarItem.h in Headers */, + 3D4546161DE32FB300C6C478 /* RCTTabBarItemManager.h in Headers */, + 3D4546171DE32FB300C6C478 /* RCTTabBarManager.h in Headers */, + 3D4546181DE32FB300C6C478 /* RCTTextDecorationLineType.h in Headers */, + 3D4546191DE32FB300C6C478 /* RCTView.h in Headers */, + 3D45461A1DE32FB300C6C478 /* RCTViewControllerProtocol.h in Headers */, + 3D45461B1DE32FB300C6C478 /* RCTViewManager.h in Headers */, + 3D45461C1DE32FB300C6C478 /* RCTWebView.h in Headers */, + 3D45461D1DE32FB300C6C478 /* RCTWebViewManager.h in Headers */, + 3D45461E1DE32FB300C6C478 /* RCTWrapperViewController.h in Headers */, + 3D4546201DE32FB300C6C478 /* UIView+React.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3D4546211DE32FE200C6C478 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D4546221DE32FEC00C6C478 /* RCTAssert.h in Headers */, + 3D4546231DE32FEC00C6C478 /* RCTBridge.h in Headers */, + 3D4546241DE32FEC00C6C478 /* RCTBridge+Private.h in Headers */, + 3D4546251DE32FEC00C6C478 /* RCTBridgeDelegate.h in Headers */, + 3D4546261DE32FEC00C6C478 /* RCTBridgeMethod.h in Headers */, + 3D4546271DE32FEC00C6C478 /* RCTBridgeModule.h in Headers */, + 3D4546281DE32FEC00C6C478 /* RCTBundleURLProvider.h in Headers */, + 3D4546291DE32FEC00C6C478 /* RCTConvert.h in Headers */, + 3D45462A1DE32FEC00C6C478 /* RCTDefines.h in Headers */, + 3D1FA0961DE4F50100E03CC6 /* RCTImageLoader.h in Headers */, + 3D45462B1DE32FEC00C6C478 /* RCTDisplayLink.h in Headers */, + 3D45462C1DE32FEC00C6C478 /* RCTErrorCustomizer.h in Headers */, + 3D45462D1DE32FEC00C6C478 /* RCTErrorInfo.h in Headers */, + 3D45462E1DE32FEC00C6C478 /* RCTEventDispatcher.h in Headers */, + 3D45462F1DE32FEC00C6C478 /* RCTFrameUpdate.h in Headers */, + 3D4546301DE32FEC00C6C478 /* RCTImageSource.h in Headers */, + 3D4546311DE32FEC00C6C478 /* RCTInvalidating.h in Headers */, + 3D4546321DE32FEC00C6C478 /* RCTJavaScriptExecutor.h in Headers */, + 3D4546331DE32FEC00C6C478 /* RCTJavaScriptLoader.h in Headers */, + 3D1FA0971DE4F50100E03CC6 /* RCTImageStoreManager.h in Headers */, + 3D4546341DE32FEC00C6C478 /* RCTJSStackFrame.h in Headers */, + 3D1FA09A1DE4F50100E03CC6 /* RCTPushNotificationManager.h in Headers */, + 3D4546351DE32FEC00C6C478 /* RCTKeyCommands.h in Headers */, + 3D4546361DE32FEC00C6C478 /* RCTLog.h in Headers */, + 3D4546371DE32FEC00C6C478 /* RCTModuleData.h in Headers */, + 3D4546381DE32FEC00C6C478 /* RCTModuleMethod.h in Headers */, + 3D4546391DE32FEC00C6C478 /* RCTMultipartDataTask.h in Headers */, + 3D45463A1DE32FEC00C6C478 /* RCTMultipartStreamReader.h in Headers */, + 3D45463B1DE32FEC00C6C478 /* RCTNullability.h in Headers */, + 3D45463C1DE32FEC00C6C478 /* RCTParserUtils.h in Headers */, + 3D45463D1DE32FEC00C6C478 /* RCTPerformanceLogger.h in Headers */, + 3D45463E1DE32FEC00C6C478 /* RCTPlatform.h in Headers */, + 3D1FA07F1DE4F2F100E03CC6 /* RCTNetworkTask.h in Headers */, + 3D45463F1DE32FEC00C6C478 /* RCTRootView.h in Headers */, + 3D4546401DE32FEC00C6C478 /* RCTRootViewDelegate.h in Headers */, + 3D4546411DE32FEC00C6C478 /* RCTRootViewInternal.h in Headers */, + 3D4546421DE32FEC00C6C478 /* RCTTouchEvent.h in Headers */, + 3D4546431DE32FEC00C6C478 /* RCTTouchHandler.h in Headers */, + 3D1FA07E1DE4F2F100E03CC6 /* RCTNetworking.h in Headers */, + 3D4546441DE32FEC00C6C478 /* RCTURLRequestDelegate.h in Headers */, + 3D4546451DE32FEC00C6C478 /* RCTURLRequestHandler.h in Headers */, + 3D4546461DE32FEC00C6C478 /* RCTUtils.h in Headers */, + 3D4546471DE32FEC00C6C478 /* RCTWebSocketProxy.h in Headers */, + 3D4546481DE32FEC00C6C478 /* RCTWebSocketProxyDelegate.h in Headers */, + 3D5FA6891DE4B9B30058FD77 /* RCTJSCWrapper.h in Headers */, + 3D4546491DE32FEC00C6C478 /* RCTJSCErrorHandling.h in Headers */, + 3D45464A1DE32FEC00C6C478 /* RCTJSCExecutor.h in Headers */, + 3D45464B1DE32FEC00C6C478 /* JSCSamplingProfiler.h in Headers */, + 3D45464C1DE32FEC00C6C478 /* RCTAccessibilityManager.h in Headers */, + 3D45464D1DE32FEC00C6C478 /* RCTAlertManager.h in Headers */, + 3D45464E1DE32FEC00C6C478 /* RCTAppState.h in Headers */, + 3D45464F1DE32FEC00C6C478 /* RCTAsyncLocalStorage.h in Headers */, + 3D4546501DE32FEC00C6C478 /* RCTClipboard.h in Headers */, + 3D4546511DE32FEC00C6C478 /* RCTDevLoadingView.h in Headers */, + 3D4546521DE32FEC00C6C478 /* RCTDevMenu.h in Headers */, + 3D4546531DE32FEC00C6C478 /* RCTEventEmitter.h in Headers */, + 3D1FA0981DE4F50100E03CC6 /* RCTResizeMode.h in Headers */, + 3D4546541DE32FEC00C6C478 /* RCTExceptionsManager.h in Headers */, + 3D4546551DE32FEC00C6C478 /* RCTI18nManager.h in Headers */, + 3D1FA0991DE4F50100E03CC6 /* RCTLinkingManager.h in Headers */, + 3D4546561DE32FEC00C6C478 /* RCTI18nUtil.h in Headers */, + 3D4546571DE32FEC00C6C478 /* RCTKeyboardObserver.h in Headers */, + 3D4546581DE32FEC00C6C478 /* RCTRedBox.h in Headers */, + 3D4546591DE32FEC00C6C478 /* RCTSourceCode.h in Headers */, + 3D45465A1DE32FEC00C6C478 /* RCTStatusBarManager.h in Headers */, + 3D45465B1DE32FEC00C6C478 /* RCTTiming.h in Headers */, + 3D45465C1DE32FEC00C6C478 /* RCTUIManager.h in Headers */, + 3D45465D1DE32FEC00C6C478 /* RCTFPSGraph.h in Headers */, + 3D45465E1DE32FEC00C6C478 /* RCTJSCProfiler.h in Headers */, + 3D45465F1DE32FEC00C6C478 /* RCTMacros.h in Headers */, + 3D4546601DE32FEC00C6C478 /* RCTProfile.h in Headers */, + 3D4546611DE32FEC00C6C478 /* RCTActivityIndicatorView.h in Headers */, + 3D4546621DE32FEC00C6C478 /* RCTActivityIndicatorViewManager.h in Headers */, + 3D4546631DE32FEC00C6C478 /* RCTAnimationType.h in Headers */, + 3D4546641DE32FEC00C6C478 /* RCTAutoInsetsProtocol.h in Headers */, + 3D4546651DE32FEC00C6C478 /* RCTBorderDrawing.h in Headers */, + 3D4546661DE32FEC00C6C478 /* RCTBorderStyle.h in Headers */, + 3D4546671DE32FEC00C6C478 /* RCTComponent.h in Headers */, + 3D4546681DE32FEC00C6C478 /* RCTComponentData.h in Headers */, + 3D4546691DE32FEC00C6C478 /* RCTConvert+CoreLocation.h in Headers */, + 3D45466A1DE32FEC00C6C478 /* RCTConvert+MapKit.h in Headers */, + 3D45466B1DE32FEC00C6C478 /* RCTDatePicker.h in Headers */, + 3D45466C1DE32FEC00C6C478 /* RCTDatePickerManager.h in Headers */, + 3D45466D1DE32FEC00C6C478 /* RCTFont.h in Headers */, + 3D45466E1DE32FEC00C6C478 /* RCTMap.h in Headers */, + 3D45466F1DE32FEC00C6C478 /* RCTMapAnnotation.h in Headers */, + 3D4546701DE32FEC00C6C478 /* RCTMapManager.h in Headers */, + 3D4546711DE32FEC00C6C478 /* RCTMapOverlay.h in Headers */, + 3D4546721DE32FEC00C6C478 /* RCTModalHostView.h in Headers */, + 3D4546731DE32FEC00C6C478 /* RCTModalHostViewController.h in Headers */, + 3D4546741DE32FEC00C6C478 /* RCTModalHostViewManager.h in Headers */, + 3D4546751DE32FEC00C6C478 /* RCTNavigator.h in Headers */, + 3D4546761DE32FEC00C6C478 /* RCTNavigatorManager.h in Headers */, + 3D4546771DE32FEC00C6C478 /* RCTNavItem.h in Headers */, + 3D4546781DE32FEC00C6C478 /* RCTNavItemManager.h in Headers */, + 3D4546791DE32FEC00C6C478 /* RCTPicker.h in Headers */, + 3D45467A1DE32FEC00C6C478 /* RCTPickerManager.h in Headers */, + 3D45467B1DE32FEC00C6C478 /* RCTPointerEvents.h in Headers */, + 3D45467C1DE32FEC00C6C478 /* RCTProgressViewManager.h in Headers */, + 3D45467D1DE32FEC00C6C478 /* RCTRefreshControl.h in Headers */, + 3D45467E1DE32FEC00C6C478 /* RCTRefreshControlManager.h in Headers */, + 3D45467F1DE32FEC00C6C478 /* RCTRootShadowView.h in Headers */, + 3D4546801DE32FEC00C6C478 /* RCTScrollableProtocol.h in Headers */, + 3D4546811DE32FEC00C6C478 /* RCTScrollView.h in Headers */, + 3D4546821DE32FEC00C6C478 /* RCTScrollViewManager.h in Headers */, + 3D4546831DE32FEC00C6C478 /* RCTSegmentedControl.h in Headers */, + 3D4546841DE32FEC00C6C478 /* RCTSegmentedControlManager.h in Headers */, + 3D4546851DE32FEC00C6C478 /* RCTShadowView.h in Headers */, + 3D4546861DE32FEC00C6C478 /* RCTSlider.h in Headers */, + 3D4546871DE32FEC00C6C478 /* RCTSliderManager.h in Headers */, + 3D4546881DE32FEC00C6C478 /* RCTSwitch.h in Headers */, + 3D4546891DE32FEC00C6C478 /* RCTSwitchManager.h in Headers */, + 3D45468A1DE32FEC00C6C478 /* RCTTabBar.h in Headers */, + 3D45468B1DE32FEC00C6C478 /* RCTTabBarItem.h in Headers */, + 3D45468C1DE32FEC00C6C478 /* RCTTabBarItemManager.h in Headers */, + 3D45468D1DE32FEC00C6C478 /* RCTTabBarManager.h in Headers */, + 3D45468E1DE32FEC00C6C478 /* RCTTextDecorationLineType.h in Headers */, + 3D45468F1DE32FEC00C6C478 /* RCTView.h in Headers */, + 3D4546901DE32FEC00C6C478 /* RCTViewControllerProtocol.h in Headers */, + 3D4546911DE32FEC00C6C478 /* RCTViewManager.h in Headers */, + 3D4546921DE32FEC00C6C478 /* RCTWebView.h in Headers */, + 3D4546931DE32FEC00C6C478 /* RCTWebViewManager.h in Headers */, + 3D4546941DE32FEC00C6C478 /* RCTWrapperViewController.h in Headers */, + 3D4546961DE32FEC00C6C478 /* UIView+React.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 2D2A28121D9B038B00D4039D /* React-tvOS */ = { isa = PBXNativeTarget; buildConfigurationList = 2D2A281B1D9B038B00D4039D /* Build configuration list for PBXNativeTarget "React-tvOS" */; buildPhases = ( 2D6948301DA3088700B3FA97 /* ShellScript */, + 3D4546211DE32FE200C6C478 /* Headers */, 2D2A280F1D9B038B00D4039D /* Sources */, - 2D2A28101D9B038B00D4039D /* Frameworks */, - 2D2A28111D9B038B00D4039D /* CopyFiles */, + 3D3C088B1DE342FE00C268FA /* Frameworks */, 2D6948201DA3042200B3FA97 /* ShellScript */, ); buildRules = ( ); dependencies = ( + 3D14D9F21DE48E1600386448 /* PBXTargetDependency */, ); name = "React-tvOS"; productName = "React-tvOS"; productReference = 2D2A28131D9B038B00D4039D /* libReact-tvOS.a */; productType = "com.apple.product-type.library.static"; }; + 3D3C04B91DE3340900C268FA /* CSSLayout */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3D3C05971DE3340900C268FA /* Build configuration list for PBXNativeTarget "CSSLayout" */; + buildPhases = ( + 3D3C04BB1DE3340900C268FA /* Headers */, + 3D3C05301DE3340900C268FA /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = CSSLayout; + productName = React; + productReference = 3D3C059A1DE3340900C268FA /* libCSSLayout.a */; + productType = "com.apple.product-type.library.static"; + }; + 3D3C059B1DE3340C00C268FA /* CSSLayout-tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3D3C06721DE3340C00C268FA /* Build configuration list for PBXNativeTarget "CSSLayout-tvOS" */; + buildPhases = ( + 3D3C059D1DE3340C00C268FA /* Headers */, + 3D3C06181DE3340C00C268FA /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "CSSLayout-tvOS"; + productName = "React-tvOS"; + productReference = 3D3C06751DE3340C00C268FA /* libCSSLayout-tvOS.a */; + productType = "com.apple.product-type.library.static"; + }; 83CBBA2D1A601D0E00E9B192 /* React */ = { isa = PBXNativeTarget; buildConfigurationList = 83CBBA3F1A601D0F00E9B192 /* Build configuration list for PBXNativeTarget "React" */; buildPhases = ( 006B79A01A781F38006873D1 /* ShellScript */, + 3D4545AB1DE32F8E00C6C478 /* Headers */, 83CBBA2A1A601D0E00E9B192 /* Sources */, - 83CBBA2B1A601D0E00E9B192 /* Frameworks */, - 83CBBA2C1A601D0E00E9B192 /* Copy Files */, + 3D3C08881DE342EE00C268FA /* Frameworks */, 142C4F7F1B582EA6001F0B58 /* ShellScript */, ); buildRules = ( ); dependencies = ( + 3D14D9F41DE48E1F00386448 /* PBXTargetDependency */, ); name = React; productName = React; @@ -834,7 +1468,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0810; ORGANIZATIONNAME = Facebook; TargetAttributes = { 2D2A28121D9B038B00D4039D = { @@ -861,6 +1495,8 @@ targets = ( 83CBBA2D1A601D0E00E9B192 /* React */, 2D2A28121D9B038B00D4039D /* React-tvOS */, + 3D3C04B91DE3340900C268FA /* CSSLayout */, + 3D3C059B1DE3340C00C268FA /* CSSLayout-tvOS */, ); }; /* End PBXProject section */ @@ -948,7 +1584,6 @@ 2D3B5EE31D9B09B700451313 /* RCTSegmentedControl.m in Sources */, 2D3B5EB71D9B091800451313 /* RCTRedBox.m in Sources */, 2D3B5ED11D9B097500451313 /* RCTMapAnnotation.m in Sources */, - 2D3B5EAB1D9B08EC00451313 /* RCTJSCErrorHandling.m in Sources */, 2D3B5EAF1D9B08FB00451313 /* RCTAccessibilityManager.m in Sources */, 2D537FD21DA4809D000F876C /* (null) in Sources */, 2D3B5EF11D9B09E700451313 /* UIView+React.m in Sources */, @@ -959,7 +1594,6 @@ 2D3B5EB41D9B090A00451313 /* RCTDevLoadingView.m in Sources */, 2D3B5EED1D9B09D700451313 /* RCTTabBarManager.m in Sources */, 2D3B5EEF1D9B09DC00451313 /* RCTViewManager.m in Sources */, - 2D3B5EA91D9B08E300451313 /* CSSNodeList.c in Sources */, 2D3B5EE11D9B09B000451313 /* RCTScrollView.m in Sources */, 2D3B5ED81D9B098A00451313 /* RCTNavigatorManager.m in Sources */, 2D3B5E951D9B087C00451313 /* RCTAssert.m in Sources */, @@ -973,7 +1607,6 @@ 2D3B5EAC1D9B08EF00451313 /* RCTJSCExecutor.mm in Sources */, 2D3B5EB11D9B090100451313 /* RCTAppState.m in Sources */, 2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */, - 2D3B5EAA1D9B08E600451313 /* CSSLayout.c in Sources */, 2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */, 2D3B5EEE1D9B09DA00451313 /* RCTView.m in Sources */, 2D3B5ECC1D9B096500451313 /* RCTConvert+MapKit.m in Sources */, @@ -1016,6 +1649,24 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3D3C05301DE3340900C268FA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D3C085A1DE33E4400C268FA /* CSSLayout.c in Sources */, + 3D3C085E1DE33E6100C268FA /* CSSNodeList.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3D3C06181DE3340C00C268FA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3D3C085C1DE33E4E00C268FA /* CSSLayout.c in Sources */, + 3D3C085F1DE33E6100C268FA /* CSSNodeList.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 83CBBA2A1A601D0E00E9B192 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1039,7 +1690,6 @@ 13BCE8091C99CB9D00DD7AAD /* RCTRootShadowView.m in Sources */, 14C2CA711B3AC63800E6CBB2 /* RCTModuleMethod.m in Sources */, 006FC4141D9B20820057AAAD /* RCTMultipartDataTask.m in Sources */, - 1321C8D01D3EB50800D58318 /* CSSNodeList.c in Sources */, 13CC8A821B17642100940AE7 /* RCTBorderDrawing.m in Sources */, 83CBBA511A601E3B00E9B192 /* RCTAssert.m in Sources */, 13AF20451AE707F9005F5298 /* RCTSlider.m in Sources */, @@ -1087,7 +1737,6 @@ 13AFBCA01C07247D00BBAEAA /* RCTMapOverlay.m in Sources */, 13D9FEEE1CDCD93000158BD7 /* RCTKeyboardObserver.m in Sources */, B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */, - 133683521D37ACA10077D0C3 /* CSSLayout.c in Sources */, 13456E931ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m in Sources */, 137327E91AA5CF210034F82E /* RCTTabBarItemManager.m in Sources */, 13A1F71E1A75392D00D3D453 /* RCTKeyCommands.m in Sources */, @@ -1127,6 +1776,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 3D14D9F21DE48E1600386448 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3D3C059B1DE3340C00C268FA /* CSSLayout-tvOS */; + targetProxy = 3D14D9F11DE48E1600386448 /* PBXContainerItemProxy */; + }; + 3D14D9F41DE48E1F00386448 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3D3C04B91DE3340900C268FA /* CSSLayout */; + targetProxy = 3D14D9F31DE48E1F00386448 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 2D2A28191D9B038B00D4039D /* Debug */ = { isa = XCBuildConfiguration; @@ -1145,6 +1807,7 @@ ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -1164,6 +1827,81 @@ GCC_NO_COMMON_BLOCKS = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.2; + }; + name = Release; + }; + 3D3C05981DE3340900C268FA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_STATIC_ANALYZER_MODE = deep; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/CSSLayout; + RUN_CLANG_STATIC_ANALYZER = YES; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 3D3C05991DE3340900C268FA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_STATIC_ANALYZER_MODE = deep; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/CSSLayout; + RUN_CLANG_STATIC_ANALYZER = NO; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 3D3C06731DE3340C00C268FA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_TESTABILITY = YES; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/CSSLayout; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.2; + }; + name = Debug; + }; + 3D3C06741DE3340C00C268FA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_SUSPICIOUS_MOVES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_NO_COMMON_BLOCKS = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/CSSLayout; SDKROOT = appletvos; SKIP_INSTALL = YES; TVOS_DEPLOYMENT_TARGET = 9.2; @@ -1191,6 +1929,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1211,7 +1950,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../ReactCommon/**"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -1257,7 +1995,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../ReactCommon/**"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; @@ -1278,6 +2015,7 @@ GCC_WARN_ABOUT_MISSING_NEWLINE = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React; RUN_CLANG_STATIC_ANALYZER = YES; SKIP_INSTALL = YES; }; @@ -1292,6 +2030,7 @@ GCC_WARN_ABOUT_MISSING_NEWLINE = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/React; RUN_CLANG_STATIC_ANALYZER = NO; SKIP_INSTALL = YES; }; @@ -1309,6 +2048,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 3D3C05971DE3340900C268FA /* Build configuration list for PBXNativeTarget "CSSLayout" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3D3C05981DE3340900C268FA /* Debug */, + 3D3C05991DE3340900C268FA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 3D3C06721DE3340C00C268FA /* Build configuration list for PBXNativeTarget "CSSLayout-tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3D3C06731DE3340C00C268FA /* Debug */, + 3D3C06741DE3340C00C268FA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "React" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/React/Views/RCTActivityIndicatorViewManager.h b/React/Views/RCTActivityIndicatorViewManager.h index cbd6816ae4..67bc20984f 100644 --- a/React/Views/RCTActivityIndicatorViewManager.h +++ b/React/Views/RCTActivityIndicatorViewManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTConvert (UIActivityIndicatorView) diff --git a/React/Views/RCTActivityIndicatorViewManager.m b/React/Views/RCTActivityIndicatorViewManager.m index 63e227f27b..c28b86983b 100644 --- a/React/Views/RCTActivityIndicatorViewManager.m +++ b/React/Views/RCTActivityIndicatorViewManager.m @@ -8,6 +8,7 @@ */ #import "RCTActivityIndicatorViewManager.h" + #import "RCTActivityIndicatorView.h" #import "RCTConvert.h" diff --git a/React/Views/RCTBorderDrawing.h b/React/Views/RCTBorderDrawing.h index 52e3b4a86d..3835359da7 100644 --- a/React/Views/RCTBorderDrawing.h +++ b/React/Views/RCTBorderDrawing.h @@ -9,7 +9,7 @@ #import -#import "RCTBorderStyle.h" +#import typedef struct { CGFloat topLeft; diff --git a/React/Views/RCTComponentData.h b/React/Views/RCTComponentData.h index 596dcc8399..cf4d44e0b8 100644 --- a/React/Views/RCTComponentData.h +++ b/React/Views/RCTComponentData.h @@ -9,9 +9,9 @@ #import -#import "RCTComponent.h" -#import "RCTDefines.h" -#import "RCTViewManager.h" +#import +#import +#import @class RCTBridge; @class RCTShadowView; diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m index 5ccb70cafb..d7738b0529 100644 --- a/React/Views/RCTComponentData.m +++ b/React/Views/RCTComponentData.m @@ -12,11 +12,11 @@ #import #import "RCTBridge.h" +#import "RCTBridgeModule.h" #import "RCTConvert.h" #import "RCTShadowView.h" #import "RCTUtils.h" #import "UIView+React.h" -#import "RCTBridgeModule.h" typedef void (^RCTPropBlock)(id view, id json); diff --git a/React/Views/RCTConvert+CoreLocation.h b/React/Views/RCTConvert+CoreLocation.h index e8c1e73853..7191e384a9 100644 --- a/React/Views/RCTConvert+CoreLocation.h +++ b/React/Views/RCTConvert+CoreLocation.h @@ -9,7 +9,7 @@ #import -#import "RCTConvert.h" +#import @interface RCTConvert (CoreLocation) diff --git a/React/Views/RCTConvert+MapKit.h b/React/Views/RCTConvert+MapKit.h index 46fddc8dc9..e3cc135329 100644 --- a/React/Views/RCTConvert+MapKit.h +++ b/React/Views/RCTConvert+MapKit.h @@ -9,7 +9,7 @@ #import -#import "RCTConvert.h" +#import @class RCTMapAnnotation; @class RCTMapOverlay; diff --git a/React/Views/RCTDatePickerManager.h b/React/Views/RCTDatePickerManager.h index 73d88b6dd1..df964a0ca0 100644 --- a/React/Views/RCTDatePickerManager.h +++ b/React/Views/RCTDatePickerManager.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" -#import "RCTConvert.h" +#import +#import @interface RCTConvert(UIDatePicker) diff --git a/React/Views/RCTFont.h b/React/Views/RCTFont.h index e2f5405bc0..806f6a2a4d 100644 --- a/React/Views/RCTFont.h +++ b/React/Views/RCTFont.h @@ -9,7 +9,7 @@ #import -#import "RCTConvert.h" +#import @interface RCTFont : NSObject diff --git a/React/Views/RCTMap.h b/React/Views/RCTMap.h index 1ef2e90f1a..9c954f99e0 100644 --- a/React/Views/RCTMap.h +++ b/React/Views/RCTMap.h @@ -10,8 +10,8 @@ #import #import -#import "RCTConvert+MapKit.h" -#import "RCTComponent.h" +#import +#import RCT_EXTERN const CLLocationDegrees RCTMapDefaultSpan; RCT_EXTERN const NSTimeInterval RCTMapRegionChangeObserveInterval; diff --git a/React/Views/RCTMapManager.h b/React/Views/RCTMapManager.h index a64c96ee74..fdf678efd3 100644 --- a/React/Views/RCTMapManager.h +++ b/React/Views/RCTMapManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTMapManager : RCTViewManager diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h index dbf0556ff8..15ae16ce69 100644 --- a/React/Views/RCTModalHostView.h +++ b/React/Views/RCTModalHostView.h @@ -9,9 +9,9 @@ #import -#import "RCTInvalidating.h" -#import "RCTModalHostViewManager.h" -#import "RCTView.h" +#import +#import +#import @class RCTBridge; @class RCTModalHostViewController; diff --git a/React/Views/RCTModalHostViewManager.h b/React/Views/RCTModalHostViewManager.h index 2ae57b3bca..2931e05472 100644 --- a/React/Views/RCTModalHostViewManager.h +++ b/React/Views/RCTModalHostViewManager.h @@ -7,9 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" - -#import "RCTInvalidating.h" +#import +#import typedef void (^RCTModalViewInteractionBlock)(UIViewController *reactViewController, UIViewController *viewController, BOOL animated, dispatch_block_t completionBlock); diff --git a/React/Views/RCTNavItem.h b/React/Views/RCTNavItem.h index 0d457933f4..d337b2fc3a 100644 --- a/React/Views/RCTNavItem.h +++ b/React/Views/RCTNavItem.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @interface RCTNavItem : UIView diff --git a/React/Views/RCTNavItemManager.h b/React/Views/RCTNavItemManager.h index 5d6f97b112..b5b9fa58c9 100644 --- a/React/Views/RCTNavItemManager.h +++ b/React/Views/RCTNavItemManager.h @@ -7,9 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" - -#import "RCTConvert.h" +#import +#import @interface RCTConvert (BarButtonSystemItem) diff --git a/React/Views/RCTNavigator.h b/React/Views/RCTNavigator.h index 57b7449930..c507c53917 100644 --- a/React/Views/RCTNavigator.h +++ b/React/Views/RCTNavigator.h @@ -9,7 +9,7 @@ #import -#import "RCTFrameUpdate.h" +#import @class RCTBridge; diff --git a/React/Views/RCTNavigatorManager.h b/React/Views/RCTNavigatorManager.h index b78435b1c8..e8be049431 100644 --- a/React/Views/RCTNavigatorManager.h +++ b/React/Views/RCTNavigatorManager.h @@ -7,9 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTNavigatorManager : RCTViewManager @end - diff --git a/React/Views/RCTPicker.h b/React/Views/RCTPicker.h index 0066d140f8..d4931dec60 100644 --- a/React/Views/RCTPicker.h +++ b/React/Views/RCTPicker.h @@ -9,7 +9,7 @@ #import -#import "UIView+React.h" +#import @interface RCTPicker : UIPickerView diff --git a/React/Views/RCTPickerManager.h b/React/Views/RCTPickerManager.h index 10486ad895..d2feb7caae 100644 --- a/React/Views/RCTPickerManager.h +++ b/React/Views/RCTPickerManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTPickerManager : RCTViewManager diff --git a/React/Views/RCTProgressViewManager.h b/React/Views/RCTProgressViewManager.h index ae8a6a3880..bf183f6372 100644 --- a/React/Views/RCTProgressViewManager.h +++ b/React/Views/RCTProgressViewManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTProgressViewManager : RCTViewManager diff --git a/React/Views/RCTRefreshControl.h b/React/Views/RCTRefreshControl.h index 4316576aab..cc7a8c91ea 100644 --- a/React/Views/RCTRefreshControl.h +++ b/React/Views/RCTRefreshControl.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @interface RCTRefreshControl : UIRefreshControl diff --git a/React/Views/RCTRefreshControlManager.h b/React/Views/RCTRefreshControlManager.h index 8d1c3f9616..00d117ed9f 100644 --- a/React/Views/RCTRefreshControlManager.h +++ b/React/Views/RCTRefreshControlManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTRefreshControlManager : RCTViewManager diff --git a/React/Views/RCTRootShadowView.h b/React/Views/RCTRootShadowView.h index 99591a399a..ec830d84f5 100644 --- a/React/Views/RCTRootShadowView.h +++ b/React/Views/RCTRootShadowView.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTShadowView.h" +#import @interface RCTRootShadowView : RCTShadowView diff --git a/React/Views/RCTScrollView.h b/React/Views/RCTScrollView.h index c688fbf1ff..5d9f1b6942 100644 --- a/React/Views/RCTScrollView.h +++ b/React/Views/RCTScrollView.h @@ -9,10 +9,10 @@ #import -#import "RCTAutoInsetsProtocol.h" -#import "RCTEventDispatcher.h" -#import "RCTScrollableProtocol.h" -#import "RCTView.h" +#import +#import +#import +#import @protocol UIScrollViewDelegate; diff --git a/React/Views/RCTScrollView.m b/React/Views/RCTScrollView.m index f3ea088546..dcd286a638 100644 --- a/React/Views/RCTScrollView.m +++ b/React/Views/RCTScrollView.m @@ -14,14 +14,15 @@ #import "RCTConvert.h" #import "RCTEventDispatcher.h" #import "RCTLog.h" -#if !TARGET_OS_TV -#import "RCTRefreshControl.h" -#endif #import "RCTUIManager.h" #import "RCTUtils.h" #import "UIView+Private.h" #import "UIView+React.h" +#if !TARGET_OS_TV +#import "RCTRefreshControl.h" +#endif + CGFloat const ZINDEX_DEFAULT = 0; CGFloat const ZINDEX_STICKY_HEADER = 50; diff --git a/React/Views/RCTScrollViewManager.h b/React/Views/RCTScrollViewManager.h index a53bf4c807..5faeb5b99d 100644 --- a/React/Views/RCTScrollViewManager.h +++ b/React/Views/RCTScrollViewManager.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" -#import "RCTConvert.h" +#import +#import @interface RCTConvert (UIScrollView) diff --git a/React/Views/RCTSegmentedControl.h b/React/Views/RCTSegmentedControl.h index 296afb10e0..4809816879 100644 --- a/React/Views/RCTSegmentedControl.h +++ b/React/Views/RCTSegmentedControl.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @interface RCTSegmentedControl : UISegmentedControl diff --git a/React/Views/RCTSegmentedControlManager.h b/React/Views/RCTSegmentedControlManager.h index 03647c72ed..4b6c8f8e05 100644 --- a/React/Views/RCTSegmentedControlManager.h +++ b/React/Views/RCTSegmentedControlManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTSegmentedControlManager : RCTViewManager diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h index cd8f782c32..74ec6b4451 100644 --- a/React/Views/RCTShadowView.h +++ b/React/Views/RCTShadowView.h @@ -10,9 +10,8 @@ #import #import - -#import "RCTComponent.h" -#import "RCTRootView.h" +#import +#import @class RCTSparseArray; diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m index 832cb5ffe6..07ac414f39 100644 --- a/React/Views/RCTShadowView.m +++ b/React/Views/RCTShadowView.m @@ -12,8 +12,8 @@ #import "RCTConvert.h" #import "RCTLog.h" #import "RCTUtils.h" -#import "UIView+React.h" #import "UIView+Private.h" +#import "UIView+React.h" typedef void (^RCTActionBlock)(RCTShadowView *shadowViewSelf, id value); typedef void (^RCTResetActionBlock)(RCTShadowView *shadowViewSelf); diff --git a/React/Views/RCTSlider.h b/React/Views/RCTSlider.h index c84593c50c..35c07902ce 100644 --- a/React/Views/RCTSlider.h +++ b/React/Views/RCTSlider.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @interface RCTSlider : UISlider diff --git a/React/Views/RCTSliderManager.h b/React/Views/RCTSliderManager.h index a40f7fddc4..a4696ec31b 100644 --- a/React/Views/RCTSliderManager.h +++ b/React/Views/RCTSliderManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTSliderManager : RCTViewManager diff --git a/React/Views/RCTSwitch.h b/React/Views/RCTSwitch.h index f94bd50521..09da30a544 100644 --- a/React/Views/RCTSwitch.h +++ b/React/Views/RCTSwitch.h @@ -7,10 +7,9 @@ * of patent rights can be found in the PATENTS file in the same directory. */ - #import -#import "RCTComponent.h" +#import @interface RCTSwitch : UISwitch diff --git a/React/Views/RCTSwitchManager.h b/React/Views/RCTSwitchManager.h index 8a79b7042c..538d25c003 100644 --- a/React/Views/RCTSwitchManager.h +++ b/React/Views/RCTSwitchManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTSwitchManager : RCTViewManager diff --git a/React/Views/RCTTabBarItem.h b/React/Views/RCTTabBarItem.h index 5631f58b7b..63043192c1 100644 --- a/React/Views/RCTTabBarItem.h +++ b/React/Views/RCTTabBarItem.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @interface RCTTabBarItem : UIView diff --git a/React/Views/RCTTabBarItemManager.h b/React/Views/RCTTabBarItemManager.h index d6ec6bb90e..484ec23a32 100644 --- a/React/Views/RCTTabBarItemManager.h +++ b/React/Views/RCTTabBarItemManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTTabBarItemManager : RCTViewManager diff --git a/React/Views/RCTTabBarManager.h b/React/Views/RCTTabBarManager.h index 41c309cf6a..99f5980531 100644 --- a/React/Views/RCTTabBarManager.h +++ b/React/Views/RCTTabBarManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTTabBarManager : RCTViewManager diff --git a/React/Views/RCTView.h b/React/Views/RCTView.h index 96c0b41820..2e1081bdb1 100644 --- a/React/Views/RCTView.h +++ b/React/Views/RCTView.h @@ -7,13 +7,12 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTView.h" - #import -#import "RCTBorderStyle.h" -#import "RCTComponent.h" -#import "RCTPointerEvents.h" +#import +#import +#import +#import @protocol RCTAutoInsetsProtocol; diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h index d4ff7192b1..f78a6e0baa 100644 --- a/React/Views/RCTViewManager.h +++ b/React/Views/RCTViewManager.h @@ -9,12 +9,12 @@ #import -#import "RCTBridgeModule.h" -#import "RCTConvert.h" -#import "RCTDefines.h" -#import "RCTEventDispatcher.h" -#import "RCTLog.h" -#import "UIView+React.h" +#import +#import +#import +#import +#import +#import @class RCTBridge; @class RCTShadowView; diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m index 3e20f6d40c..8f20a6380a 100644 --- a/React/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -9,8 +9,8 @@ #import "RCTViewManager.h" -#import "RCTBridge.h" #import "RCTBorderStyle.h" +#import "RCTBridge.h" #import "RCTConvert.h" #import "RCTEventDispatcher.h" #import "RCTLog.h" diff --git a/React/Views/RCTWebView.h b/React/Views/RCTWebView.h index c2c41431f6..e4f57567d3 100644 --- a/React/Views/RCTWebView.h +++ b/React/Views/RCTWebView.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTView.h" +#import @class RCTWebView; diff --git a/React/Views/RCTWebViewManager.h b/React/Views/RCTWebViewManager.h index 30dc6af988..bb075c22ae 100644 --- a/React/Views/RCTWebViewManager.h +++ b/React/Views/RCTWebViewManager.h @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTViewManager.h" +#import @interface RCTWebViewManager : RCTViewManager diff --git a/React/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h index 7b24ae7d53..1894bf4676 100644 --- a/React/Views/RCTWrapperViewController.h +++ b/React/Views/RCTWrapperViewController.h @@ -9,7 +9,7 @@ #import -#import "RCTViewControllerProtocol.h" +#import @class RCTNavItem; @class RCTWrapperViewController; diff --git a/React/Views/UIView+React.h b/React/Views/UIView+React.h index 6533890c40..c263fb0b6e 100644 --- a/React/Views/UIView+React.h +++ b/React/Views/UIView+React.h @@ -9,7 +9,7 @@ #import -#import "RCTComponent.h" +#import @class RCTShadowView; diff --git a/ReactCommon/jschelpers/JSCWrapper.cpp b/ReactCommon/jschelpers/JSCWrapper.cpp index 0c5528b6f0..5c177610ab 100644 --- a/ReactCommon/jschelpers/JSCWrapper.cpp +++ b/ReactCommon/jschelpers/JSCWrapper.cpp @@ -17,9 +17,9 @@ // Crash the app (with a descriptive stack trace) if a function that is not supported by // the system JSC is called. -#define UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FUNC_NAME) \ -static void Unimplemented_##FUNC_NAME(void* args...) { \ - assert(false); \ +#define UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FUNC_NAME) \ +static void Unimplemented_##FUNC_NAME(__unused void* args...) { \ + assert(false); \ } UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSEvaluateBytecodeBundle) diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj index 2dd8ee9be5..336a3c3d8c 100644 --- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj +++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj @@ -715,11 +715,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native/React/**", - "$(SRCROOT)/../node_modules/react-native/ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -755,11 +751,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "$(SRCROOT)/../node_modules/react-native/React/**", - "$(SRCROOT)/../node_modules/react-native/ReactCommon/**", - ); + HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme index da96beaf44..6c71a80d8e 100644 --- a/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme +++ b/local-cli/templates/HelloWorld/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme @@ -3,9 +3,23 @@ LastUpgradeVersion = "0620" version = "1.3"> + + + + + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -62,15 +76,18 @@ ReferencedContainer = "container:HelloWorld.xcodeproj"> + + @@ -86,10 +103,10 @@ diff --git a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m index a0b1d9ca6d..cff79affcb 100644 --- a/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m +++ b/local-cli/templates/HelloWorld/ios/HelloWorld/AppDelegate.m @@ -9,8 +9,8 @@ #import "AppDelegate.h" -#import "RCTBundleURLProvider.h" -#import "RCTRootView.h" +#import +#import @implementation AppDelegate diff --git a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m index 88ffdd7e6e..fa1f1683af 100644 --- a/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m +++ b/local-cli/templates/HelloWorld/ios/HelloWorldTests/HelloWorldTests.m @@ -10,8 +10,8 @@ #import #import -#import "RCTLog.h" -#import "RCTRootView.h" +#import +#import #define TIMEOUT_SECONDS 600 #define TEXT_TO_LOOK_FOR @"Welcome to React Native!"