diff --git a/.ado/android-pr.yml b/.ado/android-pr.yml index d6865a58882be1..e6797796bf7449 100644 --- a/.ado/android-pr.yml +++ b/.ado/android-pr.yml @@ -32,19 +32,24 @@ jobs: - task: CmdLine@2 displayName: Remove RNTesterApp.android.bundle inputs: - script: rm -f RNTesterApp.android.bundle + script: rm -f ./packages/rn-tester/js/RNTesterApp.android.bundle - task: CmdLine@2 displayName: Create RNTester bundle inputs: - script: node cli.js bundle --entry-file ./packages/rn-tester/js/RNTesterApp.android.js --bundle-output RNTesterApp.android.bundle --platform android + script: node cli.js bundle --entry-file ./packages/rn-tester/js/RNTesterApp.android.js --bundle-output ./packages/rn-tester/js/RNTesterApp.android.bundle --platform android - task: CmdLine@2 displayName: gradlew installArchives inputs: script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew installArchives -Pparam="excludeLibs" - - template: templates\prep-android-nuget.yml + - task: CmdLine@2 + displayName: Build rn-tester + inputs: + script: REACT_NATIVE_BOOST_PATH=$(System.DefaultWorkingDirectory)/build_deps ./gradlew :packages:rn-tester:android:app:assemble + + - template: templates/prep-android-nuget.yml # Verify depenendencies can be enumerated and downloaded .. - task: CmdLine@2 diff --git a/.ado/templates/android-build-office.yml b/.ado/templates/android-build-office.yml index 93463ef1bfca2f..717cad86f8f20f 100644 --- a/.ado/templates/android-build-office.yml +++ b/.ado/templates/android-build-office.yml @@ -17,8 +17,9 @@ steps: # Install NuGet - task: CmdLine@2 + displayName: Install NuGet inputs: - script: mkdir $(System.DefaultWorkingDirectory)/nuget-bin/ && curl -o $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe + script: curl -o $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe --create-dirs https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - task: CmdLine@2 displayName: "Rename package to react-native" diff --git a/.ado/templates/apple-droid-node-patching.yml b/.ado/templates/apple-droid-node-patching.yml index e816d3b258b334..7b9fe23e749f46 100644 --- a/.ado/templates/apple-droid-node-patching.yml +++ b/.ado/templates/apple-droid-node-patching.yml @@ -5,4 +5,4 @@ steps: - task: CmdLine@2 displayName: Apply Android specific patches for Office consumption inputs: - script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }} + script: node $(System.DefaultWorkingDirectory)/android-patches/bundle/bundle.js patch $(System.DefaultWorkingDirectory) Build OfficeRNHost V8 Focus MAC ImageColor JniUtils RootViewAttach --patch-store $(System.DefaultWorkingDirectory)/android-patches/patches --log-folder $(System.DefaultWorkingDirectory)/android-patches/logs --confirm ${{ parameters.apply_office_patches }} diff --git a/Brewfile.lock.json b/Brewfile.lock.json index a25b11a29801a6..efb0af36395f18 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -2,79 +2,79 @@ "entries": { "brew": { "node@12": { - "version": "12.22.9", + "version": "12.22.10", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:bd8e7c10aff49ccc4a6bc4885ff1368863ced239dc795db73fb357707fae8bd1", - "sha256": "bd8e7c10aff49ccc4a6bc4885ff1368863ced239dc795db73fb357707fae8bd1" + "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:d855774f6d428e2e6d258eaf88fa60a941b6d2c9ecca3596d4156f35e7896dbe", + "sha256": "d855774f6d428e2e6d258eaf88fa60a941b6d2c9ecca3596d4156f35e7896dbe" }, "arm64_big_sur": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:fee8d40df865286e3e2d1d1f0b0e7f50042d49f9f1b7e53dd1f697bd33a4f50f", - "sha256": "fee8d40df865286e3e2d1d1f0b0e7f50042d49f9f1b7e53dd1f697bd33a4f50f" + "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:676b39ab4e74c531287956cc4e5478c7c4a22581584edb88d76b7623ab70f811", + "sha256": "676b39ab4e74c531287956cc4e5478c7c4a22581584edb88d76b7623ab70f811" }, "monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:e4353eda968bd35510b880d8a2aa1c2d1385bc1f00ef5e0d1c4d2b5bf6d1840a", - "sha256": "e4353eda968bd35510b880d8a2aa1c2d1385bc1f00ef5e0d1c4d2b5bf6d1840a" + "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:888cba85ca478f974dd0d8f6abd2de3e93f009fc40cb01584a609d0c4ea7b998", + "sha256": "888cba85ca478f974dd0d8f6abd2de3e93f009fc40cb01584a609d0c4ea7b998" }, "big_sur": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:5633a57b983e0c3993e0f653c0fdf589142e5cea3f55c40009989a4af527f3c1", - "sha256": "5633a57b983e0c3993e0f653c0fdf589142e5cea3f55c40009989a4af527f3c1" + "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:d6470997250871edc042834db307e7c302ebad0b1b9bbca771ecd5ec0e188314", + "sha256": "d6470997250871edc042834db307e7c302ebad0b1b9bbca771ecd5ec0e188314" }, "catalina": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:a992a4b5b262ec6935125ca18f21207f5948b709859ebd8d7367e802ea236a49", - "sha256": "a992a4b5b262ec6935125ca18f21207f5948b709859ebd8d7367e802ea236a49" + "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:dd9dae6bc8610ea18d8533c627dc335bb372688b04404d7a7316ecc9ce9037aa", + "sha256": "dd9dae6bc8610ea18d8533c627dc335bb372688b04404d7a7316ecc9ce9037aa" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:f00822df96f1337acdf4ce4d5aceddf1f4cadd940bdf9981ce79cb223ae7592d", - "sha256": "f00822df96f1337acdf4ce4d5aceddf1f4cadd940bdf9981ce79cb223ae7592d" + "url": "https://ghcr.io/v2/homebrew/core/node/12/blobs/sha256:4aafe9d8d830131e245b11fd5d969e9e4e17f37b57389ffa35599e9e8c00178c", + "sha256": "4aafe9d8d830131e245b11fd5d969e9e4e17f37b57389ffa35599e9e8c00178c" } } } }, "watchman": { - "version": "2022.01.17.00", + "version": "2022.02.14.00_1", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:59b1b04b08f3bed07f73c35bcdf40da70b2ecb31d31652144b19fc4547b9716a", - "sha256": "59b1b04b08f3bed07f73c35bcdf40da70b2ecb31d31652144b19fc4547b9716a" + "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:a17cb20e09f964505dbcc8ce690252bafdb699444c295bfd05ee2edc1a110db9", + "sha256": "a17cb20e09f964505dbcc8ce690252bafdb699444c295bfd05ee2edc1a110db9" }, "arm64_big_sur": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:b94520541990f7c26c611416d7e059bff421547d1f68efda96fd68538280dfa4", - "sha256": "b94520541990f7c26c611416d7e059bff421547d1f68efda96fd68538280dfa4" + "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:d687120b74f8097c9d9be56220464f2b48438aad3069d8f36755e1b4a12167aa", + "sha256": "d687120b74f8097c9d9be56220464f2b48438aad3069d8f36755e1b4a12167aa" }, "monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:3caca0db1ffe6ca2354976be03bb9c76f4512b5a5e1923d9610f8559fa6f86e1", - "sha256": "3caca0db1ffe6ca2354976be03bb9c76f4512b5a5e1923d9610f8559fa6f86e1" + "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:0e69c1317cc15cee2ab026bcaa1e07f0f0d578e0a4f2228ac83e18c5d7a810d0", + "sha256": "0e69c1317cc15cee2ab026bcaa1e07f0f0d578e0a4f2228ac83e18c5d7a810d0" }, "big_sur": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:146c5006c33b266101858632275e4996cccf99ba5c5a02c98b0a5cb4c72d0860", - "sha256": "146c5006c33b266101858632275e4996cccf99ba5c5a02c98b0a5cb4c72d0860" + "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:9b0437d417a213862cf0f268b512762002afbf01c2a8d3312f4f8a33fe610a83", + "sha256": "9b0437d417a213862cf0f268b512762002afbf01c2a8d3312f4f8a33fe610a83" }, "catalina": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:da7d2aea136a9c80606232cebd2f120c0336bba57601166cd71f5fdb7a07a369", - "sha256": "da7d2aea136a9c80606232cebd2f120c0336bba57601166cd71f5fdb7a07a369" + "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:b74bd7a2fc852fc8978940591bd0d13d93eece6be1d5f6746db529e07552913e", + "sha256": "b74bd7a2fc852fc8978940591bd0d13d93eece6be1d5f6746db529e07552913e" }, "x86_64_linux": { "cellar": "/home/linuxbrew/.linuxbrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:f2fd1a6cde41f21cf627dc92ca6762136195540c26dd3999b2f9278165f4ac37", - "sha256": "f2fd1a6cde41f21cf627dc92ca6762136195540c26dd3999b2f9278165f4ac37" + "url": "https://ghcr.io/v2/homebrew/core/watchman/blobs/sha256:d23dbea274bd72952221032f011e22ff8894d57efe6aa2be137c028395c4d1a6", + "sha256": "d23dbea274bd72952221032f011e22ff8894d57efe6aa2be137c028395c4d1a6" } } } @@ -84,9 +84,9 @@ "system": { "macos": { "catalina": { - "HOMEBREW_VERSION": "3.3.11", + "HOMEBREW_VERSION": "3.3.15", "HOMEBREW_PREFIX": "/usr/local", - "Homebrew/homebrew-core": "84eb4bfe413a805ceb7ed68e14dab083bdf3beb9", + "Homebrew/homebrew-core": "1614144f26fa67f511b8973fe85f2383e52457b5", "CLT": "12.4.0.0.1.1610135815", "Xcode": "12.4", "macOS": "10.15.7" diff --git a/Libraries/AddressSanitizerCrash/RCTAddressSanitizerCrash.js b/Libraries/AddressSanitizerCrash/RCTAddressSanitizerCrash.js new file mode 100644 index 00000000000000..11aa8d94111820 --- /dev/null +++ b/Libraries/AddressSanitizerCrash/RCTAddressSanitizerCrash.js @@ -0,0 +1,25 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @format + * @flow + */ + +'use strict'; +import type {HostComponent} from '../Renderer/shims/ReactNativeTypes'; +import type {ViewProps} from '../Components/View/ViewPropTypes'; + +const {requireNativeComponent} = require('react-native'); + +type NativeProps = $ReadOnly<{| + ...ViewProps, +|}>; + +const RCTAddressSanitizerCrash: HostComponent = requireNativeComponent( + 'RCTAddressSanitizerCrash', +); + +module.exports = RCTAddressSanitizerCrash; diff --git a/Libraries/Core/ReactNativeVersion.js b/Libraries/Core/ReactNativeVersion.js index 8728ceab624159..dba4342ba1673a 100644 --- a/Libraries/Core/ReactNativeVersion.js +++ b/Libraries/Core/ReactNativeVersion.js @@ -12,6 +12,6 @@ exports.version = { major: 0, minor: 66, - patch: 8, + patch: 17, prerelease: null, }; diff --git a/Libraries/Image/RCTImageView.mm b/Libraries/Image/RCTImageView.mm index 68818b3a427df3..ae44c0ac9daf88 100644 --- a/Libraries/Image/RCTImageView.mm +++ b/Libraries/Image/RCTImageView.mm @@ -649,18 +649,12 @@ - (RCTPlatformView *)reactAccessibilityElement - (NSColor *)tintColor { - NSColor *tintColor = nil; - if (@available(macOS 10.14, *)) { - tintColor = _imageView.contentTintColor; - } - return tintColor; + return _imageView.contentTintColor; } - (void)setTintColor:(NSColor *)tintColor { - if (@available(macOS 10.14, *)) { - _imageView.contentTintColor = tintColor; - } + _imageView.contentTintColor = tintColor; } #endif // ]TODO(macOS GH#774) diff --git a/Libraries/StyleSheet/PlatformColorValueTypes.macos.js b/Libraries/StyleSheet/PlatformColorValueTypes.macos.js index 876e668f0fcbc9..58e36cde7bbd47 100644 --- a/Libraries/StyleSheet/PlatformColorValueTypes.macos.js +++ b/Libraries/StyleSheet/PlatformColorValueTypes.macos.js @@ -18,6 +18,8 @@ export opaque type NativeColorValue = { dynamic?: { light: ?(ColorValue | ProcessedColorValue), dark: ?(ColorValue | ProcessedColorValue), + highContrastLight?: ?(ColorValue | ProcessedColorValue), + highContrastDark?: ?(ColorValue | ProcessedColorValue), }, colorWithSystemEffect?: { baseColor: ?(ColorValue | ProcessedColorValue), @@ -51,12 +53,21 @@ export const ColorWithSystemEffectMacOSPrivate = ( export type DynamicColorMacOSTuplePrivate = { light: ColorValue, dark: ColorValue, + highContrastLight?: ColorValue, + highContrastDark?: ColorValue, }; export const DynamicColorMacOSPrivate = ( tuple: DynamicColorMacOSTuplePrivate, ): ColorValue => { - return {dynamic: {light: tuple.light, dark: tuple.dark}}; + return { + dynamic: { + light: tuple.light, + dark: tuple.dark, + highContrastLight: tuple.highContrastLight, + highContrastDark: tuple.highContrastDark, + }, + }; }; export const normalizeColorObject = ( @@ -74,6 +85,8 @@ export const normalizeColorObject = ( dynamic: { light: normalizeColor(dynamic.light), dark: normalizeColor(dynamic.dark), + highContrastLight: normalizeColor(dynamic.highContrastLight), + highContrastDark: normalizeColor(dynamic.highContrastDark), }, }; return dynamicColor; @@ -104,6 +117,8 @@ export const processColorObject = ( dynamic: { light: processColor(dynamic.light), dark: processColor(dynamic.dark), + highContrastLight: processColor(dynamic.highContrastLight), + highContrastDark: processColor(dynamic.highContrastDark), }, }; return dynamicColor; diff --git a/Libraries/StyleSheet/PlatformColorValueTypesMacOS.js b/Libraries/StyleSheet/PlatformColorValueTypesMacOS.js index 8a2c2e8eab684f..53955c5200c91d 100644 --- a/Libraries/StyleSheet/PlatformColorValueTypesMacOS.js +++ b/Libraries/StyleSheet/PlatformColorValueTypesMacOS.js @@ -15,6 +15,8 @@ import type {ColorValue} from './StyleSheet'; export type DynamicColorMacOSTuple = { light: ColorValue, dark: ColorValue, + highContrastLight?: ColorValue, + highContrastDark?: ColorValue, }; export const DynamicColorMacOS = ( diff --git a/Libraries/StyleSheet/PlatformColorValueTypesMacOS.macos.js b/Libraries/StyleSheet/PlatformColorValueTypesMacOS.macos.js index 76d4cfd3782896..a3d5d99d59c45c 100644 --- a/Libraries/StyleSheet/PlatformColorValueTypesMacOS.macos.js +++ b/Libraries/StyleSheet/PlatformColorValueTypesMacOS.macos.js @@ -19,12 +19,19 @@ import { export type DynamicColorMacOSTuple = { light: ColorValue, dark: ColorValue, + highContrastLight?: ColorValue, + highContrastDark?: ColorValue, }; export const DynamicColorMacOS = ( tuple: DynamicColorMacOSTuple, ): ColorValue => { - return DynamicColorMacOSPrivate({light: tuple.light, dark: tuple.dark}); + return DynamicColorMacOSPrivate({ + light: tuple.light, + dark: tuple.dark, + highContrastLight: tuple.highContrastLight, + highContrastDark: tuple.highContrastDark, + }); }; export type SystemEffectMacOS = diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h index 2b9fce99056462..c0f69295848ba4 100644 --- a/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h +++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h @@ -36,6 +36,8 @@ NS_ASSUME_NONNULL_BEGIN - (BOOL)textInputShouldHandleDeleteBackward:(id)sender; // Return `YES` to have the deleteBackward event handled normally. Return `NO` to disallow it and handle it yourself. TODO(OSS Candidate ISS#2710739) #if TARGET_OS_OSX // [TODO(macOS GH#774) - (BOOL)textInputShouldHandleDeleteForward:(id)sender; // Return `YES` to have the deleteForward event handled normally. Return `NO` to disallow it and handle it yourself. + +- (void)textInputDidCancel; // Handle `Escape` key press. #endif // ]TODO(macOS GH#774) @optional diff --git a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m index 962aec932cfc93..7fd0e462b5310f 100644 --- a/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m +++ b/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m @@ -187,17 +187,17 @@ - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doCommandBySelector:(SEL)commandSelector { + id textInputDelegate = [_backedTextInputView textInputDelegate]; BOOL commandHandled = NO; // enter/return if (commandSelector == @selector(insertNewline:) || commandSelector == @selector(insertNewlineIgnoringFieldEditor:)) { [self textFieldDidEndEditingOnExit]; - if ([[_backedTextInputView textInputDelegate] textInputShouldReturn]) { + if ([textInputDelegate textInputShouldReturn]) { [[_backedTextInputView window] makeFirstResponder:nil]; } commandHandled = YES; //backspace } else if (commandSelector == @selector(deleteBackward:)) { - id textInputDelegate = [_backedTextInputView textInputDelegate]; if (textInputDelegate != nil && ![textInputDelegate textInputShouldHandleDeleteBackward:_backedTextInputView]) { commandHandled = YES; } else { @@ -214,7 +214,13 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doComman //paste } else if (commandSelector == @selector(paste:)) { _backedTextInputView.textWasPasted = YES; - } + //escape + } else if (commandSelector == @selector(cancelOperation:)) { + [textInputDelegate textInputDidCancel]; + [[_backedTextInputView window] makeFirstResponder:nil]; + commandHandled = YES; +} + return commandHandled; } @@ -411,6 +417,12 @@ - (BOOL)textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector //deleteForward } else if (commandSelector == @selector(deleteForward:)) { commandHandled = textInputDelegate != nil && ![textInputDelegate textInputShouldHandleDeleteForward:_backedTextInputView]; + //escape + } else if (commandSelector == @selector(cancelOperation:)) { + [textInputDelegate textInputDidCancel]; + [_backedTextInputView.window makeFirstResponder:nil]; + commandHandled = YES; + } return commandHandled; diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m index 1b0255dabd4cba..4e43e5591d0658 100644 --- a/Libraries/Text/TextInput/RCTBaseTextInputView.m +++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m @@ -569,6 +569,15 @@ - (BOOL)textInputShouldHandleDeleteBackward:(__unused id)sender { - (BOOL)textInputShouldHandleDeleteForward:(__unused id)sender { return YES; } + +- (void)textInputDidCancel { + [_eventDispatcher sendTextEventWithType:RCTTextEventTypeKeyPress + reactTag:self.reactTag + text:nil + key:@"Escape" + eventCount:_nativeEventCount]; + [self textInputDidEndEditing]; +} #endif // ]TODO(macOS GH#774) - (void)updateLocalData diff --git a/README.md b/README.md index 27945d13bbe998..849329aabd7b61 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ You can read more about the macOS implementation on our website - [React Native ## Requirements -You can run React Native for macOS apps on Mac devices with versions Mojave (10.14) or newer. +You can run React Native for macOS apps on Mac devices with versions Catalina (10.15) or newer. For a full and detailed list of the system requirements and how to set up your development platform, see our [System Requirements](https://microsoft.github.io/react-native-windows/docs/rnm-dependencies) documentation on our website. diff --git a/React/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h index 27ef4fc5fbf0d0..5ae7377812083c 100644 --- a/React/Base/RCTBridgeModule.h +++ b/React/Base/RCTBridgeModule.h @@ -441,7 +441,7 @@ typedef NSURL * (^RCTBridgelessBundleURLGetter)(void); andSetter:(RCTBridgelessBundleURLSetter)setter andDefaultGetter:(RCTBridgelessBundleURLGetter)defaultGetter; - (void)resetBundleURL; -@property NSURL *bundleURL; +@property (strong) NSURL *bundleURL; @end typedef RCTPlatformView * (^RCTBridgelessComponentViewProvider)(NSNumber *); // TODO(macOS GH#774) diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 55af6b684ccbb3..6a317543e6b118 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -16,10 +16,6 @@ #import "RCTParserUtils.h" #import "RCTUtils.h" -#if TARGET_OS_OSX // [TODO(macOS GH#774) -#import "RCTDynamicColor.h" -#endif // ]TODO(macOS GH#774) - @implementation RCTConvert RCT_CONVERTER(id, id, self) @@ -1043,7 +1039,28 @@ + (RCTUIColor *)UIColor:(id)json // TODO(macOS GH#750) RCTUIColor *highContrastDarkColor = [RCTConvert UIColor:highContrastDark]; // TODO(macOS GH#750) if (lightColor != nil && darkColor != nil) { #if TARGET_OS_OSX - RCTDynamicColor *color = [[RCTDynamicColor alloc] initWithAquaColor:lightColor darkAquaColor:darkColor]; + NSColor *color = [NSColor colorWithName:nil dynamicProvider:^NSColor * _Nonnull(NSAppearance * _Nonnull appearance) { + NSMutableArray *appearances = [NSMutableArray arrayWithArray:@[NSAppearanceNameAqua,NSAppearanceNameDarkAqua]]; + if (highContrastLightColor != nil) { + [appearances addObject:NSAppearanceNameAccessibilityHighContrastAqua]; + } + if (highContrastDarkColor != nil) { + [appearances addObject:NSAppearanceNameAccessibilityHighContrastDarkAqua]; + } + NSAppearanceName bestMatchingAppearance = [appearance bestMatchFromAppearancesWithNames:appearances]; + if (bestMatchingAppearance == NSAppearanceNameAqua) { + return lightColor; + } else if (bestMatchingAppearance == NSAppearanceNameDarkAqua) { + return darkColor; + } else if (bestMatchingAppearance == NSAppearanceNameAccessibilityHighContrastAqua) { + return highContrastLightColor; + } else if (bestMatchingAppearance == NSAppearanceNameAccessibilityHighContrastDarkAqua) { + return highContrastDarkColor; + } else { + RCTLogConvertError(json, @"an NSColorColor. Could not resolve current appearance. Defaulting to light."); + return lightColor; + } + }]; return color; #else #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 diff --git a/React/Base/RCTVersion.m b/React/Base/RCTVersion.m index 37a58cb9334764..cda6567971a3b0 100644 --- a/React/Base/RCTVersion.m +++ b/React/Base/RCTVersion.m @@ -23,7 +23,7 @@ __rnVersion = @{ RCTVersionMajor: @(0), RCTVersionMinor: @(66), - RCTVersionPatch: @(8), + RCTVersionPatch: @(17), RCTVersionPrerelease: [NSNull null], }; }); diff --git a/React/Base/macOS/RCTDynamicColor.h b/React/Base/macOS/RCTDynamicColor.h deleted file mode 100644 index 7919ca4f8bd1c0..00000000000000 --- a/React/Base/macOS/RCTDynamicColor.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -// TODO(macOS GH#774) - -#include - -/** A dynamic, theme aware subclass of NSColor. - * It is a tuple that contains two NSColors for light and dark - * theme appearances. Like a semantic NSColor or an - * asset catalog named NSColor, the effective color values - * returned by the various methods and properties vary - * depending on the current [NSAppearance currentAppearance]. - */ -@interface RCTDynamicColor : NSColor - -/** Inits a RCTDynamicColor with a pair of NSColors - * @param aquaColor the color to use when the current appearance is not dark - * @param darkAquaColor the color to use when the current appearance is dark - */ -- (instancetype)initWithAquaColor:(NSColor *)aquaColor - darkAquaColor:(nullable NSColor *)darkAquaColor; - -@end diff --git a/React/Base/macOS/RCTDynamicColor.m b/React/Base/macOS/RCTDynamicColor.m deleted file mode 100644 index 3315979c300701..00000000000000 --- a/React/Base/macOS/RCTDynamicColor.m +++ /dev/null @@ -1,219 +0,0 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -// TODO(macOS GH#774) - -#import "RCTDynamicColor.h" - -#define RCT_FORWARD_PROPERTY( PROP, TYPE ) \ -- (TYPE)PROP { return [[self effectiveColor] PROP]; } - -static NSString *const RCTAquaColor = @"aquaColor"; -static NSString *const RCTDarkAquaColor = @"darkAquaColor"; - -@implementation RCTDynamicColor -{ - NSColor *_aquaColor; - NSColor *_darkAquaColor; -} - -- (instancetype)initWithAquaColor:(NSColor *)aquaColor - darkAquaColor:(NSColor *)darkAquaColor -{ - self = [super init]; - if (self) { - _aquaColor = [aquaColor copy]; - _darkAquaColor = [darkAquaColor copy]; - } - return self; -} - -+ (BOOL)supportsSecureCoding -{ - return YES; -} - -- (instancetype)initWithCoder:(NSCoder *)coder -{ - self = [super initWithCoder:coder]; - if (self) { - _aquaColor = [coder decodeObjectOfClass:[NSColor class] forKey:RCTAquaColor]; - _darkAquaColor = [coder decodeObjectOfClass:[NSColor class] forKey:RCTDarkAquaColor]; - } - return self; -} - -- (void)encodeWithCoder:(NSCoder *)aCoder -{ - [super encodeWithCoder:aCoder]; - [aCoder encodeObject:_aquaColor forKey:RCTAquaColor]; - if (_darkAquaColor) { - [aCoder encodeObject:_darkAquaColor forKey:RCTDarkAquaColor]; - } -} - -- (NSColor *)effectiveColor -{ - NSColor *effectiveColor = _aquaColor; - if (@available(macOS 10.14, *)) { - NSAppearance *appearance = [NSAppearance currentAppearance] ?: [NSApp effectiveAppearance]; - - NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; - - if (_darkAquaColor != nil && [appearanceName isEqualToString:NSAppearanceNameDarkAqua]) { - effectiveColor = _darkAquaColor; - } - } - return effectiveColor; -} - -RCT_FORWARD_PROPERTY(colorSpace, NSColorSpace *) -- (NSColor *)colorUsingColorSpace:(NSColorSpace *)space -{ - return [[self effectiveColor] colorUsingColorSpace:space]; -} - -RCT_FORWARD_PROPERTY(colorSpaceName, NSColorSpaceName) -- (NSColor *)colorUsingColorSpaceName:(NSColorSpaceName)name -{ - return [[self effectiveColor] colorUsingColorSpaceName:name]; -} - -RCT_FORWARD_PROPERTY(numberOfComponents, NSInteger) -- (void)getComponents:(CGFloat *)components -{ - return [[self effectiveColor] getComponents:components]; -} - -#pragma mark - RGB colorspace - -RCT_FORWARD_PROPERTY(redComponent, CGFloat) -RCT_FORWARD_PROPERTY(greenComponent, CGFloat) -RCT_FORWARD_PROPERTY(blueComponent, CGFloat) - -- (void)getRed:(nullable CGFloat *)red green:(nullable CGFloat *)green blue:(nullable CGFloat *)blue alpha:(nullable CGFloat *)alpha -{ - return [[self effectiveColor] getRed:red green:green blue:blue alpha:alpha]; -} - -#pragma mark - HSB colorspace - -RCT_FORWARD_PROPERTY(hueComponent, CGFloat) -RCT_FORWARD_PROPERTY(saturationComponent, CGFloat) -RCT_FORWARD_PROPERTY(brightnessComponent, CGFloat) - -- (void)getHue:(nullable CGFloat *)hue saturation:(nullable CGFloat *)saturation brightness:(nullable CGFloat *)brightness alpha:(nullable CGFloat *)alpha -{ - return [[self effectiveColor] getHue:hue saturation:saturation brightness:brightness alpha:alpha]; -} - -#pragma mark - Gray colorspace - -RCT_FORWARD_PROPERTY(whiteComponent, CGFloat) - -- (void)getWhite:(CGFloat *)white alpha:(CGFloat *)alpha -{ - return [[self effectiveColor] getWhite:white alpha:alpha]; -} - -#pragma mark - CMYK colorspace - -RCT_FORWARD_PROPERTY(cyanComponent, CGFloat) -RCT_FORWARD_PROPERTY(magentaComponent, CGFloat) -RCT_FORWARD_PROPERTY(yellowComponent, CGFloat) -RCT_FORWARD_PROPERTY(blackComponent, CGFloat) - -- (void)getCyan:(nullable CGFloat *)cyan magenta:(nullable CGFloat *)magenta yellow:(nullable CGFloat *)yellow black:(nullable CGFloat *)black alpha:(nullable CGFloat *)alpha -{ - return [[self effectiveColor] getCyan:cyan magenta:magenta yellow:yellow black:black alpha:alpha]; -} - -#pragma mark - Others - -RCT_FORWARD_PROPERTY(alphaComponent, CGFloat) -RCT_FORWARD_PROPERTY(CGColor, CGColorRef) -RCT_FORWARD_PROPERTY(catalogNameComponent, NSColorListName) -RCT_FORWARD_PROPERTY(colorNameComponent, NSColorName) -RCT_FORWARD_PROPERTY(localizedCatalogNameComponent, NSColorListName) -RCT_FORWARD_PROPERTY(localizedColorNameComponent, NSString *) - -- (void)setStroke -{ - [[self effectiveColor] setStroke]; -} - -- (void)setFill -{ - [[self effectiveColor] setFill]; -} - -- (void)set -{ - [[self effectiveColor] set]; -} - -- (nullable NSColor *)highlightWithLevel:(CGFloat)val -{ - return [[self effectiveColor] highlightWithLevel:val]; -} - -- (NSColor *)shadowWithLevel:(CGFloat)val -{ - return [[self effectiveColor] shadowWithLevel:val]; -} - -- (NSColor *)colorWithAlphaComponent:(CGFloat)alpha -{ - return [[self effectiveColor] colorWithAlphaComponent:alpha]; -} - -- (nullable NSColor *)blendedColorWithFraction:(CGFloat)fraction ofColor:(NSColor *)color -{ - return [[self effectiveColor] blendedColorWithFraction:fraction ofColor:color]; -} - -- (NSColor *)colorWithSystemEffect:(NSColorSystemEffect)systemEffect NS_AVAILABLE_MAC(10_14) -{ - NSColor *aquaColorWithSystemEffect = [_aquaColor colorWithSystemEffect:systemEffect]; - NSColor *darkAquaColorWithSystemEffect = [_darkAquaColor colorWithSystemEffect:systemEffect]; - return [[RCTDynamicColor alloc] initWithAquaColor:aquaColorWithSystemEffect darkAquaColor:darkAquaColorWithSystemEffect]; -} - -- (NSUInteger)hash -{ - const NSUInteger prime = 31; - NSUInteger result = 1; - result = prime * result + [_aquaColor hash]; - result = prime * result + [_darkAquaColor hash]; - return result; -} - -- (BOOL)isEqual:(id)other { - if (other == self) { - return YES; - } - - return other != nil && [other isKindOfClass:[self class]] && [self isEqualToDynamicColor:other]; -} - -- (BOOL)isEqualToDynamicColor:(RCTDynamicColor *)other { - if (self == other) { - return YES; - } - - if ([_aquaColor isNotEqualTo:other->_aquaColor]) { - return NO; - } - - if ([_darkAquaColor isNotEqualTo:other->_darkAquaColor]) { - return NO; - } - - return YES; -} - -@end diff --git a/React/CoreModules/RCTAddressSanitizerCrashManager.h b/React/CoreModules/RCTAddressSanitizerCrashManager.h new file mode 100644 index 00000000000000..78209940638dfc --- /dev/null +++ b/React/CoreModules/RCTAddressSanitizerCrashManager.h @@ -0,0 +1,12 @@ +/* + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#import +#import + +@interface RCTAddressSanitizerCrashManager : NSObject + +@end diff --git a/React/CoreModules/RCTAddressSanitizerCrashManager.mm b/React/CoreModules/RCTAddressSanitizerCrashManager.mm new file mode 100644 index 00000000000000..d4adaa414f2fa7 --- /dev/null +++ b/React/CoreModules/RCTAddressSanitizerCrashManager.mm @@ -0,0 +1,18 @@ +// +// RCTAddressSanitizerCrashManager.mm +// Pods +// + +#import "RCTAddressSanitizerCrashManager.h" + +@implementation RCTAddressSanitizerCrashManager + +RCT_EXPORT_MODULE(ASANCrash) + +RCT_EXPORT_METHOD(invokeMemoryCrash) { + char *s = (char*)malloc(100); + free(s); + strcpy(s, "Hello world!"); // AddressSanitizer: heap-use-after-free +} + +@end diff --git a/React/CoreModules/RCTAlertController.m b/React/CoreModules/RCTAlertController.m index daf32a394dd272..9903922edc4b9b 100644 --- a/React/CoreModules/RCTAlertController.m +++ b/React/CoreModules/RCTAlertController.m @@ -32,12 +32,16 @@ - (UIWindow *)alertWindow - (void)show:(BOOL)animated completion:(void (^)(void))completion { - [self.alertWindow makeKeyAndVisible]; - // [TODO(macOS GH#774) + // Call self.alertWindow to ensure that it gets populated + UIWindow *alertWindow = self.alertWindow; + // If the window is tracked by our application then it will show the alert - if ([[[UIApplication sharedApplication] windows] containsObject:self.alertWindow]) { - [self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion]; + if ([[[UIApplication sharedApplication] windows] containsObject:alertWindow]) { + // On iOS 14, makeKeyAndVisible should only be called if alertWindow is tracked by the application. + // Later versions of iOS appear to already do this check for us behind the scenes. + [alertWindow makeKeyAndVisible]; + [alertWindow.rootViewController presentViewController:self animated:animated completion:completion]; } else { // When using Scenes, we must present the alert from a view controller associated with a window in the Scene. A fresh window (i.e. _alertWindow) cannot show the alert. [RCTPresentedViewController() presentViewController:self animated:animated completion:completion]; diff --git a/React/CoreModules/RCTAppearance.mm b/React/CoreModules/RCTAppearance.mm index b0da18b72db345..7d81fae4dc1362 100644 --- a/React/CoreModules/RCTAppearance.mm +++ b/React/CoreModules/RCTAppearance.mm @@ -66,29 +66,28 @@ void RCTOverrideAppearancePreference(NSString *const colorSchemeOverride) #else // [TODO(macOS GH#774) NSString *RCTColorSchemePreference(NSAppearance *appearance) { - if (@available(macOS 10.14, *)) { - static NSDictionary *appearances; - static dispatch_once_t onceToken; - - dispatch_once(&onceToken, ^{ - appearances = @{ - NSAppearanceNameAqua: RCTAppearanceColorSchemeLight, - NSAppearanceNameDarkAqua: RCTAppearanceColorSchemeDark - }; - }); - - if (!sAppearancePreferenceEnabled) { - // Return the default if the app doesn't allow different color schemes. - return RCTAppearanceColorSchemeLight; - } - - appearance = appearance ?: [NSAppearance currentAppearance]; - NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; - return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight; + static NSDictionary *appearances; + static dispatch_once_t onceToken; + + dispatch_once(&onceToken, ^{ + appearances = @{ + NSAppearanceNameAqua: RCTAppearanceColorSchemeLight, + NSAppearanceNameDarkAqua: RCTAppearanceColorSchemeDark + }; + }); + + if (!sAppearancePreferenceEnabled) { + // Return the default if the app doesn't allow different color schemes. + return RCTAppearanceColorSchemeLight; } - // Default to light on older OS version - same behavior as Android. - return RCTAppearanceColorSchemeLight; + if (@available(macOS 11.0, *)) { + appearance = appearance ?: [NSAppearance currentDrawingAppearance]; + } else { + appearance = appearance ?: [NSAppearance currentAppearance]; + } + NSAppearanceName appearanceName = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; + return appearances[appearanceName] ?: RCTAppearanceColorSchemeLight; } #endif // ]TODO(macOS GH#774) @@ -165,7 +164,7 @@ - (void)appearanceChanged:(NSNotification *)notification - (void)startObserving { - if (@available(macOS 10.14, iOS 13.0, *)) { // TODO(macOS GH#774) + if (@available(iOS 13.0, *)) { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appearanceChanged:) name:RCTUserInterfaceStyleDidChangeNotification @@ -175,7 +174,7 @@ - (void)startObserving - (void)stopObserving { - if (@available(macOS 10.14, iOS 13.0, *)) { // TODO(macOS GH#774) + if (@available(iOS 13.0, *)) { [[NSNotificationCenter defaultCenter] removeObserver:self]; } } diff --git a/React/CoreModules/RCTDevLoadingView.mm b/React/CoreModules/RCTDevLoadingView.mm index 427620e7802d37..919d66f93e8955 100644 --- a/React/CoreModules/RCTDevLoadingView.mm +++ b/React/CoreModules/RCTDevLoadingView.mm @@ -266,16 +266,21 @@ - (void)showProgressMessage:(NSString *)message - (void)showOfflineMessage { - RCTUIColor *color = [RCTUIColor whiteColor]; // TODO(macOS GH#774) - RCTUIColor *backgroundColor = [RCTUIColor blackColor]; // TODO(macOS GH#774) - - if ([self isDarkModeEnabled]) { - color = [RCTUIColor blackColor]; // TODO(macOS GH#774) - backgroundColor = [RCTUIColor whiteColor]; // TODO(macOS GH#774) - } + // [TODO(macOS GH#774) - isDarkModeEnabled should only be run on the main thread + __weak __typeof(self) weakSelf = self; + RCTExecuteOnMainQueue(^{ + RCTUIColor *color = [RCTUIColor whiteColor]; // TODO(macOS GH#774) + RCTUIColor *backgroundColor = [RCTUIColor blackColor]; // TODO(macOS GH#774) + + if ([weakSelf isDarkModeEnabled]) { + color = [RCTUIColor blackColor]; // TODO(macOS GH#774) + backgroundColor = [RCTUIColor whiteColor]; // TODO(macOS GH#774) + } - NSString *message = [NSString stringWithFormat:@"Connect to %@ to develop JavaScript.", RCT_PACKAGER_NAME]; - [self showMessage:message color:color backgroundColor:backgroundColor]; + NSString *message = [NSString stringWithFormat:@"Connect to %@ to develop JavaScript.", RCT_PACKAGER_NAME]; + [weakSelf showMessage:message color:color backgroundColor:backgroundColor]; + }); + // ]TODO(macOS GH#774) } - (BOOL)isDarkModeEnabled @@ -361,4 +366,4 @@ - (void)hide Class RCTDevLoadingViewCls(void) { return RCTDevLoadingView.class; -} +} \ No newline at end of file diff --git a/React/CoreModules/RCTDevSettings.h b/React/CoreModules/RCTDevSettings.h index 80a8fc7ff3ac3b..660b7676402aaa 100644 --- a/React/CoreModules/RCTDevSettings.h +++ b/React/CoreModules/RCTDevSettings.h @@ -48,16 +48,6 @@ @end -@protocol RCTDevSettingsInspectable - -/** - * Whether current jsi::Runtime is inspectable. - * Only set when using as a bridgeless turbo module. - */ -@property (nonatomic, assign, readwrite) BOOL isInspectable; - -@end - @interface RCTDevSettings : RCTEventEmitter - (instancetype)initWithDataSource:(id)dataSource; diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h index bd58377eceaaaf..81d52a844a74ea 100644 --- a/React/Modules/RCTEventEmitter.h +++ b/React/Modules/RCTEventEmitter.h @@ -14,8 +14,8 @@ @interface RCTEventEmitter : NSObject @property (nonatomic, weak) RCTBridge * _Nullable bridge; // TODO(macOS GH#774) -@property (nonatomic, weak) RCTModuleRegistry *moduleRegistry; -@property (nonatomic, weak) RCTViewRegistry *viewRegistry_DEPRECATED; +@property (nonatomic, weak) RCTModuleRegistry * _Nullable moduleRegistry; // TODO(macOS GH#774) +@property (nonatomic, weak) RCTViewRegistry * _Nullable viewRegistry_DEPRECATED; // TODO(macOS GH#774) - (instancetype _Nullable)initWithDisabledObservation; // TODO(macOS GH#774) diff --git a/React/Views/RCTSwitch.h b/React/Views/RCTSwitch.h index b2fea24c9ea6f7..9dbb28709ca228 100644 --- a/React/Views/RCTSwitch.h +++ b/React/Views/RCTSwitch.h @@ -12,7 +12,7 @@ #if !TARGET_OS_OSX // TODO(macOS GH#774) @interface RCTSwitch : UISwitch #else // [TODO(macOS GH#774) -@interface RCTSwitch : NSButton +@interface RCTSwitch : NSSwitch #endif // ]TODO(macOS GH#774) #if !TARGET_OS_OSX // TODO(macOS GH#774) diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m index 056f8066090bcc..78b846bbdf97bf 100644 --- a/React/Views/RCTSwitch.m +++ b/React/Views/RCTSwitch.m @@ -7,25 +7,10 @@ #import "RCTSwitch.h" -#if TARGET_OS_OSX // [TODO(macOS GH#774) -#import -#endif // ]TODO(macOS GH#774) - #import "UIView+React.h" @implementation RCTSwitch -#if TARGET_OS_OSX // [TODO(macOS GH#774) -- (instancetype)initWithFrame:(CGRect)frame -{ - if ((self = [super initWithFrame:frame])) { - self.buttonType = NSButtonTypeSwitch; - self.title = @""; // default is "Button" - } - return self; -} -#endif - #if !TARGET_OS_OSX // TODO(macOS GH#774) - (void)setOn:(BOOL)on animated:(BOOL)animated { diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties index 6b21233fcb9686..b2827139eb4123 100644 --- a/ReactAndroid/gradle.properties +++ b/ReactAndroid/gradle.properties @@ -1,4 +1,4 @@ -VERSION_NAME=0.66.8 +VERSION_NAME=0.66.17 GROUP=com.facebook.react POM_NAME=ReactNative diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java index 3bb5d028a5a686..4c5bf5cd16b20b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java @@ -17,6 +17,6 @@ public class ReactNativeVersion { public static final Map VERSION = MapBuilder.of( "major", 0, "minor", 66, - "patch", 8, + "patch", 17, "prerelease", null); } diff --git a/ReactCommon/cxxreact/ReactNativeVersion.h b/ReactCommon/cxxreact/ReactNativeVersion.h index 90e35059887349..b99b634114c1b5 100644 --- a/ReactCommon/cxxreact/ReactNativeVersion.h +++ b/ReactCommon/cxxreact/ReactNativeVersion.h @@ -17,7 +17,7 @@ namespace facebook::react { constexpr struct { int32_t Major = 0; int32_t Minor = 66; - int32_t Patch = 8; + int32_t Patch = 17; std::string_view Prerelease = ""; } ReactNativeVersion; diff --git a/android-patches/patches/Build/ReactAndroid/Android-prebuilt.mk b/android-patches/patches/Build/ReactAndroid/Android-prebuilt.mk new file mode 100644 index 00000000000000..8fce977bb69683 --- /dev/null +++ b/android-patches/patches/Build/ReactAndroid/Android-prebuilt.mk @@ -0,0 +1,13 @@ +diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk +index 18f8c26620..1e5afe5751 100644 +--- a/ReactAndroid/Android-prebuilt.mk ++++ b/ReactAndroid/Android-prebuilt.mk +@@ -34,7 +34,7 @@ include $(CLEAR_VARS) + LOCAL_MODULE := folly_json + LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_json.so + LOCAL_EXPORT_C_INCLUDES := \ +- $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \ ++ $(THIRD_PARTY_NDK_DIR)/boost/boost_1_68_0 \ + $(THIRD_PARTY_NDK_DIR)/double-conversion \ + $(THIRD_PARTY_NDK_DIR)/folly + # Note: Sync with folly/Android.mk. diff --git a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec index a2fecb1fda31ed..d71e4e9d08f694 100644 --- a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec +++ b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec @@ -1,6 +1,6 @@ ---- /dev/null 2022-01-12 17:14:59.000000000 -0800 -+++ /var/folders/vs/8_b205053dddbcv7btj0w0v80000gn/T/update-1h8V3n/merge/Build/ReactAndroid/ReactAndroid.nuspec 2022-01-12 15:04:31.000000000 -0800 -@@ -0,0 +1,242 @@ +--- /dev/ReactAndroid/ReactAndroid.nuspec 1969-12-31 16:00:00.000000000 -0800 ++++ /dev/ReactAndroid/ReactAndroid.nuspec 2022-02-13 23:24:19.927074747 -0800 +@@ -0,0 +1,262 @@ + + + @@ -120,6 +120,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + @@ -225,7 +235,17 @@ + + + -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk b/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk new file mode 100644 index 00000000000000..7f446da8e5e951 --- /dev/null +++ b/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk @@ -0,0 +1,11 @@ +--- /dev/code/rnm-66-fresh/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk 2022-02-13 19:54:48.571686475 -0800 ++++ /dev/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Android.mk 2022-02-13 19:52:50.350473816 -0800 +@@ -11,7 +11,7 @@ + + LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) + +-LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativeutilsjni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry ++LOCAL_SHARED_LIBRARIES := libjsi libreactconfig librrc_slider librrc_progressbar librrc_switch librrc_modal libyoga libglog libfb libfbjni libglog_init libfolly_json libfolly_futures libreact_render_mounting libreactnativejni libreact_utils libreact_render_debug libreact_render_graphics libreact_render_core react_render_componentregistry librrc_view librrc_unimplementedview librrc_root librrc_scrollview libbetter libreact_render_attributedstring libreact_render_uimanager libreact_render_templateprocessor libreact_render_scheduler libreact_render_animations libreact_render_imagemanager libreact_render_textlayoutmanager libreact_codegen_rncore rrc_text librrc_image librrc_textinput libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry + + LOCAL_STATIC_LIBRARIES := + diff --git a/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk new file mode 100644 index 00000000000000..3aad7256c4c204 --- /dev/null +++ b/android-patches/patches/JniUtils/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk @@ -0,0 +1,11 @@ +--- /dev/code/rnm-66-fresh/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk 2022-02-13 19:54:48.579686559 -0800 ++++ /dev/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk 2022-02-13 19:53:04.134612248 -0800 +@@ -19,7 +19,7 @@ + + LOCAL_CFLAGS += -fexceptions -frtti -std=c++17 -Wall + +-LOCAL_SHARED_LIBRARIES = libfb libfbjni libreactnativeutilsjni ++LOCAL_SHARED_LIBRARIES = libfb libfbjni libreactnativejni + + LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni libruntimeexecutor + diff --git a/android-patches/patches/JniUtils/ReactAndroid/src/main/jni/react/jni/Android.mk b/android-patches/patches/JniUtils/ReactAndroid/src/main/jni/react/jni/Android.mk new file mode 100644 index 00000000000000..beee08c45ec2ce --- /dev/null +++ b/android-patches/patches/JniUtils/ReactAndroid/src/main/jni/react/jni/Android.mk @@ -0,0 +1,11 @@ +--- /dev/code/rnm-66-fresh/ReactAndroid/src/main/jni/react/jni/Android.mk 2022-02-13 19:54:48.595686727 -0800 ++++ /dev/code/react-native-macos/ReactAndroid/src/main/jni/react/jni/Android.mk 2022-02-13 19:53:07.962650850 -0800 +@@ -77,7 +77,7 @@ + LOCAL_LDLIBS += -landroid + + # The dynamic libraries (.so files) that this module depends on. +-LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga logger ++LOCAL_SHARED_LIBRARIES := libreactnativejni libfolly_json libfb libfbjni libglog_init libyoga logger + + # The static libraries (.a files) that this module depends on. + LOCAL_STATIC_LIBRARIES := libreactnative libruntimeexecutor libcallinvokerholder diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/progressbar/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/progressbar/Android.mk new file mode 100644 index 00000000000000..8057a4b7c5d3c5 --- /dev/null +++ b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/progressbar/Android.mk @@ -0,0 +1,11 @@ +--- /dev/code/rnm-66-fresh/ReactCommon/react/renderer/components/progressbar/Android.mk 2022-02-13 19:54:48.619686978 -0800 ++++ /dev/code/react-native-macos/ReactCommon/react/renderer/components/progressbar/Android.mk 2022-02-13 19:53:12.522696921 -0800 +@@ -21,7 +21,7 @@ + + LOCAL_STATIC_LIBRARIES := + +-LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug ++LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativejni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug + + include $(BUILD_SHARED_LIBRARY) + diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/slider/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/slider/Android.mk new file mode 100644 index 00000000000000..c8a39ca50a5742 --- /dev/null +++ b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/slider/Android.mk @@ -0,0 +1,11 @@ +--- /dev/code/rnm-66-fresh/ReactCommon/react/renderer/components/slider/Android.mk 2022-02-13 19:54:48.619686978 -0800 ++++ /dev/code/react-native-macos/ReactCommon/react/renderer/components/slider/Android.mk 2022-02-13 19:53:21.558788484 -0800 +@@ -21,7 +21,7 @@ + + LOCAL_STATIC_LIBRARIES := + +-LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager librrc_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer ++LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreact_render_imagemanager libreactnativejni libreact_render_componentregistry libreact_render_uimanager librrc_image libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug libreact_render_mapbuffer + + include $(BUILD_SHARED_LIBRARY) + diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/switch/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/switch/Android.mk new file mode 100644 index 00000000000000..69f1e27bb2d1db --- /dev/null +++ b/android-patches/patches/JniUtils/ReactCommon/react/renderer/components/switch/Android.mk @@ -0,0 +1,11 @@ +--- /home/mganandraj/code/rnm-66-fresh/ReactCommon/react/renderer/components/switch/Android.mk 2022-02-13 19:54:48.619686978 -0800 ++++ /home/mganandraj/code/react-native-macos/ReactCommon/react/renderer/components/switch/Android.mk 2022-02-13 19:53:25.274826242 -0800 +@@ -21,7 +21,7 @@ + + LOCAL_STATIC_LIBRARIES := + +-LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativeutilsjni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug ++LOCAL_SHARED_LIBRARIES := libfbjni libreact_codegen_rncore libreactnativejni libreact_render_componentregistry libreact_render_uimanager libyoga libfolly_futures glog libfolly_json libglog_init libreact_render_core libreact_render_debug libreact_render_graphics librrc_view libreact_debug + + include $(BUILD_SHARED_LIBRARY) + diff --git a/android-patches/patches/JniUtils/ReactCommon/react/renderer/textlayoutmanager/Android.mk b/android-patches/patches/JniUtils/ReactCommon/react/renderer/textlayoutmanager/Android.mk new file mode 100644 index 00000000000000..1a67c0ea8a0d9d --- /dev/null +++ b/android-patches/patches/JniUtils/ReactCommon/react/renderer/textlayoutmanager/Android.mk @@ -0,0 +1,11 @@ +--- /home/mganandraj/code/rnm-66-fresh/ReactCommon/react/renderer/textlayoutmanager/Android.mk 2022-02-13 19:54:48.631687103 -0800 ++++ /home/mganandraj/code/react-native-macos/ReactCommon/react/renderer/textlayoutmanager/Android.mk 2022-02-13 19:53:28.338857418 -0800 +@@ -11,7 +11,7 @@ + + LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp) + +-LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativeutilsjni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libreact_render_mounting glog libfolly_json libglog_init libyoga libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry ++LOCAL_SHARED_LIBRARIES := libfolly_futures libreactnativejni libreact_utils libfb libfbjni libreact_render_uimanager libreact_render_componentregistry libreact_render_attributedstring libreact_render_mounting glog libfolly_json libglog_init libyoga libreact_render_core libreact_render_debug libreact_render_graphics libreact_debug libreact_render_mapbuffer libmapbufferjni libreact_render_telemetry + + LOCAL_STATIC_LIBRARIES := + diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java new file mode 100644 index 00000000000000..1b607d315c6ea3 --- /dev/null +++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java @@ -0,0 +1,30 @@ +--- /dev/code/rnm-66-fresh/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java 2022-02-13 19:54:48.563686391 -0800 ++++ /dev/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactBridge.java 2022-02-13 22:53:50.732054489 -0800 +@@ -31,6 +31,27 @@ + Systrace.beginSection( + TRACE_TAG_REACT_JAVA_BRIDGE, "ReactBridge.staticInit::load:reactnativejni"); + ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_SO_FILE_START); ++ ++ // JS Engine is configurable.. And we exepct only one packaged ++ // Hence ignore failure ++ try { ++ SoLoader.loadLibrary("hermes"); ++ }catch (UnsatisfiedLinkError jscE){} ++ ++ try { ++ SoLoader.loadLibrary("v8jsi"); ++ }catch (UnsatisfiedLinkError jscE){} ++ ++ SoLoader.loadLibrary("glog"); ++ SoLoader.loadLibrary("glog_init"); ++ SoLoader.loadLibrary("fb"); ++ SoLoader.loadLibrary("fbjni"); ++ SoLoader.loadLibrary("yoga"); ++ SoLoader.loadLibrary("folly_json"); ++ SoLoader.loadLibrary("reactperfloggerjni"); ++ SoLoader.loadLibrary("jsinspector"); ++ SoLoader.loadLibrary("jsi"); ++ SoLoader.loadLibrary("logger"); + SoLoader.loadLibrary("reactnativejni"); + ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_SO_FILE_END); + Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE); diff --git a/android-patches/patches/RootViewAttach/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/android-patches/patches/RootViewAttach/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java new file mode 100644 index 00000000000000..f3761dbf92d41d --- /dev/null +++ b/android-patches/patches/RootViewAttach/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java @@ -0,0 +1,10 @@ +--- /dev/code/rnm-66-fresh/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java 2022-02-13 19:54:48.563686391 -0800 ++++ /dev/code/react-native-macos/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java 2022-02-13 22:34:45.828345952 -0800 +@@ -410,6 +410,7 @@ + mInitialUITemplate = initialUITemplate; + + mReactInstanceManager.createReactContextInBackground(); ++ attachToReactInstanceManager(); + + } finally { + Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE); diff --git a/package.json b/package.json index a4e48ec9b39215..4e3385cca11971 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-native-macos", "private": true, - "version": "0.66.8", + "version": "0.66.17", "bin": "./cli.js", "description": "[Microsoft Fork] A framework for building native apps using React", "license": "MIT", diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 183378fae40f5f..f88f96dbdd2fbb 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -3,14 +3,14 @@ PODS: - boost-for-react-native (1.63.0) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.66.8) - - FBReactNativeSpec (0.66.8): - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.66.8) - - RCTTypeSafety (= 0.66.8) - - React-Core (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) + - FBLazyVector (0.66.17) + - FBReactNativeSpec (0.66.17): + - RCT-Folly (= 2021.06.28.00-v2) + - RCTRequired (= 0.66.17) + - RCTTypeSafety (= 0.66.17) + - React-Core (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) - Flipper (0.99.0): - Flipper-Folly (~> 2.6) - Flipper-RSocket (~> 1.4) @@ -86,303 +86,303 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog - - RCTRequired (0.66.8) - - RCTTypeSafety (0.66.8): - - FBLazyVector (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTRequired (= 0.66.8) - - React-Core (= 0.66.8) - - React (0.66.8): - - React-Core (= 0.66.8) - - React-Core/DevSupport (= 0.66.8) - - React-Core/RCTWebSocket (= 0.66.8) - - React-RCTActionSheet (= 0.66.8) - - React-RCTAnimation (= 0.66.8) - - React-RCTBlob (= 0.66.8) - - React-RCTImage (= 0.66.8) - - React-RCTLinking (= 0.66.8) - - React-RCTNetwork (= 0.66.8) - - React-RCTSettings (= 0.66.8) - - React-RCTText (= 0.66.8) - - React-RCTVibration (= 0.66.8) - - React-callinvoker (0.66.8) - - React-Core (0.66.8): + - RCTRequired (0.66.17) + - RCTTypeSafety (0.66.17): + - FBLazyVector (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTRequired (= 0.66.17) + - React-Core (= 0.66.17) + - React (0.66.17): + - React-Core (= 0.66.17) + - React-Core/DevSupport (= 0.66.17) + - React-Core/RCTWebSocket (= 0.66.17) + - React-RCTActionSheet (= 0.66.17) + - React-RCTAnimation (= 0.66.17) + - React-RCTBlob (= 0.66.17) + - React-RCTImage (= 0.66.17) + - React-RCTLinking (= 0.66.17) + - React-RCTNetwork (= 0.66.17) + - React-RCTSettings (= 0.66.17) + - React-RCTText (= 0.66.17) + - React-RCTVibration (= 0.66.17) + - React-callinvoker (0.66.17) + - React-Core (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.66.8) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-Core/Default (= 0.66.17) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/CoreModulesHeaders (0.66.8): + - React-Core/CoreModulesHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/Default (0.66.8): + - React-Core/Default (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/DevSupport (0.66.8): + - React-Core/DevSupport (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.66.8) - - React-Core/RCTWebSocket (= 0.66.8) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-jsinspector (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-Core/Default (= 0.66.17) + - React-Core/RCTWebSocket (= 0.66.17) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-jsinspector (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTActionSheetHeaders (0.66.8): + - React-Core/RCTActionSheetHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTAnimationHeaders (0.66.8): + - React-Core/RCTAnimationHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTBlobHeaders (0.66.8): + - React-Core/RCTBlobHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTImageHeaders (0.66.8): + - React-Core/RCTImageHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTLinkingHeaders (0.66.8): + - React-Core/RCTLinkingHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTNetworkHeaders (0.66.8): + - React-Core/RCTNetworkHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTPushNotificationHeaders (0.66.8): + - React-Core/RCTPushNotificationHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTSettingsHeaders (0.66.8): + - React-Core/RCTSettingsHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTTextHeaders (0.66.8): + - React-Core/RCTTextHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTVibrationHeaders (0.66.8): + - React-Core/RCTVibrationHeaders (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - React-Core/Default - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-Core/RCTWebSocket (0.66.8): + - React-Core/RCTWebSocket (0.66.17): - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/Default (= 0.66.8) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsiexecutor (= 0.66.8) - - React-perflogger (= 0.66.8) + - React-Core/Default (= 0.66.17) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsiexecutor (= 0.66.17) + - React-perflogger (= 0.66.17) - Yoga - - React-CoreModules (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.66.8) - - React-Core/CoreModulesHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - React-RCTImage (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-cxxreact (0.66.8): + - React-CoreModules (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.17) + - React-Core/CoreModulesHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - React-RCTImage (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-cxxreact (0.66.17): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.66.8) - - React-jsi (= 0.66.8) - - React-jsinspector (= 0.66.8) - - React-logger (= 0.66.8) - - React-perflogger (= 0.66.8) - - React-runtimeexecutor (= 0.66.8) - - React-jsi (0.66.8): + - React-callinvoker (= 0.66.17) + - React-jsi (= 0.66.17) + - React-jsinspector (= 0.66.17) + - React-logger (= 0.66.17) + - React-perflogger (= 0.66.17) + - React-runtimeexecutor (= 0.66.17) + - React-jsi (0.66.17): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsi/Default (= 0.66.8) - - React-jsi/Default (0.66.8): + - React-jsi/Default (= 0.66.17) + - React-jsi/Default (0.66.17): - boost (= 1.76.0) - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-jsiexecutor (0.66.8): + - React-jsiexecutor (0.66.17): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-perflogger (= 0.66.8) - - React-jsinspector (0.66.8) - - React-logger (0.66.8): + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-perflogger (= 0.66.17) + - React-jsinspector (0.66.17) + - React-logger (0.66.17): - glog - - React-perflogger (0.66.8) - - React-RCTActionSheet (0.66.8): - - React-Core/RCTActionSheetHeaders (= 0.66.8) - - React-RCTAnimation (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.66.8) - - React-Core/RCTAnimationHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTBlob (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/RCTBlobHeaders (= 0.66.8) - - React-Core/RCTWebSocket (= 0.66.8) - - React-jsi (= 0.66.8) - - React-RCTNetwork (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTImage (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.66.8) - - React-Core/RCTImageHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - React-RCTNetwork (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTLinking (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - React-Core/RCTLinkingHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTNetwork (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.66.8) - - React-Core/RCTNetworkHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTPushNotification (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCTTypeSafety (= 0.66.8) - - React-Core/RCTPushNotificationHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTSettings (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - RCTTypeSafety (= 0.66.8) - - React-Core/RCTSettingsHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTTest (0.66.8): - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core (= 0.66.8) - - React-CoreModules (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-RCTText (0.66.8): - - React-Core/RCTTextHeaders (= 0.66.8) - - React-RCTVibration (0.66.8): - - FBReactNativeSpec (= 0.66.8) - - RCT-Folly (= 2021.06.28.00-v2) - - React-Core/RCTVibrationHeaders (= 0.66.8) - - React-jsi (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-runtimeexecutor (0.66.8): - - React-jsi (= 0.66.8) - - React-TurboModuleCxx-RNW (0.66.8): - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.66.8) - - React-TurboModuleCxx-WinRTPort (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) - - React-TurboModuleCxx-WinRTPort (0.66.8): - - React-TurboModuleCxx-WinRTPort/Shared (= 0.66.8) - - React-TurboModuleCxx-WinRTPort/WinRT (= 0.66.8) - - React-TurboModuleCxx-WinRTPort/Shared (0.66.8) - - React-TurboModuleCxx-WinRTPort/WinRT (0.66.8): - - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.66.8) - - React-TurboModuleCxx-WinRTPort/Shared (= 0.66.8) - - ReactCommon/turbomodule/core (0.66.8): + - React-perflogger (0.66.17) + - React-RCTActionSheet (0.66.17): + - React-Core/RCTActionSheetHeaders (= 0.66.17) + - React-RCTAnimation (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.17) + - React-Core/RCTAnimationHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTBlob (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/RCTBlobHeaders (= 0.66.17) + - React-Core/RCTWebSocket (= 0.66.17) + - React-jsi (= 0.66.17) + - React-RCTNetwork (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTImage (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.17) + - React-Core/RCTImageHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - React-RCTNetwork (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTLinking (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - React-Core/RCTLinkingHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTNetwork (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.17) + - React-Core/RCTNetworkHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTPushNotification (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCTTypeSafety (= 0.66.17) + - React-Core/RCTPushNotificationHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTSettings (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - RCTTypeSafety (= 0.66.17) + - React-Core/RCTSettingsHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTTest (0.66.17): + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core (= 0.66.17) + - React-CoreModules (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-RCTText (0.66.17): + - React-Core/RCTTextHeaders (= 0.66.17) + - React-RCTVibration (0.66.17): + - FBReactNativeSpec (= 0.66.17) + - RCT-Folly (= 2021.06.28.00-v2) + - React-Core/RCTVibrationHeaders (= 0.66.17) + - React-jsi (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-runtimeexecutor (0.66.17): + - React-jsi (= 0.66.17) + - React-TurboModuleCxx-RNW (0.66.17): + - RCT-Folly (= 2021.06.28.00-v2) + - React-callinvoker (= 0.66.17) + - React-TurboModuleCxx-WinRTPort (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) + - React-TurboModuleCxx-WinRTPort (0.66.17): + - React-TurboModuleCxx-WinRTPort/Shared (= 0.66.17) + - React-TurboModuleCxx-WinRTPort/WinRT (= 0.66.17) + - React-TurboModuleCxx-WinRTPort/Shared (0.66.17) + - React-TurboModuleCxx-WinRTPort/WinRT (0.66.17): + - RCT-Folly (= 2021.06.28.00-v2) + - React-callinvoker (= 0.66.17) + - React-TurboModuleCxx-WinRTPort/Shared (= 0.66.17) + - ReactCommon/turbomodule/core (0.66.17): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.66.8) - - React-Core (= 0.66.8) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-logger (= 0.66.8) - - React-perflogger (= 0.66.8) - - ReactCommon/turbomodule/samples (0.66.8): + - React-callinvoker (= 0.66.17) + - React-Core (= 0.66.17) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-logger (= 0.66.17) + - React-perflogger (= 0.66.17) + - ReactCommon/turbomodule/samples (0.66.17): - DoubleConversion - glog - RCT-Folly (= 2021.06.28.00-v2) - - React-callinvoker (= 0.66.8) - - React-Core (= 0.66.8) - - React-cxxreact (= 0.66.8) - - React-jsi (= 0.66.8) - - React-logger (= 0.66.8) - - React-perflogger (= 0.66.8) - - ReactCommon/turbomodule/core (= 0.66.8) + - React-callinvoker (= 0.66.17) + - React-Core (= 0.66.17) + - React-cxxreact (= 0.66.17) + - React-jsi (= 0.66.17) + - React-logger (= 0.66.17) + - React-perflogger (= 0.66.17) + - ReactCommon/turbomodule/core (= 0.66.17) - Yoga (1.14.0) - YogaKit (1.18.1): - Yoga (~> 1.14) @@ -542,8 +542,8 @@ SPEC CHECKSUMS: boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8 - FBLazyVector: 94def40bf7c106f29d1978a95e61c5086a4e8d8c - FBReactNativeSpec: c802037392f4735b19cc08874f8cd66c1aebf71c + FBLazyVector: dc3a91ab3e7f92b48f2da97bc58606fa55175ffc + FBReactNativeSpec: 44a8c677a166fb1180f3ff59b1d72b65ba236f4b Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c @@ -557,35 +557,35 @@ SPEC CHECKSUMS: glog: 42c4bf47024808486e90b25ea9e5ac3959047641 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b - RCT-Folly: 5c589d0de10e841479ad79352fae591dc0e9533a - RCTRequired: 6a806d299f496eac1bac19dbbb76dfe38a818e84 - RCTTypeSafety: 4f3c17a17720d9f498f5f30ed82cd487c20eb66f - React: cc01ecd313db5de42a87bc6c0886577388e4356d - React-callinvoker: b53ef78045a3d983d62696882fe2015b01e917da - React-Core: bda8191f7854cac66673abfa850c14b059f9e4e1 - React-CoreModules: ec5895a855f96378bc682be5982c87db4bb337ed - React-cxxreact: 2f24138872bcacbdac91b8dd3d7cf79f3f48d02b - React-jsi: e255ad635e2720e58f384d91a9ea6901ad2d4e03 - React-jsiexecutor: b96a40af7223edc7ca9c86d3680f1717dac11944 - React-jsinspector: 07c3b972ed11953e7cee8d9b53e8ab274ffe20ca - React-logger: 41de74fdd67485176bfdb0682f8a2fa3c30cfdc5 - React-perflogger: 4a57193dd2b337df93ed2122f99874d477095bde - React-RCTActionSheet: 75153a3aab4c3091a7bc4e915d3d9fec4841a5d3 - React-RCTAnimation: 281ad7f2d0b872a9ada4cf3d48c8d89b7284c63e - React-RCTBlob: a99e19e4280e1c6d5c030d419c832bb826021b32 - React-RCTImage: b080b561112b435c50eaa87d2cf61525af2aae7b - React-RCTLinking: cf343bee08ac1c37e6b286c5e699fb3d2e4702c4 - React-RCTNetwork: 3e0dd4c7b9451ebe36a1a947a41d64729408d573 - React-RCTPushNotification: 63d797cffc42aa515c8815299d89e1e2edce2fc6 - React-RCTSettings: 81ed7c614774392ff987ae6e2102018a57f6c444 - React-RCTTest: bd1da55bbee937d212216027af2637c2faa4e8f7 - React-RCTText: a3a97fa092d3cc4327beb651dd029e449215fe5a - React-RCTVibration: c299740bfe96297d905e635edae637f129287792 - React-runtimeexecutor: eee1ead713ca75114e5be538ef68e706ee9925b7 - React-TurboModuleCxx-RNW: 65b73130a6ed610eada7c25a0ac40198e4e3442b - React-TurboModuleCxx-WinRTPort: 7db84447db2fd769820a4272cf557c6a842e5679 - ReactCommon: 59aa8053f2fba6cb469d57c1c17b3720ba582793 - Yoga: c484fab5caabc6beff79695da036d9843396f56a + RCT-Folly: 43adc9ce880eb76792f88c011773cb5c664c1419 + RCTRequired: 478a867949f2936f96a7100fe0982356e2f3e348 + RCTTypeSafety: 1305bdb74225103fd4e36dcff43c5dc6d7ef0dcd + React: 2f147e376f4ed4235c388feb25f8748130b66527 + React-callinvoker: 6fe163b989504dce8b415bb1ee968d637c838b84 + React-Core: 32ac858e757794d595a66409bac8facf18d27973 + React-CoreModules: 3935c2ef49d2a685a3de6884e4c7e237d6260ce5 + React-cxxreact: 110d10b3f3069f57ef99812099c0cbdeefcaba06 + React-jsi: 06102a49c410f0200ffb2458efe780a5aa3e65bd + React-jsiexecutor: e52e86e14e86e3a90ce7fbf1f1473f3307fb5c34 + React-jsinspector: a11d9c82f1af4e6f509e390a47d2c48b34c980fd + React-logger: 3d194ef5ee8a2b7a721d7b6f21653035f74c785a + React-perflogger: ae6295661d2406c0c47fea061f1b42c45156faec + React-RCTActionSheet: 77dca28307ecc64c178f343519549defb2b636a1 + React-RCTAnimation: 021ac2145b194dc6dc2182946aa1cb6220706f5e + React-RCTBlob: 4dc4b2eb7fe609c2716041c7eee84f4b7bfdf99f + React-RCTImage: 4c07c3c5b88c8c3fcd65853c92d692335cc6a458 + React-RCTLinking: dcdcd9e129b209c714e2f732aea9740e6df3bad7 + React-RCTNetwork: 568b82d4945e51ca1c4ac7dba7e362167abf39a9 + React-RCTPushNotification: 9ea43f4831540ee669f0126f09a6a33599989474 + React-RCTSettings: 8669dd07660ec6ad203a07630428c04e85dd2ca1 + React-RCTTest: 2c96ed44a8a4b95ffe65fe3881e23bce7f8f928f + React-RCTText: b4c5d315b8c06d3eb8e068f265c23cb813daf1b4 + React-RCTVibration: 2a3a67f22b60d7a8faa805c69a18dee356669320 + React-runtimeexecutor: 3404d9c610a682e710e91e69b45b1e07fb6efad0 + React-TurboModuleCxx-RNW: 8e2779bc7c397582cac5463859c41059ac2a8fc5 + React-TurboModuleCxx-WinRTPort: b33d72fb39935c955c584cc19265e17719234d28 + ReactCommon: 89d1b7528338d4ae4c44d3459582785d212832ea + Yoga: 0664982d23529e0767fc7f364ad9b8e06aa713c7 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: c7a7110b242497f2bf323ba74caedb9ee61ee05e diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj index dec92bd57f29bf..c77262bdde4b1c 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj +++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj @@ -73,6 +73,12 @@ 9F15345F233AB2C4006DFE44 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9F15345E233AB2C4006DFE44 /* AppDelegate.mm */; }; 9F153461233AB2C7006DFE44 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9F153460233AB2C7006DFE44 /* Assets.xcassets */; }; 9F153467233AB2C7006DFE44 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F153466233AB2C7006DFE44 /* main.m */; }; + 9F29408627A99ACE00AB150A /* Debug-iOS.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; }; + 9F29408727A99ACE00AB150A /* Debug-iOS.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; }; + 9F29408827A99ACF00AB150A /* Debug-iOS.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; }; + 9F29408927A99AD000AB150A /* Debug-iOS.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; }; + 9F29408A27A99AD300AB150A /* Debug-iOS.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; }; + 9F29408B27A99AD400AB150A /* Debug-iOS.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; }; AFC757F10008B167B9DCFD43 /* libPods-iosDeviceBuild.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE8ED7D8FB17AFA3F66FF96 /* libPods-iosDeviceBuild.a */; }; B2F2040A24E76D7600863BE1 /* ScreenshotMacOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2F2040924E76D7600863BE1 /* ScreenshotMacOS.mm */; }; E7C1241A22BEC44B00DA25C0 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7C1241922BEC44B00DA25C0 /* RNTesterIntegrationTests.m */; }; @@ -228,6 +234,18 @@ 9F153478233AB2C7006DFE44 /* RNTester-macOSIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "RNTester-macOSIntegrationTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 9F15347C233AB2C7006DFE44 /* RNTesterIntegrationTests_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNTesterIntegrationTests_macOS.m; sourceTree = ""; }; 9F15347E233AB2C7006DFE44 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug-iOS.xcconfig"; sourceTree = ""; }; + 9F44D86927B313CA005F40CC /* Debug-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug-macOS.xcconfig"; sourceTree = ""; }; + 9F44D86E27BDB80C005F40CC /* Debug_UnitTests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug_UnitTests-iOS.xcconfig"; sourceTree = ""; }; + 9F44D86F27BDB826005F40CC /* Debug_IntegrationTests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug_IntegrationTests-iOS.xcconfig"; sourceTree = ""; }; + 9F44D87027BDB840005F40CC /* Debug-UnitTests-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug-UnitTests-macOS.xcconfig"; sourceTree = ""; }; + 9F44D87127BDB84C005F40CC /* Debug-IntegrationTests-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Debug-IntegrationTests-macOS.xcconfig"; sourceTree = ""; }; + 9F44D87A27BDFFCD005F40CC /* Release-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release-macOS.xcconfig"; sourceTree = ""; }; + 9F44D87B27BDFFCD005F40CC /* Release-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release-iOS.xcconfig"; sourceTree = ""; }; + 9F44D87C27BDFFCD005F40CC /* Release-IntegrationTests-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release-IntegrationTests-macOS.xcconfig"; sourceTree = ""; }; + 9F44D87D27BDFFCD005F40CC /* Release-UnitTests-macOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release-UnitTests-macOS.xcconfig"; sourceTree = ""; }; + 9F44D87E27BDFFCD005F40CC /* Release_UnitTests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release_UnitTests-iOS.xcconfig"; sourceTree = ""; }; + 9F44D87F27BDFFCD005F40CC /* Release_IntegrationTests-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Release_IntegrationTests-iOS.xcconfig"; sourceTree = ""; }; A3D174930AD75B12F47289E6 /* libPods-RNTester-macOSIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTester-macOSIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A84904C6079328ECC03280D1 /* libPods-RNTesterIntegrationTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterIntegrationTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; AB0102C840930F7AC64C3D36 /* libPods-RNTesterUnitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNTesterUnitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -486,6 +504,7 @@ 9F15345C233AB2C4006DFE44 /* RNTester-macOS */, 9F153470233AB2C7006DFE44 /* RNTester-macOSUnitTests */, 9F15347B233AB2C7006DFE44 /* RNTester-macOSIntegrationTests */, + 9F29408C27A99BC600AB150A /* xcconfig */, 83CBBA001A601CBA00E9B192 /* Products */, 2DE7E7D81FB2A4F3009E225D /* Frameworks */, E23BD6487B06BD71F1A86914 /* Pods */, @@ -548,6 +567,41 @@ path = "RNTester-macOSIntegrationTests"; sourceTree = ""; }; + 9F29408C27A99BC600AB150A /* xcconfig */ = { + isa = PBXGroup; + children = ( + 9F44D87227BDFFA0005F40CC /* Debug */, + 9F44D87327BDFFA6005F40CC /* Release */, + ); + path = xcconfig; + sourceTree = ""; + }; + 9F44D87227BDFFA0005F40CC /* Debug */ = { + isa = PBXGroup; + children = ( + 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */, + 9F44D86E27BDB80C005F40CC /* Debug_UnitTests-iOS.xcconfig */, + 9F44D86F27BDB826005F40CC /* Debug_IntegrationTests-iOS.xcconfig */, + 9F44D86927B313CA005F40CC /* Debug-macOS.xcconfig */, + 9F44D87027BDB840005F40CC /* Debug-UnitTests-macOS.xcconfig */, + 9F44D87127BDB84C005F40CC /* Debug-IntegrationTests-macOS.xcconfig */, + ); + path = Debug; + sourceTree = ""; + }; + 9F44D87327BDFFA6005F40CC /* Release */ = { + isa = PBXGroup; + children = ( + 9F44D87B27BDFFCD005F40CC /* Release-iOS.xcconfig */, + 9F44D87E27BDFFCD005F40CC /* Release_UnitTests-iOS.xcconfig */, + 9F44D87F27BDFFCD005F40CC /* Release_IntegrationTests-iOS.xcconfig */, + 9F44D87A27BDFFCD005F40CC /* Release-macOS.xcconfig */, + 9F44D87D27BDFFCD005F40CC /* Release-UnitTests-macOS.xcconfig */, + 9F44D87C27BDFFCD005F40CC /* Release-IntegrationTests-macOS.xcconfig */, + ); + path = Release; + sourceTree = ""; + }; E23BD6487B06BD71F1A86914 /* Pods */ = { isa = PBXGroup; children = ( @@ -909,6 +963,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9F29408B27A99AD400AB150A /* Debug-iOS.xcconfig in Resources */, 2DDEF0101F84BF7B00DBDF73 /* Images.xcassets in Resources */, 8145AE06241172D900A3F8DA /* LaunchScreen.storyboard in Resources */, 3D2AFAF51D646CF80089D1A3 /* legacy_image@2x.png in Resources */, @@ -919,6 +974,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9F29408A27A99AD300AB150A /* Debug-iOS.xcconfig in Resources */, 5101985B23ADA00B00118BF1 /* legacy_image@2x.png in Resources */, 9F153461233AB2C7006DFE44 /* Assets.xcassets in Resources */, 5101985723AD9EE600118BF1 /* Main.storyboard in Resources */, @@ -929,6 +985,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9F29408827A99ACF00AB150A /* Debug-iOS.xcconfig in Resources */, 3811324724550A8F009E988D /* RNTesterUnitTestsBundle.js in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -937,6 +994,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9F29408927A99AD000AB150A /* Debug-iOS.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -944,6 +1002,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9F29408627A99ACE00AB150A /* Debug-iOS.xcconfig in Resources */, E7DB20DA22B2BAA6005AC45F /* RNTesterUnitTestsBundle.js in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -952,6 +1011,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9F29408727A99ACE00AB150A /* Debug-iOS.xcconfig in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1544,7 +1604,7 @@ /* Begin XCBuildConfiguration section */ 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6D3E7ECE8F9BEC26E5786555 /* Pods-RNTester.debug.xcconfig */; + baseConfigurationReference = 9F29408327A999D200AB150A /* Debug-iOS.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; @@ -1588,7 +1648,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DC317D3EE16C63CD9243667 /* Pods-RNTester.release.xcconfig */; + baseConfigurationReference = 9F44D87B27BDFFCD005F40CC /* Release-iOS.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -1935,7 +1995,7 @@ }; 9F15347F233AB2C7006DFE44 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E9CE1968E72EB97B674E80A4 /* Pods-RNTester-macOS.debug.xcconfig */; + baseConfigurationReference = 9F44D86927B313CA005F40CC /* Debug-macOS.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -1975,7 +2035,7 @@ }; 9F153480233AB2C7006DFE44 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 604873ABF80DC3EE97E87CCF /* Pods-RNTester-macOS.release.xcconfig */; + baseConfigurationReference = 9F44D87A27BDFFCD005F40CC /* Release-macOS.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; @@ -2015,7 +2075,7 @@ }; 9F153481233AB2C7006DFE44 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 87D5D06CD6060D32601A10DD /* Pods-RNTester-macOSUnitTests.debug.xcconfig */; + baseConfigurationReference = 9F44D87027BDB840005F40CC /* Debug-UnitTests-macOS.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2051,7 +2111,7 @@ }; 9F153482233AB2C7006DFE44 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 821937C864FDA0F3C485B4A6 /* Pods-RNTester-macOSUnitTests.release.xcconfig */; + baseConfigurationReference = 9F44D87D27BDFFCD005F40CC /* Release-UnitTests-macOS.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2087,7 +2147,7 @@ }; 9F153483233AB2C7006DFE44 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AFC451B51B7D6F0C1CAD0C18 /* Pods-RNTester-macOSIntegrationTests.debug.xcconfig */; + baseConfigurationReference = 9F44D87127BDB84C005F40CC /* Debug-IntegrationTests-macOS.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2125,7 +2185,7 @@ }; 9F153484233AB2C7006DFE44 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 27E7277560D64734B4F0E7D9 /* Pods-RNTester-macOSIntegrationTests.release.xcconfig */; + baseConfigurationReference = 9F44D87C27BDFFCD005F40CC /* Release-IntegrationTests-macOS.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2158,7 +2218,7 @@ }; E7DB20A722B2BA84005AC45F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C38CB0C2095A8FFDE13321E5 /* Pods-RNTesterUnitTests.debug.xcconfig */; + baseConfigurationReference = 9F44D86E27BDB80C005F40CC /* Debug_UnitTests-iOS.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2194,7 +2254,7 @@ }; E7DB20A822B2BA84005AC45F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8735BC063632C9712E25C7D9 /* Pods-RNTesterUnitTests.release.xcconfig */; + baseConfigurationReference = 9F44D87E27BDFFCD005F40CC /* Release_UnitTests-iOS.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -2230,7 +2290,7 @@ }; E7DB215B22B2F332005AC45F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3CD3706443F2188E09CBF2D2 /* Pods-RNTesterIntegrationTests.debug.xcconfig */; + baseConfigurationReference = 9F44D86F27BDB826005F40CC /* Debug_IntegrationTests-iOS.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; @@ -2268,7 +2328,7 @@ }; E7DB215C22B2F332005AC45F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E88C98CC10E157202A961408 /* Pods-RNTesterIntegrationTests.release.xcconfig */; + baseConfigurationReference = 9F44D87F27BDFFCD005F40CC /* Release_IntegrationTests-iOS.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ANALYZER_NONNULL = YES; diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester-macOS.xcscheme b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester-macOS.xcscheme index 81aed751023ed8..613a5d276fad2f 100644 --- a/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester-macOS.xcscheme +++ b/packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester-macOS.xcscheme @@ -40,7 +40,9 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "NO"> + shouldUseLaunchSchemeArgsEnv = "NO" + enableAddressSanitizer = "YES" + enableASanStackUseAfterReturn = "YES"> + shouldUseLaunchSchemeArgsEnv = "NO" + enableAddressSanitizer = "YES" + enableASanStackUseAfterReturn = "YES"> + shouldUseLaunchSchemeArgsEnv = "NO" + enableAddressSanitizer = "YES" + enableASanStackUseAfterReturn = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + enableAddressSanitizer = "YES" + enableASanStackUseAfterReturn = "YES"> { + ASANCrash.invokeMemoryCrash(); + }} + /> + ); + }, + }, +]; diff --git a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js index ea55de56c44c96..c13166c917ed4f 100644 --- a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js +++ b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js @@ -266,6 +266,27 @@ function DynamicColorsExample() { }} /> + + + DynamicColorMacOS({'{\n'} + {' '}light: 'red',{'\n'} + {' '}dark: 'blue',{'\n'} + {' '}highContrastLight: 'green',{'\n'} + {' '}highContrastDark: 'orange',{'\n'} + {'}'}) + + + ) : // ]TODO(macOS GH#774) Platform.OS === 'ios' ? ( diff --git a/packages/rn-tester/js/utils/RNTesterList.ios.js b/packages/rn-tester/js/utils/RNTesterList.ios.js index b5eeb7bc4225e5..b8c1966ece1240 100644 --- a/packages/rn-tester/js/utils/RNTesterList.ios.js +++ b/packages/rn-tester/js/utils/RNTesterList.ios.js @@ -293,6 +293,11 @@ const APIs: Array = [ module: require('../examples/Crash/CrashExample'), supportsTVOS: false, }, + { + key: 'ASANCrashExample', + module: require('../examples/ASAN/ASANCrashExample'), + supportsTVOS: false, + }, { key: 'DevSettings', module: require('../examples/DevSettings/DevSettingsExample'), diff --git a/packages/rn-tester/xcconfig/Debug/Debug-IntegrationTests-macOS.xcconfig b/packages/rn-tester/xcconfig/Debug/Debug-IntegrationTests-macOS.xcconfig new file mode 100644 index 00000000000000..ebec470a4a8483 --- /dev/null +++ b/packages/rn-tester/xcconfig/Debug/Debug-IntegrationTests-macOS.xcconfig @@ -0,0 +1,8 @@ +// +// Debug-IntegrationTests-macOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests.debug.xcconfig" + +ENABLE_ADDRESS_SANITIZER = YES diff --git a/packages/rn-tester/xcconfig/Debug/Debug-UnitTests-macOS.xcconfig b/packages/rn-tester/xcconfig/Debug/Debug-UnitTests-macOS.xcconfig new file mode 100644 index 00000000000000..fc17a862f47029 --- /dev/null +++ b/packages/rn-tester/xcconfig/Debug/Debug-UnitTests-macOS.xcconfig @@ -0,0 +1,8 @@ +// +// Debug-UnitTests-macOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests.debug.xcconfig" + +ENABLE_ADDRESS_SANITIZER = YES diff --git a/packages/rn-tester/xcconfig/Debug/Debug-iOS.xcconfig b/packages/rn-tester/xcconfig/Debug/Debug-iOS.xcconfig new file mode 100644 index 00000000000000..bf0ce1cf587b2c --- /dev/null +++ b/packages/rn-tester/xcconfig/Debug/Debug-iOS.xcconfig @@ -0,0 +1,8 @@ +// +// Debug.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester/Pods-RNTester.debug.xcconfig" + +ENABLE_ADDRESS_SANITIZER[sdk=iphonesimulator*] = YES diff --git a/packages/rn-tester/xcconfig/Debug/Debug-macOS.xcconfig b/packages/rn-tester/xcconfig/Debug/Debug-macOS.xcconfig new file mode 100644 index 00000000000000..15bf8fbb87e1c6 --- /dev/null +++ b/packages/rn-tester/xcconfig/Debug/Debug-macOS.xcconfig @@ -0,0 +1,8 @@ +// +// Debug-macOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS.debug.xcconfig" + +ENABLE_ADDRESS_SANITIZER = YES diff --git a/packages/rn-tester/xcconfig/Debug/Debug_IntegrationTests-iOS.xcconfig b/packages/rn-tester/xcconfig/Debug/Debug_IntegrationTests-iOS.xcconfig new file mode 100644 index 00000000000000..42dce5aaec16ed --- /dev/null +++ b/packages/rn-tester/xcconfig/Debug/Debug_IntegrationTests-iOS.xcconfig @@ -0,0 +1,8 @@ +// +// Debug_IntegrationTests-iOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.debug.xcconfig" + +ENABLE_ADDRESS_SANITIZER[sdk=iphonesimulator*] = YES diff --git a/packages/rn-tester/xcconfig/Debug/Debug_UnitTests-iOS.xcconfig b/packages/rn-tester/xcconfig/Debug/Debug_UnitTests-iOS.xcconfig new file mode 100644 index 00000000000000..77a86013bbc2bd --- /dev/null +++ b/packages/rn-tester/xcconfig/Debug/Debug_UnitTests-iOS.xcconfig @@ -0,0 +1,8 @@ +// +// Debug_UnitTests-iOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.debug.xcconfig" + +ENABLE_ADDRESS_SANITIZER[sdk=iphonesimulator*] = YES diff --git a/packages/rn-tester/xcconfig/Release/Release-IntegrationTests-macOS.xcconfig b/packages/rn-tester/xcconfig/Release/Release-IntegrationTests-macOS.xcconfig new file mode 100644 index 00000000000000..6a9ae2a3db3982 --- /dev/null +++ b/packages/rn-tester/xcconfig/Release/Release-IntegrationTests-macOS.xcconfig @@ -0,0 +1,21 @@ +// +// Debug-IntegrationTests-macOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester-macOSIntegrationTests/Pods-RNTester-macOSIntegrationTests.release.xcconfig" + +ENABLE_ADDRESS_SANITIZER = NO + +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +// Required security settings for production code (do not override at target/project level, with the possible +// exception of legacy test code) +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_KEYCHAIN_API = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_UNCHECKEDRETURN = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_GETPW_GETS = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_MKSTEMP = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_VFORK = YES diff --git a/packages/rn-tester/xcconfig/Release/Release-UnitTests-macOS.xcconfig b/packages/rn-tester/xcconfig/Release/Release-UnitTests-macOS.xcconfig new file mode 100644 index 00000000000000..4bef8afd2c6cdb --- /dev/null +++ b/packages/rn-tester/xcconfig/Release/Release-UnitTests-macOS.xcconfig @@ -0,0 +1,21 @@ +// +// Debug-UnitTests-macOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester-macOSUnitTests/Pods-RNTester-macOSUnitTests.release.xcconfig" + +ENABLE_ADDRESS_SANITIZER = NO + +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +// Required security settings for production code (do not override at target/project level, with the possible +// exception of legacy test code) +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_KEYCHAIN_API = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_UNCHECKEDRETURN = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_GETPW_GETS = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_MKSTEMP = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_VFORK = YES diff --git a/packages/rn-tester/xcconfig/Release/Release-iOS.xcconfig b/packages/rn-tester/xcconfig/Release/Release-iOS.xcconfig new file mode 100644 index 00000000000000..fe76436c87592e --- /dev/null +++ b/packages/rn-tester/xcconfig/Release/Release-iOS.xcconfig @@ -0,0 +1,21 @@ +// +// Debug.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester/Pods-RNTester.release.xcconfig" + +ENABLE_ADDRESS_SANITIZER = NO + +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +// Required security settings for production code (do not override at target/project level, with the possible +// exception of legacy test code) +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_KEYCHAIN_API = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_UNCHECKEDRETURN = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_GETPW_GETS = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_MKSTEMP = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_VFORK = YES diff --git a/packages/rn-tester/xcconfig/Release/Release-macOS.xcconfig b/packages/rn-tester/xcconfig/Release/Release-macOS.xcconfig new file mode 100644 index 00000000000000..9cf423adbae118 --- /dev/null +++ b/packages/rn-tester/xcconfig/Release/Release-macOS.xcconfig @@ -0,0 +1,21 @@ +// +// Debug-macOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTester-macOS/Pods-RNTester-macOS.release.xcconfig" + +ENABLE_ADDRESS_SANITIZER = NO + +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE[sdk=iphonesimulator*] = deep +// Required security settings for production code (do not override at target/project level, with the possible +// exception of legacy test code) +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_KEYCHAIN_API[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_UNCHECKEDRETURN[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_GETPW_GETS[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_MKSTEMP[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY[sdk=iphonesimulator*] = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_VFORK[sdk=iphonesimulator*] = YES diff --git a/packages/rn-tester/xcconfig/Release/Release_IntegrationTests-iOS.xcconfig b/packages/rn-tester/xcconfig/Release/Release_IntegrationTests-iOS.xcconfig new file mode 100644 index 00000000000000..14e1e086b2df20 --- /dev/null +++ b/packages/rn-tester/xcconfig/Release/Release_IntegrationTests-iOS.xcconfig @@ -0,0 +1,21 @@ +// +// Debug_IntegrationTests-iOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests.release.xcconfig" + +ENABLE_ADDRESS_SANITIZER = NO + +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +// Required security settings for production code (do not override at target/project level, with the possible +// exception of legacy test code) +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_KEYCHAIN_API = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_UNCHECKEDRETURN = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_GETPW_GETS = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_MKSTEMP = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_VFORK = YES diff --git a/packages/rn-tester/xcconfig/Release/Release_UnitTests-iOS.xcconfig b/packages/rn-tester/xcconfig/Release/Release_UnitTests-iOS.xcconfig new file mode 100644 index 00000000000000..dbf79c24ad9c86 --- /dev/null +++ b/packages/rn-tester/xcconfig/Release/Release_UnitTests-iOS.xcconfig @@ -0,0 +1,21 @@ +// +// Debug_UnitTests-iOS.xcconfig +// RNTesterPods +// + +#include "../../Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig" + +ENABLE_ADDRESS_SANITIZER = NO + +RUN_CLANG_STATIC_ANALYZER = YES +CLANG_STATIC_ANALYZER_MODE = deep +// Required security settings for production code (do not override at target/project level, with the possible +// exception of legacy test code) +CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES +CLANG_ANALYZER_SECURITY_KEYCHAIN_API = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_UNCHECKEDRETURN = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_GETPW_GETS = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_MKSTEMP = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES +CLANG_ANALYZER_SECURITY_INSECUREAPI_VFORK = YES diff --git a/template/package.json b/template/package.json index 1f0c7810d2ea45..b8eb82e6bd1ff7 100644 --- a/template/package.json +++ b/template/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "react": "17.0.2", - "react-native": "0.66.8" + "react-native": "0.66.17" }, "devDependencies": { "@babel/core": "^7.12.9", diff --git a/third-party-podspecs/RCT-Folly.podspec b/third-party-podspecs/RCT-Folly.podspec index 5d3806674b3d74..21c2e2c2c186c7 100644 --- a/third-party-podspecs/RCT-Folly.podspec +++ b/third-party-podspecs/RCT-Folly.podspec @@ -40,7 +40,7 @@ Pod::Spec.new do |spec| 'folly/hash/SpookyHashV2.cpp', 'folly/lang/Assume.cpp', 'folly/lang/CString.cpp', - # 'folly/lang/Exception.cpp', # TODO(macOS GH#214) later versions of boost don't support macOS, revert this back to upstream when fixed + 'folly/lang/Exception.cpp', 'folly/memory/detail/MallocImpl.cpp', 'folly/net/NetOps.cpp', 'folly/portability/SysUio.cpp',