From 03b709ffecb34d06f42feb49e5ecf935c788729d Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Wed, 27 Mar 2019 11:58:34 -0700 Subject: [PATCH] Mac .58 fixes --- .../Text/TextInput/Multiline/RCTUITextView.m | 10 +- RNTester/RNTester.xcodeproj/project.pbxproj | 364 +++++----- React/React.xcodeproj/project.pbxproj | 640 ++++++++++-------- 3 files changed, 549 insertions(+), 465 deletions(-) diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m index 1f92f0853e658c..8da512c61365cd 100644 --- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m +++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m @@ -190,18 +190,15 @@ - (void)setTextAlignment:(NSTextAlignment)textAlignment - (void)setAttributedText:(NSAttributedString *)attributedText { - // Using `setAttributedString:` while user is typing breaks some internal mechanics +#if !TARGET_OS_OSX // TODO(macOS ISS#2323203) + // Using `setAttributedString:` while user is typing breaks some internal mechanics // when entering complex input languages such as Chinese, Korean or Japanese. // see: https://github.com/facebook/react-native/issues/19339 // We try to avoid calling this method as much as we can. // If the text has changed, there is nothing we can do. if (![super.attributedText.string isEqualToString:attributedText.string]) { -#if !TARGET_OS_OSX // TODO(macOS ISS#2323203) [super setAttributedText:attributedText]; -#else // [TODO(macOS ISS#2323203) - [self.textStorage setAttributedString:attributedText]; -#endif // ]TODO(macOS ISS#2323203) } else { // But if the text is preserved, we just copying the attributes from the source string. if (![super.attributedText isEqualToAttributedString:attributedText]) { @@ -210,6 +207,9 @@ - (void)setAttributedText:(NSAttributedString *)attributedText } [self textDidChange]; +#else // [TODO(macOS ISS#2323203) + [self.textStorage setAttributedString:attributedText]; +#endif // ]TODO(macOS ISS#2323203) } #pragma mark - Overrides diff --git a/RNTester/RNTester.xcodeproj/project.pbxproj b/RNTester/RNTester.xcodeproj/project.pbxproj index b5781c2e70d1d1..9b8eaedcaed253 100644 --- a/RNTester/RNTester.xcodeproj/project.pbxproj +++ b/RNTester/RNTester.xcodeproj/project.pbxproj @@ -64,12 +64,8 @@ 184808F321668CA100C3C43F /* libRCTLinking-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D429028F1F1CE21600685AE7 /* libRCTLinking-macOS.a */; }; 1879ECF921E84E2800D98372 /* RCTConvert_NSColorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1879ECDE21E84E2800D98372 /* RCTConvert_NSColorTests.m */; }; 18AA4BD41EF9C724008C7756 /* RCTURLUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B6C1A21C34225900D3FAF5 /* RCTURLUtilsTests.m */; }; - 18B8F9C42143301B00CE911A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597AB921406C81008515EB /* libReact.a */; }; - 18B8F9C52143303F00CE911A /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597AA021406C81008515EB /* libRCTWebSocket.a */; }; - 18B8F9C8214333B000CE911A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597A8B21406C81008515EB /* libRCTNetwork.a */; }; - 18B8F9C92143340C00CE911A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597A8321406C81008515EB /* libRCTImage.a */; }; - 18BF6FE92149CF3200D438C7 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18D8A2F92149C88F00086F45 /* libRCTText.a */; }; - 18BF70042149CF6900D438C7 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597A8321406C81008515EB /* libRCTImage.a */; }; + 18BF6FE92149CF3200D438C7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 18BF70042149CF6900D438C7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 18BFA4931F01C46700969486 /* OCMock.framework */; }; 18BFA4CB1F01C52400969486 /* RCTEventDispatcherTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFA91B21F5E400C1F8F2 /* RCTEventDispatcherTests.m */; }; 18CD948B2149BA90009E2179 /* libRCTTest-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18DF57271EFA056600BF4666 /* libRCTTest-macOS.a */; }; @@ -85,11 +81,9 @@ 18D593801EF9FA48005F0CEC /* RCTShadowViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 138D6A161B53CD440074A87E /* RCTShadowViewTests.m */; }; 18D593811EF9FA57005F0CEC /* RCTUIManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1497CFAB1B21F5E400C1F8F2 /* RCTUIManagerTests.m */; }; 18D593841EF9FAB9005F0CEC /* RCTUnicodeDecodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 39AA31A31DC1DFDC000F7EBB /* RCTUnicodeDecodeTests.m */; }; - 18D8A2FA2149C88F00086F45 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18D8A2F92149C88F00086F45 /* libRCTText.a */; }; - 18D8A3152149C99200086F45 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597A8B21406C81008515EB /* libRCTNetwork.a */; }; + 18D8A3152149C99200086F45 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 18D949451F9AC375007BB668 /* RCTRootViewIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B885551BED29AF00008352 /* RCTRootViewIntegrationTests.m */; }; 18D9497D1F9AC3D0007BB668 /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; }; - 18DB36F11F10082A00A877D7 /* OCMock.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 18BFA4931F01C46700969486 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 18DF57111EFA047400BF4666 /* RCTComponentPropsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE84E1C9C209600DD7AAD /* RCTComponentPropsTests.m */; }; 18FC778A1EF4770B002B3F17 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FC77891EF4770B002B3F17 /* AppDelegate.m */; }; 18FC778D1EF4770B002B3F17 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FC778C1EF4770B002B3F17 /* main.m */; }; @@ -97,13 +91,13 @@ 18FC77951EF4770B002B3F17 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 18FC77931EF4770B002B3F17 /* Main.storyboard */; }; 18FC77A01EF4770B002B3F17 /* RNTesterUnitTests_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FC779F1EF4770B002B3F17 /* RNTesterUnitTests_macOS.m */; }; 18FC77AB1EF4770B002B3F17 /* RNTesterIntegrationTests_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 18FC77AA1EF4770B002B3F17 /* RNTesterIntegrationTests_macOS.m */; }; - 18FE57A82149BC50000CB2A7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597AB921406C81008515EB /* libReact.a */; }; - 18FE57AE2149BC65000CB2A7 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597AA021406C81008515EB /* libRCTWebSocket.a */; }; - 18FE57AF2149BCB9000CB2A7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597AB921406C81008515EB /* libReact.a */; }; + 18FE57A82149BC50000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 18FE57AE2149BC65000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 18FE57AF2149BCB9000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 18FE57B02149BCDB000CB2A7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 647647C81F0BCC5500C2D89B /* libRCTAnimation.a */; }; - 18FE57B12149BD03000CB2A7 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597A8B21406C81008515EB /* libRCTNetwork.a */; }; - 18FE57B22149BD08000CB2A7 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597AA021406C81008515EB /* libRCTWebSocket.a */; }; - 18FE57B32149BD0D000CB2A7 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18597A8321406C81008515EB /* libRCTImage.a */; }; + 18FE57B12149BD03000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 18FE57B22149BD08000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 18FE57B32149BD0D000CB2A7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 192F69B81E82409A008692C7 /* RCTAnimationUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B51E82409A008692C7 /* RCTAnimationUtilsTests.m */; }; 192F69B91E82409A008692C7 /* RCTConvert_YGValueTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B61E82409A008692C7 /* RCTConvert_YGValueTests.m */; }; 192F69BA1E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 192F69B71E82409A008692C7 /* RCTNativeAnimatedNodesManagerTests.m */; }; @@ -195,6 +189,9 @@ 83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; }; 8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; }; 8385CF041B87479200C6273E /* RCTImageLoaderHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */; }; + 9FB7D3EC224ABDCE00F31D11 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */; }; + 9FB7D3ED224ABEFE00F31D11 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; }; + 9FB7D3EF224AC0DE00F31D11 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FB7D3EE224AC0DE00F31D11 /* JavaScriptCore.framework */; }; BC9C03401DC9F1D600B1C635 /* RCTDevMenuTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */; }; C654F0B31EB34A73000B7A9A /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; }; C654F17E1EB34D24000B7A9A /* RNTesterTestModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */; }; @@ -283,69 +280,6 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTPushNotification; }; - 18597A8221406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 13417FE31AA91428003F314A /* RCTImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6BDE7AEB1ECB9C4400CC951F; - remoteInfo = "RCTImage-macOS"; - }; - 18597A8A21406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 134180261AA91779003F314A /* RCTNetwork.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6BDE7A901ECB6E8400CC951F; - remoteInfo = "RCTNetwork-macOS"; - }; - 18597A9F21406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6BDE7A581ECB6B8200CC951F; - remoteInfo = "RCTWebSocket-macOS"; - }; - 18597AB821406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B857F231EC51FC600A9D063; - remoteInfo = "React-macOS"; - }; - 18597ABA21406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B857F341EC51FCC00A9D063; - remoteInfo = "yoga-macOS"; - }; - 18597ABC21406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B857F421EC51FCF00A9D063; - remoteInfo = "cxxreact-macOS"; - }; - 18597ABE21406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 6B857F4F1EC51FD400A9D063; - remoteInfo = "jschelpers-macOS"; - }; - 18597AC021406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 188202A21EF48CF700C9B354; - remoteInfo = "third-party-macOS"; - }; - 18597AC221406C81008515EB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1882027C1EF48B7E00C9B354; - remoteInfo = "double-conversion-macOS"; - }; 18B8F9C22143301000CE911A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; @@ -458,13 +392,6 @@ remoteGlobalIDString = 6BDE7AB21ECB8D6200CC951F; remoteInfo = "RCTText-macos"; }; - 18D8A2F82149C88F00086F45 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B5119B1A9E6C1200147675; - remoteInfo = "RCTText-macos"; - }; 18DF57261EFA056600BF4666 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */; @@ -759,6 +686,90 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTSettings; }; + 9FB7D3E6224ABD0E00F31D11 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9FD21D78224303D900E7F88E; + remoteInfo = "jsi-macOS"; + }; + 9FB7D3E8224ABD0E00F31D11 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9FD21D94224305AA00E7F88E; + remoteInfo = "jsiexecutor-macOS"; + }; + 9FD21CD42242EE5B00E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 2DD3238F1DA2DD8A000FE1B8; + remoteInfo = "RNTester-tvOS"; + }; + 9FD21CE02242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 13417FE31AA91428003F314A /* RCTImage.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6BDE7AEB1ECB9C4400CC951F; + remoteInfo = "RCTImage-macOS"; + }; + 9FD21CE62242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 134180261AA91779003F314A /* RCTNetwork.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6BDE7A901ECB6E8400CC951F; + remoteInfo = "RCTNetwork-macOS"; + }; + 9FD21CF02242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 58B5119B1A9E6C1200147675; + remoteInfo = "RCTText-macos"; + }; + 9FD21CF82242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6BDE7A581ECB6B8200CC951F; + remoteInfo = "RCTWebSocket-macOS"; + }; + 9FD21D112242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9F2AC95D2239D788005C9C14; + remoteInfo = "React-macOS"; + }; + 9FD21D132242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6B857F341EC51FCC00A9D063; + remoteInfo = "yoga-macOS"; + }; + 9FD21D152242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 6B857F421EC51FCF00A9D063; + remoteInfo = "cxxreact-macOS"; + }; + 9FD21D192242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 188202A21EF48CF700C9B354; + remoteInfo = "third-party-macOS"; + }; + 9FD21D1B2242EFA400E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1882027C1EF48B7E00C9B354; + remoteInfo = "double-conversion-macOS"; + }; D429028E1F1CE21600685AE7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 357858F81B28D2C400341EDB /* RCTLinking.xcodeproj */; @@ -916,6 +927,7 @@ 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderTests.m; sourceTree = ""; }; 8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderHelpers.m; sourceTree = ""; }; 8385CF051B8747A000C6273E /* RCTImageLoaderHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTImageLoaderHelpers.h; sourceTree = ""; }; + 9FB7D3EE224AC0DE00F31D11 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevMenuTests.m; sourceTree = ""; }; C654F0B21EB34A73000B7A9A /* RNTesterTestModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterTestModule.m; sourceTree = ""; }; D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = ""; }; @@ -988,19 +1000,17 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 18B8F9C42143301B00CE911A /* libReact.a in Frameworks */, + 9FB7D3EF224AC0DE00F31D11 /* JavaScriptCore.framework in Frameworks */, + 9FB7D3ED224ABEFE00F31D11 /* libReact.a in Frameworks */, 6484CE5B201A7557004275A4 /* libRCTBlob-macOS.a in Frameworks */, 647647321F0BC04800C2D89B /* libART-macOS.a in Frameworks */, 647647C91F0BCC5500C2D89B /* libRCTAnimation.a in Frameworks */, 4633DB9F1F212E680080B326 /* libRCTGeolocation-macOS.a in Frameworks */, - 18B8F9C8214333B000CE911A /* libRCTNetwork.a in Frameworks */, - 18B8F9C92143340C00CE911A /* libRCTImage.a in Frameworks */, - 64481C631F6753960005D62A /* libRCTPushNotification-macOS.a in Frameworks */, D42902901F1CE21600685AE7 /* libRCTLinking-macOS.a in Frameworks */, + 64481C631F6753960005D62A /* libRCTPushNotification-macOS.a in Frameworks */, 6448A5D31F292F16006FF1F5 /* libRCTSettings-macOS.a in Frameworks */, 649D880C1F69DA080005AF18 /* libRCTActionSheet.a in Frameworks */, - 18B8F9C52143303F00CE911A /* libRCTWebSocket.a in Frameworks */, - 18D8A2FA2149C88F00086F45 /* libRCTText.a in Frameworks */, + 9FB7D3EC224ABDCE00F31D11 /* libRCTWebSocket.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1010,11 +1020,11 @@ files = ( 18BFA4C51F01C46D00969486 /* OCMock.framework in Frameworks */, 1834500B1EFAD54F0000CF82 /* libRCTTest-macOS.a in Frameworks */, - 18FE57AF2149BCB9000CB2A7 /* libReact.a in Frameworks */, + 18FE57AF2149BCB9000CB2A7 /* (null) in Frameworks */, 18FE57B02149BCDB000CB2A7 /* libRCTAnimation.a in Frameworks */, - 18FE57B32149BD0D000CB2A7 /* libRCTImage.a in Frameworks */, - 18FE57B12149BD03000CB2A7 /* libRCTNetwork.a in Frameworks */, - 18FE57B22149BD08000CB2A7 /* libRCTWebSocket.a in Frameworks */, + 18FE57B32149BD0D000CB2A7 /* (null) in Frameworks */, + 18FE57B12149BD03000CB2A7 /* (null) in Frameworks */, + 18FE57B22149BD08000CB2A7 /* (null) in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1023,11 +1033,11 @@ buildActionMask = 2147483647; files = ( 18CD948B2149BA90009E2179 /* libRCTTest-macOS.a in Frameworks */, - 18FE57A82149BC50000CB2A7 /* libReact.a in Frameworks */, - 18D8A3152149C99200086F45 /* libRCTNetwork.a in Frameworks */, - 18BF6FE92149CF3200D438C7 /* libRCTText.a in Frameworks */, - 18BF70042149CF6900D438C7 /* libRCTImage.a in Frameworks */, - 18FE57AE2149BC65000CB2A7 /* libRCTWebSocket.a in Frameworks */, + 18FE57A82149BC50000CB2A7 /* (null) in Frameworks */, + 18D8A3152149C99200086F45 /* (null) in Frameworks */, + 18BF6FE92149CF3200D438C7 /* (null) in Frameworks */, + 18BF70042149CF6900D438C7 /* (null) in Frameworks */, + 18FE57AE2149BC65000CB2A7 /* (null) in Frameworks */, 184808F321668CA100C3C43F /* libRCTLinking-macOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1131,7 +1141,7 @@ isa = PBXGroup; children = ( 13417FE81AA91428003F314A /* libRCTImage.a */, - 18597A8321406C81008515EB /* libRCTImage.a */, + 9FD21CE12242EFA400E7F88E /* libRCTImage.a */, 2DD323BB1DA2DD8B000FE1B8 /* libRCTImage-tvOS.a */, ); name = Products; @@ -1141,7 +1151,7 @@ isa = PBXGroup; children = ( 13417FEF1AA914B8003F314A /* libRCTText.a */, - 18D8A2F92149C88F00086F45 /* libRCTText.a */, + 9FD21CF12242EFA400E7F88E /* libRCTText.a */, 2DD323D01DA2DD8B000FE1B8 /* libRCTText-tvOS.a */, ); name = Products; @@ -1151,7 +1161,7 @@ isa = PBXGroup; children = ( 1341802B1AA91779003F314A /* libRCTNetwork.a */, - 18597A8B21406C81008515EB /* libRCTNetwork.a */, + 9FD21CE72242EFA400E7F88E /* libRCTNetwork.a */, 2DD323C31DA2DD8B000FE1B8 /* libRCTNetwork-tvOS.a */, ); name = Products; @@ -1178,7 +1188,7 @@ isa = PBXGroup; children = ( 139FDED91B0651EA00C62182 /* libRCTWebSocket.a */, - 18597AA021406C81008515EB /* libRCTWebSocket.a */, + 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */, 2DD323D51DA2DD8B000FE1B8 /* libRCTWebSocket-tvOS.a */, 3DBE0D331F3B18670099AA32 /* libfishhook.a */, 3DBE0D351F3B18670099AA32 /* libfishhook-tvOS.a */, @@ -1285,26 +1295,28 @@ isa = PBXGroup; children = ( 14AADF041AC3DB95002390C9 /* libReact.a */, - 18597AB921406C81008515EB /* libReact.a */, + 9FD21D122242EFA400E7F88E /* libReact.a */, 2DD323D91DA2DD8B000FE1B8 /* libReact.a */, 3D3C08811DE3424E00C268FA /* libyoga.a */, - 18597ABB21406C81008515EB /* libyoga.a */, + 9FD21D142242EFA400E7F88E /* libyoga.a */, 3D3C08831DE3424E00C268FA /* libyoga.a */, 3D05748C1DE6008900184BB4 /* libcxxreact.a */, - 18597ABD21406C81008515EB /* libcxxreact.a */, + 9FD21D162242EFA400E7F88E /* libcxxreact.a */, 3D05748E1DE6008900184BB4 /* libcxxreact.a */, 3DCE53221FEAB1C500613583 /* libjsinspector.a */, 18B8F9C32143301000CE911A /* libjsinspector-macOS.a */, 3DCE53241FEAB1C500613583 /* libjsinspector-tvOS.a */, 3D507F421EBC88B700B56834 /* libthird-party.a */, - 18597AC121406C81008515EB /* libthird-party.a */, + 9FD21D1A2242EFA400E7F88E /* libthird-party.a */, 2D66FF8C1ECA405900F0A767 /* libthird-party.a */, 3D507F441EBC88B700B56834 /* libdouble-conversion.a */, - 18597AC321406C81008515EB /* libdouble-conversion.a */, + 9FD21D1C2242EFA400E7F88E /* libdouble-conversion.a */, 2D66FF8E1ECA405900F0A767 /* libdouble-conversion.a */, EDEBC6FC214B402000DD5AC8 /* libjsi.a */, - EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */, ED2970952150246200B7C4FE /* libjsi-tvOS.a */, + 9FB7D3E7224ABD0E00F31D11 /* libjsi-macOS.a */, + EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */, + 9FB7D3E9224ABD0E00F31D11 /* libjsiexecutor-macOS.a */, ED2970972150246200B7C4FE /* libjsiexecutor-tvOS.a */, ); name = Products; @@ -1409,6 +1421,7 @@ 2DE7E7D81FB2A4F3009E225D /* Frameworks */ = { isa = PBXGroup; children = ( + 9FB7D3EE224AC0DE00F31D11 /* JavaScriptCore.framework */, ED2970982150247000B7C4FE /* JavaScriptCore.framework */, EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */, ); @@ -1592,7 +1605,6 @@ buildPhases = ( 18D8D99B21C06BCE00E0CCAC /* Sources */, 18D8D99C21C06BCE00E0CCAC /* Frameworks */, - 18D8D99D21C06BCE00E0CCAC /* CopyFiles */, ); buildRules = ( ); @@ -1658,7 +1670,6 @@ 18FC77971EF4770B002B3F17 /* Sources */, 18FC77981EF4770B002B3F17 /* Frameworks */, 18FC77991EF4770B002B3F17 /* Resources */, - 18BFA4C91F01C4F900969486 /* Copy Frameworks */, ); buildRules = ( ); @@ -2265,13 +2276,6 @@ remoteRef = 649BF7182019105B0068273E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 649BF7342019105B0068273E /* libprivatedata-macOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libprivatedata-macOS.a"; - remoteRef = 649BF7332019105B0068273E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 649D87D91F69DA030005AF18 /* libRCTActionSheet.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2286,6 +2290,83 @@ remoteRef = 834C36D11AF8DA610019C93C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FB7D3E7224ABD0E00F31D11 /* libjsi-macOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsi-macOS.a"; + remoteRef = 9FB7D3E6224ABD0E00F31D11 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FB7D3E9224ABD0E00F31D11 /* libjsiexecutor-macOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsiexecutor-macOS.a"; + remoteRef = 9FB7D3E8224ABD0E00F31D11 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21CE12242EFA400E7F88E /* libRCTImage.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTImage.a; + remoteRef = 9FD21CE02242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21CE72242EFA400E7F88E /* libRCTNetwork.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTNetwork.a; + remoteRef = 9FD21CE62242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21CF12242EFA400E7F88E /* libRCTText.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTText.a; + remoteRef = 9FD21CF02242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21CF92242EFA400E7F88E /* libRCTWebSocket.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTWebSocket.a; + remoteRef = 9FD21CF82242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21D122242EFA400E7F88E /* libReact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReact.a; + remoteRef = 9FD21D112242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21D142242EFA400E7F88E /* libyoga.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libyoga.a; + remoteRef = 9FD21D132242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21D162242EFA400E7F88E /* libcxxreact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libcxxreact.a; + remoteRef = 9FD21D152242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21D1A2242EFA400E7F88E /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 9FD21D192242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 9FD21D1C2242EFA400E7F88E /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 9FD21D1B2242EFA400E7F88E /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; D429028F1F1CE21600685AE7 /* libRCTLinking-macOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2467,7 +2548,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.macos.js"; + shellScript = "export NODE_BINARY=node\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.macos.js\n"; }; 68CD48B71D2BCB2C007E06A9 /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -2675,132 +2756,106 @@ 18CD93F621498A8C009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = React; - targetProxy = 18CD93F521498A8C009E2179 /* PBXContainerItemProxy */; }; 18CD943921498A92009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTBlob; - targetProxy = 18CD943821498A92009E2179 /* PBXContainerItemProxy */; }; 18CD943B21498A98009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = ART; - targetProxy = 18CD943A21498A98009E2179 /* PBXContainerItemProxy */; }; 18CD943D21498AA0009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTActionSheet; - targetProxy = 18CD943C21498AA0009E2179 /* PBXContainerItemProxy */; }; 18CD943F21498AA7009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTAnimation; - targetProxy = 18CD943E21498AA7009E2179 /* PBXContainerItemProxy */; }; 18CD944121498AAD009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTCameraRoll; - targetProxy = 18CD944021498AAD009E2179 /* PBXContainerItemProxy */; }; 18CD944321498AB2009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTGeolocation; - targetProxy = 18CD944221498AB2009E2179 /* PBXContainerItemProxy */; }; 18CD944521498AB8009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTNetwork; - targetProxy = 18CD944421498AB8009E2179 /* PBXContainerItemProxy */; }; 18CD944721498ABE009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTImage; - targetProxy = 18CD944621498ABE009E2179 /* PBXContainerItemProxy */; }; 18CD944921498AC5009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTLinking; - targetProxy = 18CD944821498AC5009E2179 /* PBXContainerItemProxy */; }; 18CD944B21498ACA009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTPushNotification; - targetProxy = 18CD944A21498ACA009E2179 /* PBXContainerItemProxy */; }; 18CD944D21498AD0009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTSettings; - targetProxy = 18CD944C21498AD0009E2179 /* PBXContainerItemProxy */; }; 18CD944F21498AD5009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTText; - targetProxy = 18CD944E21498AD5009E2179 /* PBXContainerItemProxy */; }; 18CD945121498ADA009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTVibration; - targetProxy = 18CD945021498ADA009E2179 /* PBXContainerItemProxy */; }; 18CD945321498ADF009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTWebSocket; - targetProxy = 18CD945221498ADF009E2179 /* PBXContainerItemProxy */; }; 18CD94572149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTBlob-tvOS"; - targetProxy = 18CD94562149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD94592149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "ART-tvOS"; - targetProxy = 18CD94582149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD945B2149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "React-tvOS"; - targetProxy = 18CD945A2149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD945D2149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTAnimation-tvOS"; - targetProxy = 18CD945C2149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD945F2149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTImage-tvOS"; - targetProxy = 18CD945E2149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD94612149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTLinking-tvOS"; - targetProxy = 18CD94602149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD94632149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTNetwork-tvOS"; - targetProxy = 18CD94622149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD94652149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTPushNotification-tvOS"; - targetProxy = 18CD94642149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD94672149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTSettings-tvOS"; - targetProxy = 18CD94662149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD946B2149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTText-tvOS"; - targetProxy = 18CD946A2149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD946D2149B19D009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "RCTWebSocket-tvOS"; - targetProxy = 18CD946C2149B19D009E2179 /* PBXContainerItemProxy */; }; 18CD946F2149B235009E2179 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -2880,77 +2935,62 @@ 18D8D9C321C06BE200E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = React; - targetProxy = 18D8D9C221C06BE200E0CCAC /* PBXContainerItemProxy */; }; 18D8D9C521C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTBlob; - targetProxy = 18D8D9C421C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9C721C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = ART; - targetProxy = 18D8D9C621C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9C921C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTActionSheet; - targetProxy = 18D8D9C821C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9CB21C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTAnimation; - targetProxy = 18D8D9CA21C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9CD21C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTCameraRoll; - targetProxy = 18D8D9CC21C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9CF21C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTGeolocation; - targetProxy = 18D8D9CE21C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9D121C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTImage; - targetProxy = 18D8D9D021C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9D321C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTLinking; - targetProxy = 18D8D9D221C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9D521C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTNetwork; - targetProxy = 18D8D9D421C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9D721C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTPushNotification; - targetProxy = 18D8D9D621C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9D921C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTSettings; - targetProxy = 18D8D9D821C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9DB21C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTText; - targetProxy = 18D8D9DA21C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9DD21C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTVibration; - targetProxy = 18D8D9DC21C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18D8D9DF21C06C0A00E0CCAC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = RCTWebSocket; - targetProxy = 18D8D9DE21C06C0A00E0CCAC /* PBXContainerItemProxy */; }; 18FC779D1EF4770B002B3F17 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -2965,7 +3005,7 @@ 2D4624C21DA2EA6900C74D09 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 2DD3238F1DA2DD8A000FE1B8 /* RNTester-tvOS */; - targetProxy = 2D4624C31DA2EA6900C74D09 /* PBXContainerItemProxy */; + targetProxy = 9FD21CD42242EE5B00E7F88E /* PBXContainerItemProxy */; }; 3D13F84C1D6F6B5F00E69E0E /* PBXTargetDependency */ = { isa = PBXTargetDependency; diff --git a/React/React.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj index cb3b5011eff78d..3cabdc012211b4 100644 --- a/React/React.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -304,23 +304,8 @@ 1854FF5B1EF485C60008DADC /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; }; 1854FF5C1EF485C60008DADC /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; }; 1854FF621EF487C00008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; - 1854FF641EF487CB0008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; - 1854FF661EF487D10008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; - 1854FF681EF487DE0008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; - 1854FF691EF487E20008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; - 1854FF6B1EF487E80008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; - 1854FF6D1EF487EE0008DADC /* (null) in Headers */ = {isa = PBXBuildFile; }; 18572B9F1EF32003007EAD54 /* RCTUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BF8B4B21EC550F500061E2F /* RCTUIKit.h */; }; - 18632BF71EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; - 18632BF81EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; - 18632BF91EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; - 18632BFA1EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; - 18632BFB1EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; - 18632BFC1EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; - 18632BFD1EF494C70010A3BB /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; 18632C021EF495D40010A3BB /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B857F421EC51FCF00A9D063 /* libcxxreact.a */; }; - 18632C031EF495D40010A3BB /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1882027C1EF48B7E00C9B354 /* libdouble-conversion.a */; }; - 18632C041EF495D40010A3BB /* libjschelpers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B857F4F1EC51FD400A9D063 /* libjschelpers.a */; }; 18632C051EF495D40010A3BB /* libthird-party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 188202A21EF48CF700C9B354 /* libthird-party.a */; }; 18632C061EF495D40010A3BB /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B857F341EC51FCC00A9D063 /* libyoga.a */; }; 18632C1A1EF49C9D0010A3BB /* CxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; }; @@ -620,16 +605,12 @@ 18B8F9CA214335C800CE911A /* RCTLayout.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 591F78D9202ADB22004A668C /* RCTLayout.h */; }; 18C2C6682141C86E004314E0 /* JSException.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6662141C86E004314E0 /* JSException.h */; }; 18C2C6692141C86E004314E0 /* JSException.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6662141C86E004314E0 /* JSException.h */; }; - 18C2C66B2141C8AC004314E0 /* JSException.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6662141C86E004314E0 /* JSException.h */; }; - 18C2C66E2141C8DD004314E0 /* JSException.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6662141C86E004314E0 /* JSException.h */; }; 18C2C6712141C955004314E0 /* RCTPlatformDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6702141C955004314E0 /* RCTPlatformDisplayLink.h */; }; 18C2C6722141C955004314E0 /* RCTPlatformDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6702141C955004314E0 /* RCTPlatformDisplayLink.h */; }; 18C2C6732141C955004314E0 /* RCTPlatformDisplayLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6702141C955004314E0 /* RCTPlatformDisplayLink.h */; }; 18C2C6742141C99B004314E0 /* RCTPlatformDisplayLink.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6702141C955004314E0 /* RCTPlatformDisplayLink.h */; }; 18C2C6752141C9A8004314E0 /* RCTPlatformDisplayLink.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6702141C955004314E0 /* RCTPlatformDisplayLink.h */; }; 18C2C6762141C9B4004314E0 /* RCTPlatformDisplayLink.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 18C2C6702141C955004314E0 /* RCTPlatformDisplayLink.h */; }; - 18C3A9AA1FE1CDCC00DEC48A /* (null) in Headers */ = {isa = PBXBuildFile; }; - 18C3A9AC1FE1CDCC00DEC48A /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; 18C3A9C21FE1D4AD00DEC48A /* RCTCxxBridgeDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 134D63C21F1FEC4B008872B5 /* RCTCxxBridgeDelegate.h */; }; 18C3A9C51FE1D7D200DEC48A /* RAMBundleRegistry.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6D380181F71D75B00621378 /* RAMBundleRegistry.h */; }; 18C3A9C61FE1D88400DEC48A /* RCTUIManagerUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 59500D411F71C63700B122B7 /* RCTUIManagerUtils.h */; }; @@ -706,12 +687,10 @@ 18F3B9EA2142F1E300AD247D /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; }; 18F3B9EB2142F1E600AD247D /* RCTReconnectingWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2B1EA8E3FA008DFB7A /* RCTReconnectingWebSocket.h */; }; 18F3B9EC2142F1E900AD247D /* RCTSRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D7BFD2C1EA8E3FA008DFB7A /* RCTSRWebSocket.h */; }; - 18F3BA0C2142F48D00AD247D /* RCTProgressViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */; }; 18F3BA0D2142F49600AD247D /* RCTProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 18008F9A2141A922007F325D /* RCTProgressView.m */; }; 18F3BA0F2142F4DB00AD247D /* RCTWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 18F3BA0E2142F4DB00AD247D /* RCTWebView.m */; }; 18F3BA162142F86400AD247D /* InspectorInterfaces.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EBF21BBA1FC498270052F4D5 /* InspectorInterfaces.h */; }; 18F3BA182142F86400AD247D /* InspectorInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EBF21BBB1FC498270052F4D5 /* InspectorInterfaces.cpp */; }; - 18F3BA232142F94400AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; 18F3BA242142F94800AD247D /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5343895E203905B6008E0CB3 /* YGLayout.cpp */; }; 18F3BA252142F94B00AD247D /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5352C5722038FF8D00A3B97E /* YGStyle.cpp */; }; 18F3BA262142F94F00AD247D /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53756E372004FFF700FBBD99 /* Utils.cpp */; }; @@ -737,11 +716,6 @@ 18F3BA3A2142F97000AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; 18F3BA3B2142F97000AD247D /* RAMBundleRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6D380191F71D75B00621378 /* RAMBundleRegistry.cpp */; }; 18F3BA3C2142F97000AD247D /* SampleCxxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D92B0D31E03699D0018521A /* SampleCxxModule.cpp */; }; - 18F3BA3E2142F97800AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; - 18F3BA3F2142F97800AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; - 18F3BA402142F97800AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; - 18F3BA412142F97800AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; - 18F3BA422142F97800AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; 18F3BA432142F98500AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; 18F3BA442142F98500AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; 18F3BA452142F98500AD247D /* (null) in Sources */ = {isa = PBXBuildFile; }; @@ -849,8 +823,6 @@ 2D3B5ECA1D9B095F00451313 /* RCTComponentData.m in Sources */ = {isa = PBXBuildFile; fileRef = 13AB90C01B6FA36700713B4F /* RCTComponentData.m */; }; 2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 13456E921ADAD2DE009F94A7 /* RCTConvert+CoreLocation.m */; }; 2D3B5ECF1D9B096F00451313 /* RCTFont.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3D37B5811D522B190042D5B5 /* RCTFont.mm */; }; - 2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 83A1FE8E1B62643A00BE0E65 /* RCTModalHostViewManager.m */; }; - 2D3B5EDD1D9B09A300451313 /* RCTProgressViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13513F3B1B1F43F400FCE529 /* RCTProgressViewManager.m */; }; 2D3B5EE01D9B09AD00451313 /* RCTRootShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BCE8081C99CB9D00DD7AAD /* RCTRootShadowView.m */; }; 2D3B5EE31D9B09B700451313 /* RCTSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6AF11AF1093D00FFC3E0 /* RCTSegmentedControl.m */; }; 2D3B5EE41D9B09BB00451313 /* RCTSegmentedControlManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6AF31AF1093D00FFC3E0 /* RCTSegmentedControlManager.m */; }; @@ -1663,6 +1635,30 @@ 9F0D8930224166060053729F /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F0D892F224166050053729F /* Unicode.cpp */; }; 9F0D8931224166060053729F /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F0D892F224166050053729F /* Unicode.cpp */; }; 9F0D8932224166060053729F /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F0D892F224166050053729F /* Unicode.cpp */; }; + 9FB7D34C224954A600F31D11 /* libjsinspector-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F2AC95E2239D788005C9C14 /* libjsinspector-macOS.a */; }; + 9FB7D34D224954B300F31D11 /* libjsi-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D78224303D900E7F88E /* libjsi-macOS.a */; }; + 9FB7D34E224954CC00F31D11 /* libjsiexecutor-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */; }; + 9FB7D34F224954EE00F31D11 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1882027C1EF48B7E00C9B354 /* libdouble-conversion.a */; }; + 9FB7D3EB224ABDA400F31D11 /* RCTDatePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 133CAE8D1B8E5CFD00F6AD92 /* RCTDatePicker.m */; }; + 9FD21D65224303D900E7F88E /* jsi.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E1214B3F6800DD5AC8 /* jsi.h */; }; + 9FD21D66224303D900E7F88E /* JSCRuntime.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */; }; + 9FD21D67224303D900E7F88E /* JSIDynamic.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */; }; + 9FD21D68224303D900E7F88E /* jsi-inl.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */; }; + 9FD21D69224303D900E7F88E /* instrumentation.h in Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */; }; + 9FD21D6B224303D900E7F88E /* instrumentation.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E0214B3F6800DD5AC8 /* instrumentation.h */; }; + 9FD21D6C224303D900E7F88E /* jsi-inl.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6D9214B3F6800DD5AC8 /* jsi-inl.h */; }; + 9FD21D6D224303D900E7F88E /* JSIDynamic.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DC214B3F6800DD5AC8 /* JSIDynamic.h */; }; + 9FD21D6E224303D900E7F88E /* JSCRuntime.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6DE214B3F6800DD5AC8 /* JSCRuntime.h */; }; + 9FD21D6F224303D900E7F88E /* jsi.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EDEBC6E1214B3F6800DD5AC8 /* jsi.h */; }; + 9FD21D71224303D900E7F88E /* JSCRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DD214B3F6800DD5AC8 /* JSCRuntime.cpp */; }; + 9FD21D72224303D900E7F88E /* jsi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DB214B3F6800DD5AC8 /* jsi.cpp */; }; + 9FD21D73224303D900E7F88E /* JSIDynamic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDEBC6DA214B3F6800DD5AC8 /* JSIDynamic.cpp */; }; + 9FD21D88224305AA00E7F88E /* JSINativeModules.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6189682155BBF70000C9A7 /* JSINativeModules.h */; }; + 9FD21D89224305AA00E7F88E /* JSIExecutor.h in Headers */ = {isa = PBXBuildFile; fileRef = ED6189672155BBF70000C9A7 /* JSIExecutor.h */; }; + 9FD21D8B224305AA00E7F88E /* JSIExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = ED6189672155BBF70000C9A7 /* JSIExecutor.h */; }; + 9FD21D8C224305AA00E7F88E /* JSINativeModules.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = ED6189682155BBF70000C9A7 /* JSINativeModules.h */; }; + 9FD21D8E224305AA00E7F88E /* JSINativeModules.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDDA711B2164285A00B2D070 /* JSINativeModules.cpp */; }; + 9FD21D8F224305AA00E7F88E /* JSIExecutor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDDA711C2164285A00B2D070 /* JSIExecutor.cpp */; }; A2440AA21DF8D854006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; }; A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; }; A2440AA41DF8D865006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; }; @@ -1756,9 +1752,7 @@ EDEBC7E0214C709200DD5AC8 /* libjsinspector.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBF21BDC1FC498900052F4D5 /* libjsinspector.a */; }; F1EFDA50201F661000EE6E4C /* RCTUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */; }; F20481842092E7D400942480 /* (null) in Headers */ = {isa = PBXBuildFile; }; - F20481862092E7E800942480 /* (null) in Headers */ = {isa = PBXBuildFile; }; F20481882092E7EA00942480 /* (null) in Headers */ = {isa = PBXBuildFile; }; - F204818F2093178D00942480 /* (null) in Copy Headers */ = {isa = PBXBuildFile; }; FEFAAC9E1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FEFAAC9C1FDB89B40057BBE0 /* RCTRedBoxExtraDataViewController.m */; }; FEFAAC9F1FDB89B50057BBE0 /* RCTRedBoxExtraDataViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = FEFAAC9D1FDB89B40057BBE0 /* RCTRedBoxExtraDataViewController.h */; }; /* End PBXBuildFile section */ @@ -1771,20 +1765,6 @@ remoteGlobalIDString = 139D7E871E25C6D100323FB7; remoteInfo = "double-conversion"; }; - 185EBE351EF4804C0061FD3E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 6B857F431EC51FD400A9D063; - remoteInfo = "jschelpers-macOS"; - }; - 18632BF51EF4940D0010A3BB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 188202A11EF48CF700C9B354; - remoteInfo = "third-party-macOS"; - }; 188202BE1EF48DBD00C9B354 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -1792,27 +1772,6 @@ remoteGlobalIDString = 1882027B1EF48B7E00C9B354; remoteInfo = "double-conversion-macOS"; }; - 18C3A9B31FE1D2C600DEC48A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 18C3A9A81FE1CDCC00DEC48A; - remoteInfo = "privatedata-macOS"; - }; - 18C3A9B51FE1D2E600DEC48A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 18C3A9A81FE1CDCC00DEC48A; - remoteInfo = "privatedata-macOS"; - }; - 18F3BA202142F8EA00AD247D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 18F3BA132142F86400AD247D; - remoteInfo = "jsinspector-macOS"; - }; 3D0574541DE5FF9600184BB4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -1869,6 +1828,62 @@ remoteGlobalIDString = 3D383D3D1EBD27B9005632C8; remoteInfo = "double-conversion-tvOS"; }; + 9FD21D792243043100E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 1882027B1EF48B7E00C9B354; + remoteInfo = "double-conversion-macOS"; + }; + 9FD21D7C2243058900E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9FD21D61224303D900E7F88E; + remoteInfo = "jsi-macOS"; + }; + 9FD21D7E2243059300E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 18F3BA132142F86400AD247D; + remoteInfo = "jsinspector-macOS"; + }; + 9FD21D95224305C100E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9FD21D80224305AA00E7F88E; + remoteInfo = "jsiexecutor-macOS"; + }; + 9FD21D972243061900E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 9FD21D61224303D900E7F88E; + remoteInfo = "jsi-macOS"; + }; + 9FD21D992243062200E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 188202A11EF48CF700C9B354; + remoteInfo = "third-party-macOS"; + }; + 9FD21D9B2243062900E7F88E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 6B857F351EC51FCF00A9D063; + remoteInfo = "cxxreact-macOS"; + }; + 9FF8D1E62243081A00B8CECA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 1882027B1EF48B7E00C9B354; + remoteInfo = "double-conversion-macOS"; + }; ED296F7D214C957300B7C4FE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -2041,25 +2056,6 @@ name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; }; - 1854FF5E1EF487570008DADC /* Copy Headers */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = include/jschelpers; - dstSubfolderSpec = 16; - files = ( - 18C2C66E2141C8DD004314E0 /* JSException.h in Copy Headers */, - F204818F2093178D00942480 /* (null) in Copy Headers */, - 18632BF71EF494C70010A3BB /* (null) in Copy Headers */, - 18632BF81EF494C70010A3BB /* (null) in Copy Headers */, - 18632BF91EF494C70010A3BB /* (null) in Copy Headers */, - 18632BFA1EF494C70010A3BB /* (null) in Copy Headers */, - 18632BFB1EF494C70010A3BB /* (null) in Copy Headers */, - 18632BFC1EF494C70010A3BB /* (null) in Copy Headers */, - 18632BFD1EF494C70010A3BB /* (null) in Copy Headers */, - ); - name = "Copy Headers"; - runOnlyForDeploymentPostprocessing = 0; - }; 18632BFF1EF495700010A3BB /* Copy Headers */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -2195,17 +2191,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 18C3A9AB1FE1CDCC00DEC48A /* Copy Headers */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = include/privatedata; - dstSubfolderSpec = 16; - files = ( - 18C3A9AC1FE1CDCC00DEC48A /* (null) in Copy Headers */, - ); - name = "Copy Headers"; - runOnlyForDeploymentPostprocessing = 0; - }; 18F3BA152142F86400AD247D /* Copy Headers */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -2602,6 +2587,33 @@ name = "Copy Headers"; runOnlyForDeploymentPostprocessing = 0; }; + 9FD21D6A224303D900E7F88E /* Copy Headers */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 12; + dstPath = include/jsi; + dstSubfolderSpec = 16; + files = ( + 9FD21D6B224303D900E7F88E /* instrumentation.h in Copy Headers */, + 9FD21D6C224303D900E7F88E /* jsi-inl.h in Copy Headers */, + 9FD21D6D224303D900E7F88E /* JSIDynamic.h in Copy Headers */, + 9FD21D6E224303D900E7F88E /* JSCRuntime.h in Copy Headers */, + 9FD21D6F224303D900E7F88E /* jsi.h in Copy Headers */, + ); + name = "Copy Headers"; + runOnlyForDeploymentPostprocessing = 0; + }; + 9FD21D8A224305AA00E7F88E /* Copy Headers */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 12; + dstPath = include/jsireact; + dstSubfolderSpec = 16; + files = ( + 9FD21D8B224305AA00E7F88E /* JSIExecutor.h in Copy Headers */, + 9FD21D8C224305AA00E7F88E /* JSINativeModules.h in Copy Headers */, + ); + name = "Copy Headers"; + runOnlyForDeploymentPostprocessing = 0; + }; EBF21BCB1FC498900052F4D5 /* Copy Headers */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -3057,7 +3069,6 @@ 6B7049C81EDF81E3005670F5 /* RCTPlatform.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTPlatform.m; sourceTree = ""; }; 6B857F341EC51FCC00A9D063 /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6B857F421EC51FCF00A9D063 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 6B857F4F1EC51FD400A9D063 /* libjschelpers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjschelpers.a; sourceTree = BUILT_PRODUCTS_DIR; }; 6BDE7A171ECA38AC00CC951F /* RCTUIKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTUIKit.m; sourceTree = ""; }; 6BF8B4B21EC550F500061E2F /* RCTUIKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUIKit.h; sourceTree = ""; }; 830213F31A654E0800B993E6 /* RCTBridgeModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTBridgeModule.h; sourceTree = ""; }; @@ -3102,7 +3113,8 @@ 9F0D892F224166050053729F /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unicode.cpp; path = folly/Unicode.cpp; sourceTree = ""; }; 9F2AC95D2239D788005C9C14 /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 9F2AC95E2239D788005C9C14 /* libjsinspector-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsinspector-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 9F2AC95F2239D788005C9C14 /* libprivatedata-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libprivatedata-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FD21D78224303D900E7F88E /* libjsi-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsi-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsiexecutor-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = ""; }; A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadCommand.m; sourceTree = ""; }; AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJavaScriptLoader.mm; sourceTree = ""; }; @@ -3162,11 +3174,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 9FB7D34C224954A600F31D11 /* libjsinspector-macOS.a in Frameworks */, 18632C021EF495D40010A3BB /* libcxxreact.a in Frameworks */, - 18632C031EF495D40010A3BB /* libdouble-conversion.a in Frameworks */, - 18632C041EF495D40010A3BB /* libjschelpers.a in Frameworks */, - 18632C051EF495D40010A3BB /* libthird-party.a in Frameworks */, + 9FB7D34D224954B300F31D11 /* libjsi-macOS.a in Frameworks */, + 9FB7D34E224954CC00F31D11 /* libjsiexecutor-macOS.a in Frameworks */, 18632C061EF495D40010A3BB /* libyoga.a in Frameworks */, + 9FB7D34F224954EE00F31D11 /* libdouble-conversion.a in Frameworks */, + 18632C051EF495D40010A3BB /* libthird-party.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3199,6 +3213,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9FD21D74224303D900E7F88E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9FD21D90224305AA00E7F88E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; ED296FCE214C9CB400B7C4FE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3806,7 +3834,8 @@ ED296FEE214C9CF800B7C4FE /* libjsiexecutor-tvOS.a */, 9F2AC95D2239D788005C9C14 /* libReact.a */, 9F2AC95E2239D788005C9C14 /* libjsinspector-macOS.a */, - 9F2AC95F2239D788005C9C14 /* libprivatedata-macOS.a */, + 9FD21D78224303D900E7F88E /* libjsi-macOS.a */, + 9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */, ); name = Products; sourceTree = ""; @@ -3920,7 +3949,6 @@ 18C2C6662141C86E004314E0 /* JSException.h */, 6B857F421EC51FCF00A9D063 /* libcxxreact.a */, 1882027C1EF48B7E00C9B354 /* libdouble-conversion.a */, - 6B857F4F1EC51FD400A9D063 /* libjschelpers.a */, 188202A21EF48CF700C9B354 /* libthird-party.a */, 6B857F341EC51FCC00A9D063 /* libyoga.a */, ); @@ -4282,21 +4310,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 1854FF5D1EF487540008DADC /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 1854FF661EF487D10008DADC /* (null) in Headers */, - 1854FF641EF487CB0008DADC /* (null) in Headers */, - 1854FF6D1EF487EE0008DADC /* (null) in Headers */, - 1854FF691EF487E20008DADC /* (null) in Headers */, - 1854FF6B1EF487E80008DADC /* (null) in Headers */, - 1854FF681EF487DE0008DADC /* (null) in Headers */, - 18C2C66B2141C8AC004314E0 /* JSException.h in Headers */, - F20481862092E7E800942480 /* (null) in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1882027A1EF48B7E00C9B354 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -4314,14 +4327,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 18C3A9A91FE1CDCC00DEC48A /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 18C3A9AA1FE1CDCC00DEC48A /* (null) in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 18F3BA142142F86400AD247D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -4779,6 +4784,27 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9FD21D64224303D900E7F88E /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 9FD21D65224303D900E7F88E /* jsi.h in Headers */, + 9FD21D66224303D900E7F88E /* JSCRuntime.h in Headers */, + 9FD21D67224303D900E7F88E /* JSIDynamic.h in Headers */, + 9FD21D68224303D900E7F88E /* jsi-inl.h in Headers */, + 9FD21D69224303D900E7F88E /* instrumentation.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9FD21D87224305AA00E7F88E /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 9FD21D88224305AA00E7F88E /* JSINativeModules.h in Headers */, + 9FD21D89224305AA00E7F88E /* JSIExecutor.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; EBF21BC41FC498900052F4D5 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -4923,23 +4949,6 @@ productReference = 188202A21EF48CF700C9B354 /* libthird-party.a */; productType = "com.apple.product-type.library.static"; }; - 18C3A9A81FE1CDCC00DEC48A /* privatedata-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 18C3A9AF1FE1CDCC00DEC48A /* Build configuration list for PBXNativeTarget "privatedata-macOS" */; - buildPhases = ( - 18C3A9A91FE1CDCC00DEC48A /* Headers */, - 18C3A9AB1FE1CDCC00DEC48A /* Copy Headers */, - 18F3BA1F2142F8B200AD247D /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "privatedata-macOS"; - productName = React; - productReference = 9F2AC95F2239D788005C9C14 /* libprivatedata-macOS.a */; - productType = "com.apple.product-type.library.static"; - }; 18F3BA132142F86400AD247D /* jsinspector-macOS */ = { isa = PBXNativeTarget; buildConfigurationList = 18F3BA192142F86400AD247D /* Build configuration list for PBXNativeTarget "jsinspector-macOS" */; @@ -5100,6 +5109,9 @@ buildRules = ( ); dependencies = ( + 9FD21D7D2243058900E7F88E /* PBXTargetDependency */, + 9FD21D7F2243059300E7F88E /* PBXTargetDependency */, + 9FD21D96224305C100E7F88E /* PBXTargetDependency */, 6B857F551EC5218B00A9D063 /* PBXTargetDependency */, 6B857F531EC5218600A9D063 /* PBXTargetDependency */, ); @@ -5136,34 +5148,13 @@ buildRules = ( ); dependencies = ( - 18F3BA212142F8EA00AD247D /* PBXTargetDependency */, - 18C3A9B61FE1D2E600DEC48A /* PBXTargetDependency */, - 185EBE361EF4804C0061FD3E /* PBXTargetDependency */, + 9FF8D1E72243081A00B8CECA /* PBXTargetDependency */, ); name = "cxxreact-macOS"; productName = React; productReference = 6B857F421EC51FCF00A9D063 /* libcxxreact.a */; productType = "com.apple.product-type.library.static"; }; - 6B857F431EC51FD400A9D063 /* jschelpers-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 6B857F4C1EC51FD400A9D063 /* Build configuration list for PBXNativeTarget "jschelpers-macOS" */; - buildPhases = ( - 1854FF5D1EF487540008DADC /* Headers */, - 1854FF5E1EF487570008DADC /* Copy Headers */, - 18F3BA122142F85600AD247D /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - 18C3A9B41FE1D2C600DEC48A /* PBXTargetDependency */, - 18632BF61EF4940D0010A3BB /* PBXTargetDependency */, - ); - name = "jschelpers-macOS"; - productName = React; - productReference = 6B857F4F1EC51FD400A9D063 /* libjschelpers.a */; - productType = "com.apple.product-type.library.static"; - }; 83CBBA2D1A601D0E00E9B192 /* React */ = { isa = PBXNativeTarget; buildConfigurationList = 83CBBA3F1A601D0F00E9B192 /* Build configuration list for PBXNativeTarget "React" */; @@ -5189,6 +5180,46 @@ productReference = 83CBBA2E1A601D0E00E9B192 /* libReact.a */; productType = "com.apple.product-type.library.static"; }; + 9FD21D61224303D900E7F88E /* jsi-macOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9FD21D75224303D900E7F88E /* Build configuration list for PBXNativeTarget "jsi-macOS" */; + buildPhases = ( + 9FD21D64224303D900E7F88E /* Headers */, + 9FD21D6A224303D900E7F88E /* Copy Headers */, + 9FD21D70224303D900E7F88E /* Sources */, + 9FD21D74224303D900E7F88E /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 9FD21D7A2243043100E7F88E /* PBXTargetDependency */, + ); + name = "jsi-macOS"; + productName = React; + productReference = 9FD21D78224303D900E7F88E /* libjsi-macOS.a */; + productType = "com.apple.product-type.library.static"; + }; + 9FD21D80224305AA00E7F88E /* jsiexecutor-macOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9FD21D91224305AA00E7F88E /* Build configuration list for PBXNativeTarget "jsiexecutor-macOS" */; + buildPhases = ( + 9FD21D87224305AA00E7F88E /* Headers */, + 9FD21D8A224305AA00E7F88E /* Copy Headers */, + 9FD21D8D224305AA00E7F88E /* Sources */, + 9FD21D90224305AA00E7F88E /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 9FD21D982243061900E7F88E /* PBXTargetDependency */, + 9FD21D9A2243062200E7F88E /* PBXTargetDependency */, + 9FD21D9C2243062900E7F88E /* PBXTargetDependency */, + ); + name = "jsiexecutor-macOS"; + productName = React; + productReference = 9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */; + productType = "com.apple.product-type.library.static"; + }; EBF21BBF1FC498900052F4D5 /* jsinspector */ = { isa = PBXNativeTarget; buildConfigurationList = EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */; @@ -5358,7 +5389,6 @@ 3D3CD9191DE5FBEC00167DC4 /* cxxreact */, 6B857F351EC51FCF00A9D063 /* cxxreact-macOS */, 3D3CD9261DE5FBEE00167DC4 /* cxxreact-tvOS */, - 6B857F431EC51FD400A9D063 /* jschelpers-macOS */, EBF21BBF1FC498900052F4D5 /* jsinspector */, 18F3BA132142F86400AD247D /* jsinspector-macOS */, EBF21BDD1FC4989A0052F4D5 /* jsinspector-tvOS */, @@ -5368,10 +5398,11 @@ 139D7E871E25C6D100323FB7 /* double-conversion */, 1882027B1EF48B7E00C9B354 /* double-conversion-macOS */, 3D383D3D1EBD27B9005632C8 /* double-conversion-tvOS */, - 18C3A9A81FE1CDCC00DEC48A /* privatedata-macOS */, EDEBC6BA214B3E7000DD5AC8 /* jsi */, - EDEBC724214B45A300DD5AC8 /* jsiexecutor */, ED296F98214C9A0900B7C4FE /* jsi-tvOS */, + 9FD21D61224303D900E7F88E /* jsi-macOS */, + EDEBC724214B45A300DD5AC8 /* jsiexecutor */, + 9FD21D80224305AA00E7F88E /* jsiexecutor-macOS */, ED296FD0214C9CF800B7C4FE /* jsiexecutor-tvOS */, ); }; @@ -5509,7 +5540,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd $SRCROOT/..\nexec ./scripts/ios-install-third-party.sh"; + shellScript = "cd $SRCROOT/..\nexec ./scripts/ios-install-third-party.sh\n"; }; 190EE32F1E6A43DE00A8543A /* Install Third Party */ = { isa = PBXShellScriptBuildPhase; @@ -5523,7 +5554,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh"; + shellScript = "cd \"$SRCROOT/..\"\nexec ./scripts/ios-install-third-party.sh\n"; }; 2D6948201DA3042200B3FA97 /* Include RCTJSCProfiler */ = { isa = PBXShellScriptBuildPhase; @@ -5670,7 +5701,6 @@ 2D3B5EE01D9B09AD00451313 /* RCTRootShadowView.m in Sources */, 2D3B5EBA1D9B092100451313 /* RCTI18nUtil.m in Sources */, 2D3B5EB41D9B090A00451313 /* RCTDevLoadingView.m in Sources */, - 18F3BA0C2142F48D00AD247D /* RCTProgressViewManager.m in Sources */, 2D3B5EEF1D9B09DC00451313 /* RCTViewManager.m in Sources */, 13134C971E296B2A00B9F3CB /* RCTObjcExecutor.mm in Sources */, 130E3D8B1E6A083900ACE484 /* RCTDevSettings.mm in Sources */, @@ -5686,6 +5716,7 @@ 59E604A31FE9CCE300BD90C5 /* RCTScrollContentViewManager.m in Sources */, 1384E20B1E806D5B00545659 /* RCTNativeModule.mm in Sources */, 2D3B5EC21D9B093B00451313 /* RCTProfile.m in Sources */, + 9FB7D3EB224ABDA400F31D11 /* RCTDatePicker.m in Sources */, 2D3B5ECB1D9B096200451313 /* RCTConvert+CoreLocation.m in Sources */, 2D3B5EEE1D9B09DA00451313 /* RCTView.m in Sources */, 2D3B5E981D9B089500451313 /* RCTConvert.m in Sources */, @@ -5724,9 +5755,7 @@ 2D3B5EBB1D9B092300451313 /* RCTI18nManager.m in Sources */, 2D3B5EBE1D9B092D00451313 /* RCTUIManager.m in Sources */, C60128AE1F3D1258009DF9FF /* RCTCxxConvert.m in Sources */, - 2D3B5EDD1D9B09A300451313 /* RCTProgressViewManager.m in Sources */, 2D3B5E9A1D9B089D00451313 /* RCTEventDispatcher.m in Sources */, - 2D3B5ED61D9B098400451313 /* RCTModalHostViewManager.m in Sources */, 2D3B5EC71D9B095600451313 /* RCTActivityIndicatorView.m in Sources */, 2D3B5EB21D9B090300451313 /* RCTAsyncLocalStorage.m in Sources */, ); @@ -5916,18 +5945,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 18F3BA122142F85600AD247D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 18F3BA402142F97800AD247D /* (null) in Sources */, - 18F3BA3F2142F97800AD247D /* (null) in Sources */, - 18F3BA3E2142F97800AD247D /* (null) in Sources */, - 18F3BA412142F97800AD247D /* (null) in Sources */, - 18F3BA422142F97800AD247D /* (null) in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 18F3BA172142F86400AD247D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -5977,14 +5994,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 18F3BA1F2142F8B200AD247D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 18F3BA232142F94400AD247D /* (null) in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3D383D241EBD27B6005632C8 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6247,6 +6256,25 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9FD21D70224303D900E7F88E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9FD21D71224303D900E7F88E /* JSCRuntime.cpp in Sources */, + 9FD21D72224303D900E7F88E /* jsi.cpp in Sources */, + 9FD21D73224303D900E7F88E /* JSIDynamic.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9FD21D8D224305AA00E7F88E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9FD21D8E224305AA00E7F88E /* JSINativeModules.cpp in Sources */, + 9FD21D8F224305AA00E7F88E /* JSIExecutor.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; EBF21BD31FC498900052F4D5 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -6309,36 +6337,11 @@ target = 139D7E871E25C6D100323FB7 /* double-conversion */; targetProxy = 1320081C1E283DCB00F0C457 /* PBXContainerItemProxy */; }; - 185EBE361EF4804C0061FD3E /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 6B857F431EC51FD400A9D063 /* jschelpers-macOS */; - targetProxy = 185EBE351EF4804C0061FD3E /* PBXContainerItemProxy */; - }; - 18632BF61EF4940D0010A3BB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 188202A11EF48CF700C9B354 /* third-party-macOS */; - targetProxy = 18632BF51EF4940D0010A3BB /* PBXContainerItemProxy */; - }; 188202BF1EF48DBD00C9B354 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1882027B1EF48B7E00C9B354 /* double-conversion-macOS */; targetProxy = 188202BE1EF48DBD00C9B354 /* PBXContainerItemProxy */; }; - 18C3A9B41FE1D2C600DEC48A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 18C3A9A81FE1CDCC00DEC48A /* privatedata-macOS */; - targetProxy = 18C3A9B31FE1D2C600DEC48A /* PBXContainerItemProxy */; - }; - 18C3A9B61FE1D2E600DEC48A /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 18C3A9A81FE1CDCC00DEC48A /* privatedata-macOS */; - targetProxy = 18C3A9B51FE1D2E600DEC48A /* PBXContainerItemProxy */; - }; - 18F3BA212142F8EA00AD247D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 18F3BA132142F86400AD247D /* jsinspector-macOS */; - targetProxy = 18F3BA202142F8EA00AD247D /* PBXContainerItemProxy */; - }; 3D0574551DE5FF9600184BB4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 3D3C059B1DE3340C00C268FA /* yoga-tvOS */; @@ -6374,6 +6377,46 @@ target = 6B857F241EC51FCC00A9D063 /* yoga-macOS */; targetProxy = 6B857F541EC5218B00A9D063 /* PBXContainerItemProxy */; }; + 9FD21D7A2243043100E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 1882027B1EF48B7E00C9B354 /* double-conversion-macOS */; + targetProxy = 9FD21D792243043100E7F88E /* PBXContainerItemProxy */; + }; + 9FD21D7D2243058900E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9FD21D61224303D900E7F88E /* jsi-macOS */; + targetProxy = 9FD21D7C2243058900E7F88E /* PBXContainerItemProxy */; + }; + 9FD21D7F2243059300E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 18F3BA132142F86400AD247D /* jsinspector-macOS */; + targetProxy = 9FD21D7E2243059300E7F88E /* PBXContainerItemProxy */; + }; + 9FD21D96224305C100E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9FD21D80224305AA00E7F88E /* jsiexecutor-macOS */; + targetProxy = 9FD21D95224305C100E7F88E /* PBXContainerItemProxy */; + }; + 9FD21D982243061900E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 9FD21D61224303D900E7F88E /* jsi-macOS */; + targetProxy = 9FD21D972243061900E7F88E /* PBXContainerItemProxy */; + }; + 9FD21D9A2243062200E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 188202A11EF48CF700C9B354 /* third-party-macOS */; + targetProxy = 9FD21D992243062200E7F88E /* PBXContainerItemProxy */; + }; + 9FD21D9C2243062900E7F88E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 6B857F351EC51FCF00A9D063 /* cxxreact-macOS */; + targetProxy = 9FD21D9B2243062900E7F88E /* PBXContainerItemProxy */; + }; + 9FF8D1E72243081A00B8CECA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 1882027B1EF48B7E00C9B354 /* double-conversion-macOS */; + targetProxy = 9FF8D1E62243081A00B8CECA /* PBXContainerItemProxy */; + }; ED296F7E214C957300B7C4FE /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = EDEBC6BA214B3E7000DD5AC8 /* jsi */; @@ -6590,6 +6633,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CODE_SIGN_IDENTITY = "-"; DEBUG_INFORMATION_FORMAT = dwarf; @@ -6612,6 +6656,7 @@ ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; @@ -6624,37 +6669,6 @@ }; name = Release; }; - 18C3A9B01FE1CDCC00DEC48A /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "c++14"; - CLANG_STATIC_ANALYZER_MODE = deep; - GCC_WARN_ABOUT_MISSING_NEWLINE = YES; - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_NAME = "$(TARGET_NAME)"; - PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/privatedata; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 18C3A9B11FE1CDCC00DEC48A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; - 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/privatedata; - RUN_CLANG_STATIC_ANALYZER = NO; - SDKROOT = macosx; - }; - name = Release; - }; 18F3BA1A2142F86400AD247D /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; @@ -7054,38 +7068,6 @@ }; name = Release; }; - 6B857F4D1EC51FD400A9D063 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; - 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 = jschelpers; - PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers; - RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 6B857F4E1EC51FD400A9D063 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; - 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 = jschelpers; - PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jschelpers; - RUN_CLANG_STATIC_ANALYZER = NO; - SDKROOT = macosx; - }; - name = Release; - }; 83CBBA201A601CBA00E9B192 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -7263,6 +7245,68 @@ }; name = Release; }; + 9FD21D76224303D900E7F88E /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_STATIC_ANALYZER_MODE = deep; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsi; + RUN_CLANG_STATIC_ANALYZER = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 9FD21D77224303D900E7F88E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; + 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/jsi; + RUN_CLANG_STATIC_ANALYZER = NO; + SDKROOT = macosx; + }; + name = Release; + }; + 9FD21D92224305AA00E7F88E /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; + buildSettings = { + CLANG_CXX_LANGUAGE_STANDARD = "c++14"; + CLANG_STATIC_ANALYZER_MODE = deep; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/jsireact; + RUN_CLANG_STATIC_ANALYZER = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 9FD21D93224305AA00E7F88E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; + 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/jsireact; + RUN_CLANG_STATIC_ANALYZER = NO; + SDKROOT = macosx; + }; + name = Release; + }; EBF21BDA1FC498900052F4D5 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 3D788F841EBD2D240063D616 /* third-party.xcconfig */; @@ -7555,15 +7599,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 18C3A9AF1FE1CDCC00DEC48A /* Build configuration list for PBXNativeTarget "privatedata-macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 18C3A9B01FE1CDCC00DEC48A /* Debug */, - 18C3A9B11FE1CDCC00DEC48A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 18F3BA192142F86400AD247D /* Build configuration list for PBXNativeTarget "jsinspector-macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -7663,15 +7698,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6B857F4C1EC51FD400A9D063 /* Build configuration list for PBXNativeTarget "jschelpers-macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 6B857F4D1EC51FD400A9D063 /* Debug */, - 6B857F4E1EC51FD400A9D063 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "React" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -7690,6 +7716,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 9FD21D75224303D900E7F88E /* Build configuration list for PBXNativeTarget "jsi-macOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9FD21D76224303D900E7F88E /* Debug */, + 9FD21D77224303D900E7F88E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9FD21D91224305AA00E7F88E /* Build configuration list for PBXNativeTarget "jsiexecutor-macOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9FD21D92224305AA00E7F88E /* Debug */, + 9FD21D93224305AA00E7F88E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; EBF21BD91FC498900052F4D5 /* Build configuration list for PBXNativeTarget "jsinspector" */ = { isa = XCConfigurationList; buildConfigurations = (