diff --git a/RNTester/RNTester.xcodeproj/project.pbxproj b/RNTester/RNTester.xcodeproj/project.pbxproj index 6a291b5ebba..c010bf4be3f 100644 --- a/RNTester/RNTester.xcodeproj/project.pbxproj +++ b/RNTester/RNTester.xcodeproj/project.pbxproj @@ -18,7 +18,7 @@ 134CB92A1C85A38800265FA6 /* RCTModuleInitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */; }; 138D6A181B53CD440074A87E /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; }; 138DEE241B9EDFB6007F4EA5 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 138DEE091B9EDDDB007F4EA5 /* libRCTCameraRoll.a */; }; - 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */; }; + 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */; }; 139FDEDB1B0651FB00C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDED91B0651EA00C62182 /* libRCTWebSocket.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; @@ -80,7 +80,7 @@ 2D4BD8DF1DA2E20D005AC8A8 /* RCTMethodArgumentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DF61B51B67A45000EDB188 /* RCTMethodArgumentTests.m */; }; 2D4BD8E01DA2E20D005AC8A8 /* RCTModuleInitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */; }; 2D4BD8E11DA2E20D005AC8A8 /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13129DD31C85F87C007D611C /* RCTModuleInitNotificationRaceTests.m */; }; - 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */; }; + 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */; }; 2D4BD8E31DA2E20D005AC8A8 /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; }; 2D4BD8E41DA2E20D005AC8A8 /* RCTUIManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */; }; 2D4BD8E51DA2E20D005AC8A8 /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */; }; @@ -428,7 +428,7 @@ 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTModuleInitTests.m; sourceTree = ""; }; 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowViewTests.m; sourceTree = ""; }; 138DEE021B9EDDDB007F4EA5 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = ../Libraries/CameraRoll/RCTCameraRoll.xcodeproj; sourceTree = ""; }; - 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTModuleMethodTests.m; sourceTree = ""; }; + 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTModuleMethodTests.mm; sourceTree = ""; }; 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = ""; }; @@ -731,7 +731,7 @@ 13DF61B51B67A45000EDB188 /* RCTMethodArgumentTests.m */, 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */, 13129DD31C85F87C007D611C /* RCTModuleInitNotificationRaceTests.m */, - 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */, + 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */, 001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */, 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */, 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */, @@ -1542,7 +1542,7 @@ 1497CFB01B21F5E400C1F8F2 /* RCTFontTests.m in Sources */, 13BCE84F1C9C209600DD7AAD /* RCTComponentPropsTests.m in Sources */, 144D21241B2204C5006DB32B /* RCTImageUtilTests.m in Sources */, - 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.m in Sources */, + 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.mm in Sources */, 1300627F1B59179B0043FE5A /* RCTGzipTests.m in Sources */, 1497CFAF1B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m in Sources */, 13129DD41C85F87C007D611C /* RCTModuleInitNotificationRaceTests.m in Sources */, @@ -1625,7 +1625,7 @@ 2D4BD8DB1DA2E20D005AC8A8 /* RCTImageLoaderHelpers.m in Sources */, 2D4BD8E51DA2E20D005AC8A8 /* RCTComponentPropsTests.m in Sources */, 2D4BD8D71DA2E20D005AC8A8 /* RCTConvert_NSURLTests.m in Sources */, - 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.m in Sources */, + 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.mm in Sources */, 2D4BD8E11DA2E20D005AC8A8 /* RCTModuleInitNotificationRaceTests.m in Sources */, 2D4BD8DF1DA2E20D005AC8A8 /* RCTMethodArgumentTests.m in Sources */, 2D4BD8D31DA2E20D005AC8A8 /* RCTBundleURLProviderTests.m in Sources */, diff --git a/RNTester/RNTesterLegacy.xcodeproj/project.pbxproj b/RNTester/RNTesterLegacy.xcodeproj/project.pbxproj index fa2fa7c34a9..9fbbed4265c 100644 --- a/RNTester/RNTesterLegacy.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterLegacy.xcodeproj/project.pbxproj @@ -19,7 +19,7 @@ 1380DCD41E70C44800E7C47D /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1380DC991E70C0DD00E7C47D /* libReact.a */; }; 138D6A181B53CD440074A87E /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; }; 138DEE241B9EDFB6007F4EA5 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 138DEE091B9EDDDB007F4EA5 /* libRCTCameraRoll.a */; }; - 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */; }; + 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */; }; 139FDEDB1B0651FB00C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDED91B0651EA00C62182 /* libRCTWebSocket.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; @@ -79,7 +79,7 @@ 2D4BD8DF1DA2E20D005AC8A8 /* RCTMethodArgumentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DF61B51B67A45000EDB188 /* RCTMethodArgumentTests.m */; }; 2D4BD8E01DA2E20D005AC8A8 /* RCTModuleInitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */; }; 2D4BD8E11DA2E20D005AC8A8 /* RCTModuleInitNotificationRaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13129DD31C85F87C007D611C /* RCTModuleInitNotificationRaceTests.m */; }; - 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */; }; + 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */; }; 2D4BD8E31DA2E20D005AC8A8 /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; }; 2D4BD8E41DA2E20D005AC8A8 /* RCTUIManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */; }; 2D4BD8E51DA2E20D005AC8A8 /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */; }; @@ -93,7 +93,7 @@ 2DD323E01DA2DDBF000FE1B8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2DD323E11DA2DDBF000FE1B8 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; }; 2DD323E21DA2DDBF000FE1B8 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB61A68108700A75B9A /* Info.plist */; }; - 2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */; }; + 2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation.a */; }; 2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323BF1DA2DD8B000FE1B8 /* libRCTLinking-tvOS.a */; }; 2DD323E61DA2DE3F000FE1B8 /* libRCTNetwork-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C31DA2DD8B000FE1B8 /* libRCTNetwork-tvOS.a */; }; 2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323C81DA2DD8B000FE1B8 /* libRCTSettings-tvOS.a */; }; @@ -107,6 +107,9 @@ 3D299BAF1D33EBFA00FA1057 /* RCTLoggingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D299BAE1D33EBFA00FA1057 /* RCTLoggingTests.m */; }; 3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */; }; 3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323BB1DA2DD8B000FE1B8 /* libRCTImage-tvOS.a */; }; + 3D4153591F276F4E005B8EFE /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1380DC991E70C0DD00E7C47D /* libReact.a */; }; + 3D4153631F27700D005B8EFE /* libART.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4153601F276FF9005B8EFE /* libART.a */; }; + 3D4153641F277011005B8EFE /* libART-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4153621F276FF9005B8EFE /* libART-tvOS.a */; }; 3D56F9F11D6F6E9B00F53A06 /* RNTesterBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F83E1D6F6AE000E69E0E /* RNTesterBundle.bundle */; }; 3DB99D0C1BA0340600302749 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB99D0B1BA0340600302749 /* RNTesterIntegrationTests.m */; }; 3DD981D61D33C6FB007DC7BE /* RNTesterUnitTestsBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* RNTesterUnitTestsBundle.js */; }; @@ -213,20 +216,6 @@ remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4; remoteInfo = "jschelpers-tvOS"; }; - 1380DCA81E70C0DD00E7C47D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactLegacy.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7; - remoteInfo = "third-party"; - }; - 1380DCAA1E70C0DD00E7C47D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1380DC8B1E70C0DC00E7C47D /* ReactLegacy.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 139D7E881E25C6D100323FB7; - remoteInfo = "double-conversion"; - }; 138DEE081B9EDDDB007F4EA5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 138DEE021B9EDDDB007F4EA5 /* RCTCameraRoll.xcodeproj */; @@ -360,6 +349,20 @@ remoteGlobalIDString = 3D13F83D1D6F6AE000E69E0E; remoteInfo = RNTesterBundle; }; + 3D41535F1F276FF9005B8EFE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3D41535A1F276FF9005B8EFE /* ART.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 0CF68AC11AF0540F00FF9E5C; + remoteInfo = ART; + }; + 3D4153611F276FF9005B8EFE /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3D41535A1F276FF9005B8EFE /* ART.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 323A12871E5F266B004975B8; + remoteInfo = "ART-tvOS"; + }; 58005BED1ABA80530062E044 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */; @@ -397,7 +400,7 @@ 1380DC8B1E70C0DC00E7C47D /* ReactLegacy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactLegacy.xcodeproj; path = ../React/ReactLegacy.xcodeproj; sourceTree = ""; }; 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowViewTests.m; sourceTree = ""; }; 138DEE021B9EDDDB007F4EA5 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = ../Libraries/CameraRoll/RCTCameraRoll.xcodeproj; sourceTree = ""; }; - 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTModuleMethodTests.m; sourceTree = ""; }; + 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTModuleMethodTests.mm; sourceTree = ""; }; 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* RNTester.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RNTester.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = RNTester/AppDelegate.h; sourceTree = ""; }; @@ -453,6 +456,7 @@ 3D13F8451D6F6AF200E69E0E /* OtherImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = OtherImages.xcassets; sourceTree = ""; }; 3D299BAE1D33EBFA00FA1057 /* RCTLoggingTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLoggingTests.m; sourceTree = ""; }; 3D2AFAF41D646CF80089D1A3 /* legacy_image@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "legacy_image@2x.png"; path = "RNTester/legacy_image@2x.png"; sourceTree = ""; }; + 3D41535A1F276FF9005B8EFE /* ART.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ART.xcodeproj; path = ../Libraries/ART/ART.xcodeproj; sourceTree = ""; }; 3DB99D0B1BA0340600302749 /* RNTesterIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests.m; sourceTree = ""; }; 3DD981D51D33C6FB007DC7BE /* RNTesterUnitTestsBundle.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = RNTesterUnitTestsBundle.js; sourceTree = ""; }; 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTest.xcodeproj; path = ../Libraries/RCTTest/RCTTest.xcodeproj; sourceTree = ""; }; @@ -471,6 +475,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3D4153591F276F4E005B8EFE /* libReact.a in Frameworks */, 14D6D71E1B2222EF001FB087 /* libRCTActionSheet.a in Frameworks */, 14D6D71F1B2222EF001FB087 /* libRCTAdSupport.a in Frameworks */, 14D6D7201B2222EF001FB087 /* libRCTGeolocation.a in Frameworks */, @@ -490,6 +495,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3D4153631F27700D005B8EFE /* libART.a in Frameworks */, 1380DCD41E70C44800E7C47D /* libReact.a in Frameworks */, 147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */, 134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */, @@ -527,7 +533,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation-tvOS.a in Frameworks */, + 3D4153641F277011005B8EFE /* libART-tvOS.a in Frameworks */, + 2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation.a in Frameworks */, 3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */, 2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */, 2DD323E61DA2DE3F000FE1B8 /* libRCTNetwork-tvOS.a in Frameworks */, @@ -560,6 +567,7 @@ isa = PBXGroup; children = ( 1380DC8B1E70C0DC00E7C47D /* ReactLegacy.xcodeproj */, + 3D41535A1F276FF9005B8EFE /* ART.xcodeproj */, 14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */, 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */, 13E5019C1D07A502005F35D8 /* RCTAnimation.xcodeproj */, @@ -641,8 +649,6 @@ 1380DCA31E70C0DD00E7C47D /* libcxxreact.a */, 1380DCA51E70C0DD00E7C47D /* libjschelpers.a */, 1380DCA71E70C0DD00E7C47D /* libjschelpers.a */, - 1380DCA91E70C0DD00E7C47D /* libthird-party.a */, - 1380DCAB1E70C0DD00E7C47D /* libdouble-conversion.a */, ); name = Products; sourceTree = ""; @@ -682,7 +688,7 @@ isa = PBXGroup; children = ( 13E501A31D07A502005F35D8 /* libRCTAnimation.a */, - 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */, + 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation.a */, ); name = Products; sourceTree = ""; @@ -707,7 +713,7 @@ 13DF61B51B67A45000EDB188 /* RCTMethodArgumentTests.m */, 134CB9291C85A38800265FA6 /* RCTModuleInitTests.m */, 13129DD31C85F87C007D611C /* RCTModuleInitNotificationRaceTests.m */, - 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.m */, + 1393D0371B68CD1300E1B601 /* RCTModuleMethodTests.mm */, 001BFCE31D838343008E587E /* RCTMultipartStreamReaderTests.m */, 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */, 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */, @@ -823,6 +829,15 @@ path = RNTester/RNTesterBundle; sourceTree = ""; }; + 3D41535B1F276FF9005B8EFE /* Products */ = { + isa = PBXGroup; + children = ( + 3D4153601F276FF9005B8EFE /* libART.a */, + 3D4153621F276FF9005B8EFE /* libART-tvOS.a */, + ); + name = Products; + sourceTree = ""; + }; 58005BE51ABA80530062E044 /* Products */ = { isa = PBXGroup; children = ( @@ -1049,6 +1064,10 @@ productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; projectDirPath = ""; projectReferences = ( + { + ProductGroup = 3D41535B1F276FF9005B8EFE /* Products */; + ProjectRef = 3D41535A1F276FF9005B8EFE /* ART.xcodeproj */; + }, { ProductGroup = 147CED471AB34F8C00DA3E4C /* Products */; ProjectRef = 14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */; @@ -1215,20 +1234,6 @@ remoteRef = 1380DCA61E70C0DD00E7C47D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1380DCA91E70C0DD00E7C47D /* libthird-party.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libthird-party.a"; - remoteRef = 1380DCA81E70C0DD00E7C47D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1380DCAB1E70C0DD00E7C47D /* libdouble-conversion.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libdouble-conversion.a"; - remoteRef = 1380DCAA1E70C0DD00E7C47D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 138DEE091B9EDDDB007F4EA5 /* libRCTCameraRoll.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1264,10 +1269,10 @@ remoteRef = 14DC67F01AB71876001358AB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation-tvOS.a */ = { + 2DD323B51DA2DD8B000FE1B8 /* libRCTAnimation.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libRCTAnimation-tvOS.a"; + path = libRCTAnimation.a; remoteRef = 2DD323B41DA2DD8B000FE1B8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1334,6 +1339,20 @@ remoteRef = 3D05746B1DE6008900184BB4 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 3D4153601F276FF9005B8EFE /* libART.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libART.a; + remoteRef = 3D41535F1F276FF9005B8EFE /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 3D4153621F276FF9005B8EFE /* libART-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libART-tvOS.a"; + remoteRef = 3D4153611F276FF9005B8EFE /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 58005BEE1ABA80530062E044 /* libRCTTest.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1458,7 +1477,7 @@ 1497CFB01B21F5E400C1F8F2 /* RCTFontTests.m in Sources */, 13BCE84F1C9C209600DD7AAD /* RCTComponentPropsTests.m in Sources */, 144D21241B2204C5006DB32B /* RCTImageUtilTests.m in Sources */, - 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.m in Sources */, + 1393D0381B68CD1300E1B601 /* RCTModuleMethodTests.mm in Sources */, 1300627F1B59179B0043FE5A /* RCTGzipTests.m in Sources */, 1497CFAF1B21F5E400C1F8F2 /* RCTConvert_NSURLTests.m in Sources */, 1497CFAE1B21F5E400C1F8F2 /* RCTJSCExecutorTests.m in Sources */, @@ -1541,7 +1560,7 @@ 2D4BD8DB1DA2E20D005AC8A8 /* RCTImageLoaderHelpers.m in Sources */, 2D4BD8E51DA2E20D005AC8A8 /* RCTComponentPropsTests.m in Sources */, 2D4BD8D71DA2E20D005AC8A8 /* RCTConvert_NSURLTests.m in Sources */, - 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.m in Sources */, + 2D4BD8E21DA2E20D005AC8A8 /* RCTModuleMethodTests.mm in Sources */, 2D4BD8E11DA2E20D005AC8A8 /* RCTModuleInitNotificationRaceTests.m in Sources */, 2D4BD8DF1DA2E20D005AC8A8 /* RCTMethodArgumentTests.m in Sources */, 2D4BD8D61DA2E20D005AC8A8 /* RCTJSCExecutorTests.m in Sources */, diff --git a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm index ff0f09afb44..7abcd37aaf1 100644 --- a/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm +++ b/RNTester/RNTesterUnitTests/RCTModuleMethodTests.mm @@ -136,7 +136,7 @@ static RCTModuleMethod *buildSyncMethodWithMethodSignature(const char *methodSig method = buildDefaultMethodWithMethodSignature(methodSignature); })); - XCTAssertEqualObjects(method.JSMethodName, @"doFoo"); + XCTAssertEqualObjects(@(method.JSMethodName), @"doFoo"); XCTAssertFalse(RCTLogsError(^{ [method invokeWithBridge:nil module:self arguments:@[@"bar"]]; diff --git a/React/ReactLegacy.xcodeproj/project.pbxproj b/React/ReactLegacy.xcodeproj/project.pbxproj index d3a7a8de4b0..0608a3c903f 100644 --- a/React/ReactLegacy.xcodeproj/project.pbxproj +++ b/React/ReactLegacy.xcodeproj/project.pbxproj @@ -400,6 +400,27 @@ 3D3CD9441DE5FC6500167DC4 /* libjschelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D3CD9181DE5FBD800167DC4 /* libjschelpers.a */; }; 3D3CD9451DE5FC7100167DC4 /* JSBundleType.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CD8F51DE5FB2300167DC4 /* JSBundleType.h */; }; 3D3CD9471DE5FC7800167DC4 /* oss-compat-util.h in Headers */ = {isa = PBXBuildFile; fileRef = AC70D2EE1DE48AC5002E6351 /* oss-compat-util.h */; }; + 3D4153511F276ED7005B8EFE /* RCTLayoutAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D41534D1F276ED7005B8EFE /* RCTLayoutAnimation.h */; }; + 3D4153521F276ED7005B8EFE /* RCTLayoutAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D41534E1F276ED7005B8EFE /* RCTLayoutAnimation.m */; }; + 3D4153531F276ED7005B8EFE /* RCTLayoutAnimationGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D41534F1F276ED7005B8EFE /* RCTLayoutAnimationGroup.h */; }; + 3D4153541F276ED7005B8EFE /* RCTLayoutAnimationGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4153501F276ED7005B8EFE /* RCTLayoutAnimationGroup.m */; }; + 3D4153551F276EDC005B8EFE /* RCTLayoutAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D41534D1F276ED7005B8EFE /* RCTLayoutAnimation.h */; }; + 3D4153561F276EDF005B8EFE /* RCTLayoutAnimationGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D41534F1F276ED7005B8EFE /* RCTLayoutAnimationGroup.h */; }; + 3D4153571F276EE1005B8EFE /* RCTLayoutAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D41534E1F276ED7005B8EFE /* RCTLayoutAnimation.m */; }; + 3D4153581F276EE3005B8EFE /* RCTLayoutAnimationGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4153501F276ED7005B8EFE /* RCTLayoutAnimationGroup.m */; }; + 3D41536B1F277087005B8EFE /* RCTMaskedView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D4153651F277087005B8EFE /* RCTMaskedView.h */; }; + 3D41536C1F277087005B8EFE /* RCTMaskedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4153661F277087005B8EFE /* RCTMaskedView.m */; }; + 3D41536D1F277087005B8EFE /* RCTMaskedViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D4153671F277087005B8EFE /* RCTMaskedViewManager.h */; }; + 3D41536E1F277087005B8EFE /* RCTMaskedViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4153681F277087005B8EFE /* RCTMaskedViewManager.m */; }; + 3D41536F1F277087005B8EFE /* RCTShadowView+Hierarchy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D4153691F277087005B8EFE /* RCTShadowView+Hierarchy.h */; }; + 3D4153701F277087005B8EFE /* RCTShadowView+Hierarchy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D41536A1F277087005B8EFE /* RCTShadowView+Hierarchy.m */; }; + 3D4153711F277092005B8EFE /* RCTConvert+Transform.h in Headers */ = {isa = PBXBuildFile; fileRef = 945929C21DD62ADD00653A7D /* RCTConvert+Transform.h */; }; + 3D4153721F27709E005B8EFE /* RCTMaskedView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D4153651F277087005B8EFE /* RCTMaskedView.h */; }; + 3D4153731F2770A0005B8EFE /* RCTMaskedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4153661F277087005B8EFE /* RCTMaskedView.m */; }; + 3D4153741F2770A3005B8EFE /* RCTMaskedViewManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D4153671F277087005B8EFE /* RCTMaskedViewManager.h */; }; + 3D4153751F2770A4005B8EFE /* RCTMaskedViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D4153681F277087005B8EFE /* RCTMaskedViewManager.m */; }; + 3D4153761F2770B1005B8EFE /* RCTShadowView+Hierarchy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D4153691F277087005B8EFE /* RCTShadowView+Hierarchy.h */; }; + 3D4153771F2770B3005B8EFE /* RCTShadowView+Hierarchy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D41536A1F277087005B8EFE /* RCTShadowView+Hierarchy.m */; }; 3D5AC7131E0056C4000F9153 /* RCTTVView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5AC70F1E0056BC000F9153 /* RCTTVView.h */; }; 3D5AC7141E0056C7000F9153 /* RCTTVView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D5AC7101E0056BC000F9153 /* RCTTVView.m */; }; 3D5AC7191E0056E0000F9153 /* RCTTVNavigationEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D5AC7151E0056D9000F9153 /* RCTTVNavigationEventEmitter.h */; }; @@ -1317,6 +1338,16 @@ 3D3CD9181DE5FBD800167DC4 /* libjschelpers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjschelpers.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D3CD9251DE5FBEC00167DC4 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3D3CD9321DE5FBEE00167DC4 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 3D41534D1F276ED7005B8EFE /* RCTLayoutAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLayoutAnimation.h; sourceTree = ""; }; + 3D41534E1F276ED7005B8EFE /* RCTLayoutAnimation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLayoutAnimation.m; sourceTree = ""; }; + 3D41534F1F276ED7005B8EFE /* RCTLayoutAnimationGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTLayoutAnimationGroup.h; sourceTree = ""; }; + 3D4153501F276ED7005B8EFE /* RCTLayoutAnimationGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTLayoutAnimationGroup.m; sourceTree = ""; }; + 3D4153651F277087005B8EFE /* RCTMaskedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMaskedView.h; sourceTree = ""; }; + 3D4153661F277087005B8EFE /* RCTMaskedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMaskedView.m; sourceTree = ""; }; + 3D4153671F277087005B8EFE /* RCTMaskedViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMaskedViewManager.h; sourceTree = ""; }; + 3D4153681F277087005B8EFE /* RCTMaskedViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMaskedViewManager.m; sourceTree = ""; }; + 3D4153691F277087005B8EFE /* RCTShadowView+Hierarchy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RCTShadowView+Hierarchy.h"; sourceTree = ""; }; + 3D41536A1F277087005B8EFE /* RCTShadowView+Hierarchy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RCTShadowView+Hierarchy.m"; sourceTree = ""; }; 3D5AC70F1E0056BC000F9153 /* RCTTVView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVView.h; sourceTree = ""; }; 3D5AC7101E0056BC000F9153 /* RCTTVView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVView.m; sourceTree = ""; }; 3D5AC7151E0056D9000F9153 /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = ""; }; @@ -1494,6 +1525,10 @@ 369123E01DDC75850095B341 /* RCTJSCSamplingProfiler.m */, 13D9FEEC1CDCD93000158BD7 /* RCTKeyboardObserver.h */, 13D9FEED1CDCD93000158BD7 /* RCTKeyboardObserver.m */, + 3D41534D1F276ED7005B8EFE /* RCTLayoutAnimation.h */, + 3D41534E1F276ED7005B8EFE /* RCTLayoutAnimation.m */, + 3D41534F1F276ED7005B8EFE /* RCTLayoutAnimationGroup.h */, + 3D4153501F276ED7005B8EFE /* RCTLayoutAnimationGroup.m */, 13F17A831B8493E5007D4C75 /* RCTRedBox.h */, 13F17A841B8493E5007D4C75 /* RCTRedBox.m */, 000E6CE91AB0E97F000CDF4D /* RCTSourceCode.h */, @@ -1537,6 +1572,10 @@ 58C571BF1AA56C1900CDF9C8 /* RCTDatePickerManager.m */, 3D37B5801D522B190042D5B5 /* RCTFont.h */, 3D37B5811D522B190042D5B5 /* RCTFont.mm */, + 3D4153651F277087005B8EFE /* RCTMaskedView.h */, + 3D4153661F277087005B8EFE /* RCTMaskedView.m */, + 3D4153671F277087005B8EFE /* RCTMaskedViewManager.h */, + 3D4153681F277087005B8EFE /* RCTMaskedViewManager.m */, 83A1FE8A1B62640A00BE0E65 /* RCTModalHostView.h */, 83A1FE8B1B62640A00BE0E65 /* RCTModalHostView.m */, 83392EB11B6634E10013B15F /* RCTModalHostViewController.h */, @@ -1579,6 +1618,8 @@ 131B6AF31AF1093D00FFC3E0 /* RCTSegmentedControlManager.m */, 13E0674B1A70F44B002CDEE1 /* RCTShadowView.h */, 13E0674C1A70F44B002CDEE1 /* RCTShadowView.m */, + 3D4153691F277087005B8EFE /* RCTShadowView+Hierarchy.h */, + 3D41536A1F277087005B8EFE /* RCTShadowView+Hierarchy.m */, 595405551EC03A1700766D3C /* RCTShadowView+Layout.h */, 595405561EC03A1700766D3C /* RCTShadowView+Layout.m */, 13AF20431AE707F8005F5298 /* RCTSlider.h */, @@ -1896,6 +1937,7 @@ 3D302F321DF828F800D6DDAE /* RCTConvert.h in Headers */, 3D302F331DF828F800D6DDAE /* RCTDefines.h in Headers */, 3D302F341DF828F800D6DDAE /* RCTDisplayLink.h in Headers */, + 3D4153741F2770A3005B8EFE /* RCTMaskedViewManager.h in Headers */, 3D302F351DF828F800D6DDAE /* RCTErrorCustomizer.h in Headers */, 3D302F361DF828F800D6DDAE /* RCTErrorInfo.h in Headers */, A12E9E911E5DFA720029001B /* RCTSamplingProfilerPackagerMethod.h in Headers */, @@ -1951,6 +1993,7 @@ 2D074E391E609E68001D6DD0 /* RCTSRWebSocket.h in Headers */, 3D302F631DF828F800D6DDAE /* RCTStatusBarManager.h in Headers */, 3D302F641DF828F800D6DDAE /* RCTTiming.h in Headers */, + 3D4153721F27709E005B8EFE /* RCTMaskedView.h in Headers */, 3D302F651DF828F800D6DDAE /* RCTUIManager.h in Headers */, 3D302F661DF828F800D6DDAE /* RCTFPSGraph.h in Headers */, 3D302F681DF828F800D6DDAE /* RCTMacros.h in Headers */, @@ -1973,6 +2016,7 @@ 3D302F7D1DF828F800D6DDAE /* RCTModalHostViewManager.h in Headers */, 3D302F7E1DF828F800D6DDAE /* RCTNavigator.h in Headers */, 3D302F7F1DF828F800D6DDAE /* RCTNavigatorManager.h in Headers */, + 3D4153561F276EDF005B8EFE /* RCTLayoutAnimationGroup.h in Headers */, 3D302F801DF828F800D6DDAE /* RCTNavItem.h in Headers */, 3D302F811DF828F800D6DDAE /* RCTNavItemManager.h in Headers */, 3D302F841DF828F800D6DDAE /* RCTPointerEvents.h in Headers */, @@ -1984,8 +2028,10 @@ 3D302F881DF828F800D6DDAE /* RCTRootShadowView.h in Headers */, 3D302F891DF828F800D6DDAE /* RCTScrollableProtocol.h in Headers */, 3D302F8A1DF828F800D6DDAE /* RCTScrollView.h in Headers */, + 3D4153551F276EDC005B8EFE /* RCTLayoutAnimation.h in Headers */, 3D302F8B1DF828F800D6DDAE /* RCTScrollViewManager.h in Headers */, 3D302F8C1DF828F800D6DDAE /* RCTSegmentedControl.h in Headers */, + 3D4153761F2770B1005B8EFE /* RCTShadowView+Hierarchy.h in Headers */, 3D302F8D1DF828F800D6DDAE /* RCTSegmentedControlManager.h in Headers */, 3D302F8E1DF828F800D6DDAE /* RCTShadowView.h in Headers */, 3D302F8F1DF828F800D6DDAE /* RCTSlider.h in Headers */, @@ -2073,6 +2119,7 @@ A12E9E8E1E5DFA620029001B /* RCTSamplingProfilerPackagerMethod.h in Headers */, 3D80DA1A1DF820620028D040 /* RCTImageStoreManager.h in Headers */, 3D80DA1B1DF820620028D040 /* RCTResizeMode.h in Headers */, + 3D4153511F276ED7005B8EFE /* RCTLayoutAnimation.h in Headers */, 3D80DA1C1DF820620028D040 /* RCTLinkingManager.h in Headers */, 3D80DA1D1DF820620028D040 /* RCTNetworking.h in Headers */, 3D80DA1E1DF820620028D040 /* RCTNetworkTask.h in Headers */, @@ -2095,6 +2142,7 @@ 597AD1BD1E577D7800152581 /* RCTRootContentView.h in Headers */, 3D80DA2E1DF820620028D040 /* RCTImageSource.h in Headers */, 3D80DA2F1DF820620028D040 /* RCTInvalidating.h in Headers */, + 3D41536F1F277087005B8EFE /* RCTShadowView+Hierarchy.h in Headers */, 3D80DA301DF820620028D040 /* RCTJavaScriptExecutor.h in Headers */, A12E9E5A1E5DF8600029001B /* RCTReloadPackagerMethod.h in Headers */, A12E9E2A1E5DEB860029001B /* RCTReconnectingWebSocket.h in Headers */, @@ -2132,6 +2180,7 @@ 3D80DA501DF820620028D040 /* RCTDevMenu.h in Headers */, C6827DF91EF17DC100D66BEF /* RCTJSEnvironment.h in Headers */, 3D80DA511DF820620028D040 /* RCTEventEmitter.h in Headers */, + 3D41536B1F277087005B8EFE /* RCTMaskedView.h in Headers */, 3D80DA521DF820620028D040 /* RCTExceptionsManager.h in Headers */, 3D80DA531DF820620028D040 /* RCTI18nManager.h in Headers */, 598C22D61EDCBEE1009AF445 /* RCTUIManagerObserverCoordinator.h in Headers */, @@ -2151,6 +2200,7 @@ 3D80DA601DF820620028D040 /* RCTActivityIndicatorViewManager.h in Headers */, 3D80DA611DF820620028D040 /* RCTAnimationType.h in Headers */, 3D80DA621DF820620028D040 /* RCTAutoInsetsProtocol.h in Headers */, + 3D4153711F277092005B8EFE /* RCTConvert+Transform.h in Headers */, 3D80DA631DF820620028D040 /* RCTBorderDrawing.h in Headers */, C6194AB51EF1569C0034D062 /* RCTPackagerConnectionBridgeConfig.h in Headers */, 3D80DA641DF820620028D040 /* RCTBorderStyle.h in Headers */, @@ -2167,6 +2217,7 @@ 594AD5CD1E46D87500B07237 /* RCTScrollContentShadowView.h in Headers */, 3D80DA731DF820620028D040 /* RCTNavigator.h in Headers */, 3D80DA741DF820620028D040 /* RCTNavigatorManager.h in Headers */, + 3D4153531F276ED7005B8EFE /* RCTLayoutAnimationGroup.h in Headers */, 3D7BFCE71EA8E1F4008DFB7A /* RCTPackagerConnection.h in Headers */, 3D80DA751DF820620028D040 /* RCTNavItem.h in Headers */, 3D80DA761DF820620028D040 /* RCTNavItemManager.h in Headers */, @@ -2200,6 +2251,7 @@ 3D80DA8F1DF820620028D040 /* RCTViewManager.h in Headers */, 3D80DA901DF820620028D040 /* RCTWebView.h in Headers */, 3D80DA911DF820620028D040 /* RCTWebViewManager.h in Headers */, + 3D41536D1F277087005B8EFE /* RCTMaskedViewManager.h in Headers */, 3D80DA921DF820620028D040 /* RCTWrapperViewController.h in Headers */, 3D80DA931DF820620028D040 /* UIView+Private.h in Headers */, 3D80DA941DF820620028D040 /* UIView+React.h in Headers */, @@ -2483,10 +2535,13 @@ 2D3B5ECA1D9B095F00451313 /* RCTComponentData.m in Sources */, 2D3B5EA31D9B08BE00451313 /* RCTParserUtils.m in Sources */, 2D3B5EA01D9B08B200451313 /* RCTLog.mm in Sources */, + 3D4153581F276EE3005B8EFE /* RCTLayoutAnimationGroup.m in Sources */, 2D3B5EE21D9B09B400451313 /* RCTScrollViewManager.m in Sources */, + 3D4153751F2770A4005B8EFE /* RCTMaskedViewManager.m in Sources */, 2D3B5ECF1D9B096F00451313 /* RCTFont.mm in Sources */, 2D3B5ED51D9B098000451313 /* RCTModalHostViewController.m in Sources */, 2D3B5EBC1D9B092600451313 /* RCTKeyboardObserver.m in Sources */, + 3D4153571F276EE1005B8EFE /* RCTLayoutAnimation.m in Sources */, 2D3B5E971D9B089000451313 /* RCTBridge.m in Sources */, C6194AB81EF1569C0034D062 /* RCTPackagerConnectionBridgeConfig.m in Sources */, 2D3B5EA21D9B08BA00451313 /* RCTModuleMethod.m in Sources */, @@ -2546,6 +2601,7 @@ 2D3B5EB01D9B08FE00451313 /* RCTAlertManager.m in Sources */, 2D3B5E9C1D9B08A300451313 /* RCTImageSource.m in Sources */, 3DDEC1521DDCE0CA0020BBDF /* RCTJSCSamplingProfiler.m in Sources */, + 3D4153731F2770A0005B8EFE /* RCTMaskedView.m in Sources */, 3D5AC7231E005766000F9153 /* RCTTVRemoteHandler.m in Sources */, B50558421E43E14000F71A00 /* RCTDevSettings.mm in Sources */, 2D3B5EC31D9B094800451313 /* RCTProfileTrampoline-arm.S in Sources */, @@ -2553,6 +2609,7 @@ 2D74EAFA1DAE9590003B751B /* RCTMultipartDataTask.m in Sources */, 2D3B5EC51D9B094D00451313 /* RCTProfileTrampoline-i386.S in Sources */, 597AD1C01E577D7800152581 /* RCTRootContentView.m in Sources */, + 3D4153771F2770B3005B8EFE /* RCTShadowView+Hierarchy.m in Sources */, 2D3B5EC41D9B094B00451313 /* RCTProfileTrampoline-arm64.S in Sources */, 2D3B5EBB1D9B092300451313 /* RCTI18nManager.m in Sources */, 2D3B5EBE1D9B092D00451313 /* RCTUIManager.m in Sources */, @@ -2631,6 +2688,7 @@ 13723B501A82FD3C00F88898 /* RCTStatusBarManager.m in Sources */, 000E6CEB1AB0E980000CDF4D /* RCTSourceCode.m in Sources */, 001BFCD01D8381DE008E587E /* RCTMultipartStreamReader.m in Sources */, + 3D4153701F277087005B8EFE /* RCTShadowView+Hierarchy.m in Sources */, 133CAE8E1B8E5CFD00F6AD92 /* RCTDatePicker.m in Sources */, 14C2CA761B3AC64F00E6CBB2 /* RCTFrameUpdate.m in Sources */, 13B07FEF1A69327A00A75B9A /* RCTAlertManager.m in Sources */, @@ -2664,6 +2722,7 @@ 58C571C11AA56C1900CDF9C8 /* RCTDatePickerManager.m in Sources */, 1450FF8A1BCFF28A00208362 /* RCTProfileTrampoline-x86_64.S in Sources */, 594AD5D31E46D87500B07237 /* RCTScrollContentViewManager.m in Sources */, + 3D41536C1F277087005B8EFE /* RCTMaskedView.m in Sources */, 13D9FEEB1CDCCECF00158BD7 /* RCTEventEmitter.m in Sources */, AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */, 14F7A0EC1BDA3B3C003C6C10 /* RCTPerfMonitor.m in Sources */, @@ -2695,6 +2754,7 @@ 3EDCA8A51D3591E700450C31 /* RCTErrorInfo.m in Sources */, 83CBBA521A601E3B00E9B192 /* RCTLog.mm in Sources */, 13B0801D1A69489C00A75B9A /* RCTNavItemManager.m in Sources */, + 3D4153541F276ED7005B8EFE /* RCTLayoutAnimationGroup.m in Sources */, 13A6E20E1C19AA0C00845B82 /* RCTParserUtils.m in Sources */, 13E067571A70F44B002CDEE1 /* RCTView.m in Sources */, 3D7749441DC1065C007EC8D8 /* RCTPlatform.m in Sources */, @@ -2724,6 +2784,7 @@ 83392EB31B6634E10013B15F /* RCTModalHostViewController.m in Sources */, 13B0801C1A69489C00A75B9A /* RCTNavItem.m in Sources */, 83CBBA691A601EF300E9B192 /* RCTEventDispatcher.m in Sources */, + 3D41536E1F277087005B8EFE /* RCTMaskedViewManager.m in Sources */, A12E9E5B1E5DF8600029001B /* RCTReloadPackagerMethod.m in Sources */, 83A1FE8F1B62643A00BE0E65 /* RCTModalHostViewManager.m in Sources */, 13E0674A1A70F434002CDEE1 /* RCTUIManager.m in Sources */, @@ -2732,6 +2793,7 @@ 945929C41DD62ADD00653A7D /* RCTConvert+Transform.m in Sources */, 13AB90C11B6FA36700713B4F /* RCTComponentData.m in Sources */, 13B0801B1A69489C00A75B9A /* RCTNavigatorManager.m in Sources */, + 3D4153521F276ED7005B8EFE /* RCTLayoutAnimation.m in Sources */, CF85BC331E79EC6B00F1EF3B /* RCTDeviceInfo.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ReactCommon/cxxreact/Android.mk b/ReactCommon/cxxreact/Android.mk index b2ef806a59a..98713b086bf 100644 --- a/ReactCommon/cxxreact/Android.mk +++ b/ReactCommon/cxxreact/Android.mk @@ -7,20 +7,21 @@ LOCAL_MODULE := reactnative LOCAL_SRC_FILES := \ CxxNativeModule.cpp \ Instance.cpp \ - JSCExecutor.cpp \ JSBigString.cpp \ JSBundleType.cpp \ + JSCExecutor.cpp \ JSCLegacyTracing.cpp \ JSCMemory.cpp \ JSCNativeModules.cpp \ JSCPerfStats.cpp \ + JSCSamplingProfiler.cpp \ JSCTracing.cpp \ + JSCUtils.cpp \ JSIndexedRAMBundle.cpp \ MethodCall.cpp \ ModuleRegistry.cpp \ NativeToJsBridge.cpp \ Platform.cpp \ - JSCUtils.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES) diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp index 826120595cf..4ed14a7b58b 100644 --- a/ReactCommon/cxxreact/JSCExecutor.cpp +++ b/ReactCommon/cxxreact/JSCExecutor.cpp @@ -166,6 +166,14 @@ static bool canUseInspector(JSContextRef context) { #endif } +static bool canUseSamplingProfiler(JSContextRef context) { +#if defined(__APPLE__) || defined(WITH_JSC_EXTRA_TRACING) + return JSC_JSSamplingProfilerEnabled(context); +#else + return false; +#endif +} + void JSCExecutor::initOnJSVMThread() throw(JSException) { SystraceSection s("JSCExecutor::initOnJSVMThread"); @@ -222,7 +230,7 @@ void JSCExecutor::initOnJSVMThread() throw(JSException) { JSCNativeHooks::installPerfHooks(m_context); - if (JSC_JSSamplingProfilerEnabled(m_context)) { + if (canUseSamplingProfiler(m_context)) { initSamplingProfilerOnMainJSCThread(m_context); } }