[pull] master from microsoft:master (#11)

pull[bot] · ntre · mganandraj · web-flow · commit d9faa3a52a69 · 2021-10-14T19:00:50.000Z
* Deprecated api (microsoft#853) * Remove deprecated/unused context param * Update a few Mac deprecated APIs * Packing RN dependencies, hermes and ignoring javadoc failure, (microsoft#852) * Ignore javadoc failure * Bringing few more changes from 0.63-stable * Fixing a patch in engine selection * Fixing a patch in nuget spec * Fixing the output directory of nuget pack * Packaging dependencies in the nuget * Fix onMouseEnter/onMouseLeave callbacks not firing on Pressable (microsoft#855) * add pull yml * match handleOpenURLNotification event payload with iOS (microsoft#755) (#2) Co-authored-by: Ryan Linton <ryanlntn@gmail.com> * fix mouse evetns on pressable * delete extra yml from this branch * Add macOS tags * reorder props to have onMouseEnter/onMouseLeave always be before onPress Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: Ryan Linton <ryanlntn@gmail.com> * Grammar fixes. (microsoft#856) Updates simple grammar issues. Co-authored-by: Nick Trescases <42704557+ntre@users.noreply.github.com> Co-authored-by: Anandraj <anandrag@microsoft.com> Co-authored-by: Saad Najmi <saadnajmi2@gmail.com> Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com> Co-authored-by: Ryan Linton <ryanlntn@gmail.com> Co-authored-by: Muhammad Hamza Zaman <mh.zaman.4069@gmail.com>
diff --git a/.ado/android-pr.yml b/.ado/android-pr.yml
@@ -46,11 +46,18 @@ jobs:
 
       - template: templates\prep-android-nuget.yml
 
+      # Verify depenendencies can be enumerated and downloaded ..
+      - task: CmdLine@2
+        displayName: 'Verify Dependencies can be enumerated'
+        inputs:
+          script: sudo apt-get install python3-pip && sudo apt-get install python3-setuptools && pip3 install BeautifulSoup4 && pip3 install wheel && pip3 install wget && python3 android-patches/scripts/downloadDependencies.py $(Build.SourcesDirectory) && tree $(Build.SourcesDirectory)/android
+
+
       # Very similar to the default pack task .. but appends 'ndk21' to the nuget pack version
       - task: CmdLine@2
         displayName: 'Verify NuGet can be packed'
         inputs:
-          script: NDK=ndk`cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | awk '{ print $3}' | awk -F. '{ print $1 }'`; mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe pack $(System.DefaultWorkingDirectory)/ReactAndroid/ReactAndroid.nuspec -OutputDirectory $(System.DefaultWorkingDirectory) -Properties buildNumber=$(buildNumber)-$NDK;commitId=$(Build.SourceVersion)
+          script: NDK=ndk`cat ${ANDROID_SDK_ROOT}/ndk-bundle/source.properties 2>&1 | grep Pkg.Revision | awk '{ print $3}' | awk -F. '{ print $1 }'`; mono $(System.DefaultWorkingDirectory)/nuget-bin/nuget.exe pack $(System.DefaultWorkingDirectory)/ReactAndroid/ReactAndroid.nuspec -OutputDirectory $(Build.StagingDirectory)/final -Properties buildNumber=$(buildNumber)-$NDK;commitId=$(Build.SourceVersion)
 
       # Android CI doesn't create a nuget now, but this check is failing builds. Quickest fix to unblock builds is to disable the check... but we need to find the root cause and fix it and enable this again.
       # - script: '[ -f $(System.DefaultWorkingDirectory)/*.nupkg ]'
@@ -70,4 +77,10 @@ jobs:
       - task: CmdLine@2
         displayName: gradlew clean
         inputs:
-          script: ./gradlew clean
+          script: ./gradlew clean
+
+      - task: PublishBuildArtifacts@1
+        displayName: 'Publish final artifacts'
+        inputs:
+          PathtoPublish: '$(Build.StagingDirectory)/final'
+          ArtifactName: 'ReactNative-Final' 
diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -144,6 +144,13 @@ jobs:
 
       - template: templates\prep-android-nuget.yml
 
+      # Enumerate and download all dependencies ..
+      - task: CmdLine@2
+        displayName: 'Verify Dependencies can be enumerated'
+        inputs:
+          script: sudo apt-get install python3-pip && sudo apt-get install python3-setuptools && pip3 install BeautifulSoup4 && pip3 install wheel && pip3 install wget && python3 android-patches/scripts/downloadDependencies.py $(Build.SourcesDirectory) && tree $(Build.SourcesDirectory)/android
+
+
       # Very similar to the default pack task .. but appends 'ndk21b' to the nuget pack version
       - task: CmdLine@2
         displayName: 'NuGet pack'
diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
@@ -170,6 +170,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
     delayLongPress,
     disabled,
     focusable,
+    onMouseEnter, // [TODO(macOS GH#774)
+    onMouseLeave, // ]TODO(macOS GH#774)
     onLongPress,
     onPress,
     onPressIn,
@@ -208,6 +210,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
       android_disableSound,
       delayLongPress,
       delayPressIn: unstable_pressDelay,
+      onHoverIn: onMouseEnter, // [TODO(macOS GH#774)
+      onHoverOut: onMouseLeave, // ]TODO(macOS GH#774)
       onLongPress,
       onPress,
       onPressIn(event: PressEvent): void {
@@ -236,6 +240,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
       delayLongPress,
       disabled,
       hitSlop,
+      onMouseEnter, // [TODO(macOS GH#774)
+      onMouseLeave, // ]TODO(macOS GH#774)
       onLongPress,
       onPress,
       onPressIn,
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@
 
 This repository is a working fork of **facebook/react-native** that adds support for the official React Native for macOS implementation from Microsoft. 
 
-You can read more about the macOS implementation in our website - [React Native for Windows + macOS](https://microsoft.github.io/react-native-windows/)
+You can read more about the macOS implementation on our website - [React Native for Windows + macOS](https://microsoft.github.io/react-native-windows/)
 
 ## Contents
 
@@ -50,14 +50,14 @@ Search the [existing issues](https://github.com/microsoft/react-native-macos/iss
 - Ensure the [appropriate template](https://github.com/microsoft/react-native-macos/issues/new/choose) is used when filing your issue(s).
 
 ##  Contributing
-See [Contributing guidelines](https://github.com/microsoft/react-native-macos/blob/master/CONTRIBUTING.md) for how to setup your fork of the repo and start a PR to contribute to React Native for macOS.
+See [Contributing guidelines](https://github.com/microsoft/react-native-macos/blob/master/CONTRIBUTING.md) for how to set up your fork of the repo and start a PR to contribute to React Native for macOS.
 
 [Good First Issue](https://github.com/microsoft/react-native-macos/labels/good%20first%20issue) and [help wanted](https://github.com/microsoft/react-native-macos/labels/help%20wanted) are great starting points for PRs.
 
 ## Documentation
 [React Native already has great documentation](https://reactnative.dev/docs/getting-started) and we're working to ensure the React Native for Windows + macOS are part of that documentation story.
 
-[React Native for Windows + macOS](https://microsoft.github.io/react-native-windows/) has it's own separate documentation site where Windows and macOS
+[React Native for Windows + macOS](https://microsoft.github.io/react-native-windows/) has its own separate documentation site where Windows and macOS
 specific information, like API docs and blog updates live. We are bootstrapping documentation for macOS at this time, tune in for updates.
 
 ### Examples
diff --git a/React/Base/macOS/RCTPlatformDisplayLink.m b/React/Base/macOS/RCTPlatformDisplayLink.m
@@ -15,7 +15,7 @@
 #import <CoreVideo/CVDisplayLink.h>
 #import <CoreVideo/CVHostTime.h>
 
-#import <libkern/OSAtomic.h>
+#import <os/lock.h>
 
 @interface RCTPlatformDisplayLink ()
 
@@ -30,7 +30,7 @@ @implementation RCTPlatformDisplayLink
   __weak id _target;
   NSRunLoop *_runLoop;
   NSMutableArray<NSRunLoopMode> *_modes;
-  OSSpinLock _lock; // OS_SPINLOCK_INIT == 0
+  os_unfair_lock _lock; // OS_UNFAIR_LOCK_INIT == 0
 }
 
 + (RCTPlatformDisplayLink *)displayLinkWithTarget:(id)target selector:(SEL)sel
@@ -47,15 +47,15 @@ static CVReturn RCTPlatformDisplayLinkCallBack(__unused CVDisplayLinkRef display
     RCTPlatformDisplayLink *rctDisplayLink = (__bridge RCTPlatformDisplayLink*)displayLinkContext;
 
     // Lock and check for invalidation prior to calling out to the runloop
-    OSSpinLockLock(&rctDisplayLink->_lock);
+    os_unfair_lock_lock(&rctDisplayLink->_lock);
     if (rctDisplayLink->_runLoop != nil) {
       CFRunLoopRef cfRunLoop = [rctDisplayLink->_runLoop getCFRunLoop];
       CFRunLoopPerformBlock(cfRunLoop, kCFRunLoopDefaultMode, ^{
         [rctDisplayLink tick];
       });
       CFRunLoopWakeUp(cfRunLoop);
     }
-    OSSpinLockUnlock(&rctDisplayLink->_lock);
+    os_unfair_lock_unlock(&rctDisplayLink->_lock);
   }
   return kCVReturnSuccess;
 }
@@ -98,10 +98,10 @@ - (void)removeFromRunLoop:(__unused NSRunLoop *)runloop forMode:(NSRunLoopMode)m
 - (void)invalidate
 {
   if (_runLoop != nil) {
-    OSSpinLockLock(&_lock);
+    os_unfair_lock_lock(&_lock);
     _runLoop = nil;
     _modes = nil;
-    OSSpinLockUnlock(&_lock);
+    os_unfair_lock_unlock(&_lock);
 
     // CVDisplayLinkStop attempts to acquire a mutex possibly held during the callback's invocation.
     // Stop the display link outside of the lock to avoid deadlocking here.
diff --git a/React/Views/RCTActivityIndicatorView.m b/React/Views/RCTActivityIndicatorView.m
@@ -23,7 +23,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame])) {
     self.displayedWhenStopped = NO;
-    self.style = NSProgressIndicatorSpinningStyle;
+    self.style = NSProgressIndicatorStyleSpinning;
   }
   return self;
 }
@@ -82,7 +82,7 @@ - (void)updateLayer
   [super updateLayer];
   if (_color != nil) {
     CGFloat r, g, b, a;
-    [[_color colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r green:&g blue:&b alpha:&a];
+    [[_color colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]] getRed:&r green:&g blue:&b alpha:&a];
 
     CIFilter *colorPoly = [CIFilter filterWithName:@"CIColorPolynomial"];
     [colorPoly setDefaults];
diff --git a/React/Views/RCTProgressViewManager.m b/React/Views/RCTProgressViewManager.m
@@ -14,9 +14,9 @@ @implementation RCTConvert (RCTProgressViewManager)
 
 #if TARGET_OS_OSX // [TODO(macOS GH#774)
 RCT_ENUM_CONVERTER(NSProgressIndicatorStyle, (@{
-  @"default": @(NSProgressIndicatorBarStyle),
-  @"bar": @(NSProgressIndicatorBarStyle),
-}), NSProgressIndicatorBarStyle, integerValue)
+  @"default": @(NSProgressIndicatorStyleBar),
+  @"bar": @(NSProgressIndicatorStyleBar),
+}), NSProgressIndicatorStyleBar, integerValue)
 #else // ]TODO(macOS GH#774)
 RCT_ENUM_CONVERTER(
     UIProgressViewStyle,
diff --git a/React/Views/RCTSlider.m b/React/Views/RCTSlider.m
@@ -126,7 +126,7 @@ @implementation RCTSlider {
 - (instancetype)initWithFrame:(NSRect)frameRect
 {
   if (self = [super initWithFrame:frameRect]) {
-    self.cell.controlSize = NSRegularControlSize;
+    self.cell.controlSize = NSControlSizeRegular;
     ((RCTSliderCell*)self.cell).delegate = self;
   }
   return self;
diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m
@@ -19,7 +19,7 @@ @implementation RCTSwitch
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame])) {
-    self.buttonType = NSSwitchButton;
+    self.buttonType = NSButtonTypeSwitch;
     self.title = @""; // default is "Button"
   }
   return self;
@@ -34,20 +34,20 @@ - (void)setOn:(BOOL)on animated:(BOOL)animated
 }
 #else // [TODO(macOS GH#774)
 - (void)setOn:(BOOL)on animated:(BOOL)animated {
-  self.state = on ? NSOnState : NSOffState;
+  self.state = on ? NSControlStateValueOn : NSControlStateValueOff;
 }
 #endif // ]TODO(macOS GH#774)
 
 #if TARGET_OS_OSX
 
 - (BOOL)on
 {
-  return self.state == NSOnState;
+  return self.state == NSControlStateValueOn;
 }
 
 - (void)setOn:(BOOL)on
 {
-  self.state = on ? NSOnState : NSOffState;
+  self.state = on ? NSControlStateValueOn : NSControlStateValueOff;
 }
 
 #endif // ]TODO(macOS GH#774)
diff --git a/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec b/android-patches/patches/Build/ReactAndroid/ReactAndroid.nuspec
@@ -1,6 +1,6 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\ReactAndroid.nuspec"	1969-12-31 16:00:00.000000000 -0800
-+++ "E:\\github\\rnm-63\\ReactAndroid\\ReactAndroid.nuspec"	2020-10-27 20:20:54.071789900 -0700
-@@ -0,0 +1,130 @@
+--- "E:\\gh\\react-native-macos2\\ReactAndroid\\ReactAndroid.nuspec"	1969-12-31 16:00:00.000000000 -0800
++++ "E:\\gh\\react-native-macos\\ReactAndroid\\ReactAndroid.nuspec"	2021-10-12 19:48:38.934480100 -0700
+@@ -0,0 +1,200 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
 +  <metadata>
@@ -64,6 +64,41 @@
 +    <file src="build\react-ndk\all\armeabi-v7a\libyoga.so" target="lib\droidarm"/>
 +    <file src="build\react-ndk\all\x86\libyoga.so" target="lib\droidx86"/>
 +    <file src="build\react-ndk\all\arm64-v8a\libyoga.so" target="lib\droidarm64"/>
++    
++    <file src="build\react-ndk\all\x86_64\libhermes-executor-common-debug.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libhermes-executor-common-debug.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libhermes-executor-common-debug.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libhermes-executor-common-debug.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libhermes-executor-common-release.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libhermes-executor-common-release.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libhermes-executor-common-release.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libhermes-executor-common-release.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libhermes-executor-debug.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libhermes-executor-debug.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libhermes-executor-debug.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libhermes-executor-debug.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libhermes-executor-release.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libhermes-executor-release.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libhermes-executor-release.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libhermes-executor-release.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libhermes-inspector.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libhermes-inspector.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libhermes-inspector.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libhermes-inspector.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libjsijniprofiler.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libjsijniprofiler.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libjsijniprofiler.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libjsijniprofiler.so" target="lib\droidarm64"/>
++
++    <file src="build\react-ndk\all\x86_64\libfolly_futures.so" target="lib\droidx64"/>
++    <file src="build\react-ndk\all\armeabi-v7a\libfolly_futures.so" target="lib\droidarm"/>
++    <file src="build\react-ndk\all\x86\libfolly_futures.so" target="lib\droidx86"/>
++    <file src="build\react-ndk\all\arm64-v8a\libfolly_futures.so" target="lib\droidarm64"/>
 +
 +    <!-- Unstripped binaries -->
 +    <file src="build\tmp\buildReactNdkLib\local\x86_64\libfb.so" target="lib\droidx64\unstripped"/>
@@ -116,6 +151,40 @@
 +    <file src="build\tmp\buildReactNdkLib\local\x86\libyoga.so" target="lib\droidx86\unstripped"/>
 +    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libyoga.so" target="lib\droidarm64\unstripped"/>
 +
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libhermes-executor-common-debug.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libhermes-executor-common-debug.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libhermes-executor-common-debug.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libhermes-executor-common-debug.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libhermes-executor-common-release.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libhermes-executor-common-release.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libhermes-executor-common-release.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libhermes-executor-common-release.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libhermes-executor-debug.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libhermes-executor-debug.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libhermes-executor-debug.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libhermes-executor-debug.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libhermes-executor-release.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libhermes-executor-release.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libhermes-executor-release.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libhermes-executor-release.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libhermes-inspector.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libhermes-inspector.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libhermes-inspector.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libhermes-inspector.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libjsijniprofiler.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libjsijniprofiler.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libjsijniprofiler.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libjsijniprofiler.so" target="lib\droidarm64\unstripped"/>
++
++    <file src="build\tmp\buildReactNdkLib\local\x86_64\libfolly_futures.so" target="lib\droidx64\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\armeabi-v7a\libfolly_futures.so" target="lib\droidarm\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\x86\libfolly_futures.so" target="lib\droidx86\unstripped"/>
++    <file src="build\tmp\buildReactNdkLib\local\arm64-v8a\libfolly_futures.so" target="lib\droidarm64\unstripped"/>
 +    <!-- AAR and POM -->
 +    <file src="..\android\com\facebook\react\react-native\*\react-native-*.aar" target="lib"/>
 +    <file src="..\android\com\facebook\react\react-native\*\react-native-*.pom" target="lib"/>
@@ -128,6 +197,7 @@
 +    <file src="..\ReactCommon\cxxreact\**\*.h" target="inc\cxxreact"/>
 +    <file src="..\ReactCommon\jsi\**\*.h" target="inc\jsi"/>
 +    <file src="..\ReactCommon\yoga\yoga\**\*.h" target="inc\Yoga"/>
++    <file src="..\android\dependencies\**\*.*" target="dependencies"/>
 +  </files>
 +</package>
 +
diff --git a/android-patches/patches/Build/ReactAndroid/release.gradle b/android-patches/patches/Build/ReactAndroid/release.gradle
@@ -0,0 +1,10 @@
+--- /home/mganandraj/github/rnm-64-vanilla/ReactAndroid/release.gradle	2021-10-11 17:51:44.286455263 -0700
++++ /home/mganandraj/github/rnm-64/ReactAndroid/release.gradle	2021-10-07 16:35:28.636536900 -0700
+@@ -74,6 +74,7 @@
+ afterEvaluate { project ->
+ 
+     task androidJavadoc(type: Javadoc) {
++        failOnError false
+         source = android.sourceSets.main.java.srcDirs
+         classpath += files(android.bootClasspath)
+         classpath += files(project.getConfigurations().getByName("compile").asList())
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
@@ -1,11 +1,21 @@
---- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactBridge.java"	2020-10-27 20:26:16.762190600 -0700
-+++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactBridge.java"	2020-10-13 21:38:04.995797000 -0700
-@@ -31,6 +31,14 @@
+--- "E:\\gh\\react-native-macos2\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactBridge.java"	2021-10-12 13:35:49.124099000 -0700
++++ "E:\\gh\\react-native-macos\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactBridge.java"	2021-10-12 13:22:46.508704400 -0700
+@@ -31,6 +31,24 @@
      Systrace.beginSection(
          TRACE_TAG_REACT_JAVA_BRIDGE, "ReactBridge.staticInit::load:reactnativejni");
      ReactMarker.logMarker(ReactMarkerConstants.LOAD_REACT_NATIVE_SO_FILE_START);
 +
-+    SoLoader.loadLibrary("v8jsi");
++    // JS Engine is configurable .. And we expect only one packaged.
++    // Hence ignore failure.
++
++    try {
++      SoLoader.loadLibrary("hermes");
++    } catch (UnsatisfiedLinkError jscE) {}
++
++    try {
++      SoLoader.loadLibrary("v8jsi");
++    } catch (UnsatisfiedLinkError jscE) {}
++    
 +    SoLoader.loadLibrary("glog_init");
 +    SoLoader.loadLibrary("fb");
 +    SoLoader.loadLibrary("fbjni");
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.java
diff --git a/android-patches/scripts/download-deps.py b/android-patches/scripts/download-deps.py
diff --git a/android-patches/scripts/downloadDependencies.py b/android-patches/scripts/downloadDependencies.py
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
diff --git a/packages/rn-tester/js/examples/Pressable/PressableExample.js b/packages/rn-tester/js/examples/Pressable/PressableExample.js

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ - (instancetype)initWithFrame:(CGRect)frame`
`23`	`23`	`{`
`24`	`24`	`if ((self = [super initWithFrame:frame])) {`
`25`	`25`	`self.displayedWhenStopped = NO;`
`26`		`- self.style = NSProgressIndicatorSpinningStyle;`
	`26`	`+ self.style = NSProgressIndicatorStyleSpinning;`
`27`	`27`	`}`
`28`	`28`	`return self;`
`29`	`29`	`}`
`@@ -82,7 +82,7 @@ - (void)updateLayer`
`82`	`82`	`[super updateLayer];`
`83`	`83`	`if (_color != nil) {`
`84`	`84`	`CGFloat r, g, b, a;`
`85`		`- [[_color colorUsingColorSpaceName:NSCalibratedRGBColorSpace] getRed:&r green:&g blue:&b alpha:&a];`
	`85`	`+ [[_color colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]] getRed:&r green:&g blue:&b alpha:&a];`
`86`	`86`
`87`	`87`	`CIFilter *colorPoly = [CIFilter filterWithName:@"CIColorPolynomial"];`
`88`	`88`	`[colorPoly setDefaults];`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ @implementation RCTSlider {`
`126`	`126`	`- (instancetype)initWithFrame:(NSRect)frameRect`
`127`	`127`	`{`
`128`	`128`	`if (self = [super initWithFrame:frameRect]) {`
`129`		`- self.cell.controlSize = NSRegularControlSize;`
	`129`	`+ self.cell.controlSize = NSControlSizeRegular;`
`130`	`130`	`((RCTSliderCell*)self.cell).delegate = self;`
`131`	`131`	`}`
`132`	`132`	`return self;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ @implementation RCTSwitch`
`19`	`19`	`- (instancetype)initWithFrame:(CGRect)frame`
`20`	`20`	`{`
`21`	`21`	`if ((self = [super initWithFrame:frame])) {`
`22`		`- self.buttonType = NSSwitchButton;`
	`22`	`+ self.buttonType = NSButtonTypeSwitch;`
`23`	`23`	`self.title = @""; // default is "Button"`
`24`	`24`	`}`
`25`	`25`	`return self;`
`@@ -34,20 +34,20 @@ - (void)setOn:(BOOL)on animated:(BOOL)animated`
`34`	`34`	`}`
`35`	`35`	`#else // [TODO(macOS GH#774)`
`36`	`36`	`- (void)setOn:(BOOL)on animated:(BOOL)animated {`
`37`		`- self.state = on ? NSOnState : NSOffState;`
	`37`	`+ self.state = on ? NSControlStateValueOn : NSControlStateValueOff;`
`38`	`38`	`}`
`39`	`39`	`#endif // ]TODO(macOS GH#774)`
`40`	`40`
`41`	`41`	`#if TARGET_OS_OSX`
`42`	`42`
`43`	`43`	`- (BOOL)on`
`44`	`44`	`{`
`45`		`- return self.state == NSOnState;`
	`45`	`+ return self.state == NSControlStateValueOn;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`- (void)setOn:(BOOL)on`
`49`	`49`	`{`
`50`		`- self.state = on ? NSOnState : NSOffState;`
	`50`	`+ self.state = on ? NSControlStateValueOn : NSControlStateValueOff;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`#endif // ]TODO(macOS GH#774)`