From 12b93d72802b2e4cf45a6744986afec26011147e Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Wed, 23 Nov 2016 11:33:44 -0800 Subject: [PATCH] Replace RCTJSCWrapper with JSCWrapper from ReactCommon Reviewed By: mhorowitz Differential Revision: D4204516 fbshipit-source-id: 6bcb122daf2848035dfae404ee7a2e9aca0f8087 --- .../UIExplorer.xcodeproj/project.pbxproj | 77 +++++++++++++++++++ .../xcschemes/UIExplorer-tvOS.xcscheme | 16 +++- 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/UIExplorer/UIExplorer.xcodeproj/project.pbxproj index 2d5105b3adc..ef1ea094099 100644 --- a/UIExplorer/UIExplorer.xcodeproj/project.pbxproj +++ b/UIExplorer/UIExplorer.xcodeproj/project.pbxproj @@ -104,6 +104,7 @@ 2DD323EA1DA2DE3F000FE1B8 /* libReact-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */; }; 3578590A1B28D2CF00341EDB /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 357859011B28D2C500341EDB /* libRCTLinking.a */; }; 39AA31A41DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */; }; + 3D05746D1DE6008900184BB4 /* libRCTPushNotification-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */; }; 3D13F8481D6F6AF900E69E0E /* ImageInBundle.png in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F8441D6F6AF200E69E0E /* ImageInBundle.png */; }; 3D13F84A1D6F6AFD00E69E0E /* OtherImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F8451D6F6AF200E69E0E /* OtherImages.xcassets */; }; 3D299BAF1D33EBFA00FA1057 /* RCTLoggingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D299BAE1D33EBFA00FA1057 /* RCTLoggingTests.m */; }; @@ -288,6 +289,41 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTLinking; }; + 3D05746B1DE6008900184BB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D05745F1DE6004600184BB4; + remoteInfo = "RCTPushNotification-tvOS"; + }; + 3D05748B1DE6008900184BB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D3CD9251DE5FBEC00167DC4; + remoteInfo = cxxreact; + }; + 3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D3CD9321DE5FBEE00167DC4; + remoteInfo = "cxxreact-tvOS"; + }; + 3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D3CD90B1DE5FBD600167DC4; + remoteInfo = jschelpers; + }; + 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D3CD9181DE5FBD800167DC4; + remoteInfo = "jschelpers-tvOS"; + }; 3D13F84B1D6F6B5F00E69E0E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -479,6 +515,7 @@ 2DD323E41DA2DE3F000FE1B8 /* libRCTImage-tvOS.a in Frameworks */, 2DD323E51DA2DE3F000FE1B8 /* libRCTLinking-tvOS.a in Frameworks */, 2DD323E61DA2DE3F000FE1B8 /* libRCTNetwork-tvOS.a in Frameworks */, + 3D05746D1DE6008900184BB4 /* libRCTPushNotification-tvOS.a in Frameworks */, 2DD323E71DA2DE3F000FE1B8 /* libRCTSettings-tvOS.a in Frameworks */, 2DD323E81DA2DE3F000FE1B8 /* libRCTText-tvOS.a in Frameworks */, 2DD323E91DA2DE3F000FE1B8 /* libRCTWebSocket-tvOS.a in Frameworks */, @@ -688,6 +725,10 @@ 2DD323D91DA2DD8B000FE1B8 /* libReact-tvOS.a */, 3D3C08811DE3424E00C268FA /* libCSSLayout.a */, 3D3C08831DE3424E00C268FA /* libCSSLayout-tvOS.a */, + 3D05748C1DE6008900184BB4 /* libcxxreact.a */, + 3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */, + 3D0574901DE6008900184BB4 /* libjschelpers.a */, + 3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */, ); name = Products; sourceTree = ""; @@ -719,6 +760,7 @@ isa = PBXGroup; children = ( 14DC67F11AB71876001358AB /* libRCTPushNotification.a */, + 3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */, ); name = Products; sourceTree = ""; @@ -1210,6 +1252,41 @@ remoteRef = 357859001B28D2C500341EDB /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 3D05746C1DE6008900184BB4 /* libRCTPushNotification-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTPushNotification-tvOS.a"; + remoteRef = 3D05746B1DE6008900184BB4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 3D05748C1DE6008900184BB4 /* libcxxreact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libcxxreact.a; + remoteRef = 3D05748B1DE6008900184BB4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 3D05748E1DE6008900184BB4 /* libcxxreact-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libcxxreact-tvOS.a"; + remoteRef = 3D05748D1DE6008900184BB4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 3D0574901DE6008900184BB4 /* libjschelpers.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libjschelpers.a; + remoteRef = 3D05748F1DE6008900184BB4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 3D0574921DE6008900184BB4 /* libjschelpers-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjschelpers-tvOS.a"; + remoteRef = 3D0574911DE6008900184BB4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 3D3C08811DE3424E00C268FA /* libCSSLayout.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; diff --git a/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme b/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme index cf3a62f5e5f..4a8c0a34022 100644 --- a/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme +++ b/UIExplorer/UIExplorer.xcodeproj/xcshareddata/xcschemes/UIExplorer-tvOS.xcscheme @@ -3,9 +3,23 @@ LastUpgradeVersion = "0810" version = "1.3"> + + + +