Update a few Mac deprecated APIs

Author: ntre

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.

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];

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,

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;

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)