Switch to compatibility_alias for Swift compat

Author: Saadnajmi

packages/react-native/React/CoreModules/RCTActionSheetManager.mm

@@ -339,7 +339,7 @@ - (void)presentSharingServicePicker:(NSSharingServicePicker *)picker
       });
   NSString *userInterfaceStyle = [RCTConvert NSString:options.userInterfaceStyle()];
   NSNumber *anchorViewTag = [RCTConvert NSNumber:options.anchor() ? @(*options.anchor()) : nil];
-  RCTPlatformColor *tintColor = [RCTConvert RCTPlatformColor:options.tintColor() ? @(*options.tintColor()) : nil]; // [macOS]
+  RCTPlatformColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil]; // [macOS]
 
   dispatch_async(dispatch_get_main_queue(), ^{
     if (message) {

packages/react-native/React/RCTUIKit/RCTPlatformDisplayLink.h

@@ -11,7 +11,7 @@
 
 #if !TARGET_OS_OSX
 #import <QuartzCore/CADisplayLink.h>
-#define RCTPlatformDisplayLink CADisplayLink
+@compatibility_alias RCTPlatformDisplayLink CADisplayLink;
 #else
 
 #import <Foundation/Foundation.h>

packages/react-native/React/RCTUIKit/RCTUIActivityIndicatorView.h

@@ -14,7 +14,7 @@
 #import <React/RCTUIKitCompat.h>
 
 #if !TARGET_OS_OSX
-typedef UIActivityIndicatorView RCTUIActivityIndicatorView;
+@compatibility_alias RCTUIActivityIndicatorView UIActivityIndicatorView;
 #else
 @interface RCTUIActivityIndicatorView : NSProgressIndicator
 NS_ASSUME_NONNULL_BEGIN

packages/react-native/React/RCTUIKit/RCTUIImage.h

@@ -15,11 +15,11 @@
 
 #if !TARGET_OS_OSX
 #import <UIKit/UIKit.h>
-#define RCTPlatformImage UIImage
-#define RCTUIImage UIImage
+@compatibility_alias RCTPlatformImage UIImage;
+@compatibility_alias RCTUIImage UIImage;
 #else
 #import <AppKit/AppKit.h>
-#define RCTPlatformImage NSImage
+@compatibility_alias RCTPlatformImage NSImage;
 #endif
 
 NS_ASSUME_NONNULL_BEGIN

packages/react-native/React/RCTUIKit/RCTUIImageView.h

@@ -15,7 +15,7 @@
 #import <React/RCTUIImage.h>
 
 #if !TARGET_OS_OSX
-typedef UIImageView RCTUIImageView;
+@compatibility_alias RCTUIImageView UIImageView;
 #else
 @interface RCTUIImageView : NSImageView
 NS_ASSUME_NONNULL_BEGIN

packages/react-native/React/RCTUIKit/RCTUIKitCompat.h

@@ -22,14 +22,13 @@ NS_ASSUME_NONNULL_BEGIN
 // MARK: - Color
 
 #if !TARGET_OS_OSX
-#define RCTPlatformColor UIColor
+@compatibility_alias RCTPlatformColor UIColor;
+@compatibility_alias RCTUIColor UIColor;
 #else
-#define RCTPlatformColor NSColor
+@compatibility_alias RCTPlatformColor NSColor;
+@compatibility_alias RCTUIColor NSColor;
 #endif
 
-// Backward compatibility
-#define RCTUIColor RCTPlatformColor
-
 // MARK: - Event types
 
 #if TARGET_OS_OSX
@@ -209,30 +208,28 @@ typedef NS_ENUM(NSInteger, UIActivityIndicatorViewStyle) {
 // MARK: - Gesture recognizer
 
 #if !TARGET_OS_OSX
-#define RCTPlatformPanGestureRecognizer UIPanGestureRecognizer
+@compatibility_alias RCTPlatformPanGestureRecognizer UIPanGestureRecognizer;
+@compatibility_alias RCTUIPanGestureRecognizer UIPanGestureRecognizer;
 #else
 #define UIGestureRecognizer NSGestureRecognizer
 #define UIGestureRecognizerDelegate NSGestureRecognizerDelegate
-#define RCTPlatformPanGestureRecognizer NSPanGestureRecognizer
-#define UIApplication NSApplication
+@compatibility_alias RCTPlatformPanGestureRecognizer NSPanGestureRecognizer;
+@compatibility_alias RCTUIPanGestureRecognizer NSPanGestureRecognizer;
+@compatibility_alias UIApplication NSApplication;
 #endif
 
-// Backward compatibility
-#define RCTUIPanGestureRecognizer RCTPlatformPanGestureRecognizer
-
 // MARK: - Cross-platform typedefs
 
 #if !TARGET_OS_OSX
-typedef UIApplication RCTPlatformApplication;
-typedef UIWindow RCTPlatformWindow;
-typedef UIViewController RCTPlatformViewController;
+@compatibility_alias RCTPlatformApplication UIApplication;
+@compatibility_alias RCTPlatformWindow UIWindow;
+@compatibility_alias RCTPlatformViewController UIViewController;
+@compatibility_alias RCTUIApplication UIApplication;
 #else
-typedef NSApplication RCTPlatformApplication;
-typedef NSWindow RCTPlatformWindow;
-typedef NSViewController RCTPlatformViewController;
+@compatibility_alias RCTPlatformApplication NSApplication;
+@compatibility_alias RCTPlatformWindow NSWindow;
+@compatibility_alias RCTPlatformViewController NSViewController;
+@compatibility_alias RCTUIApplication NSApplication;
 #endif
 
-// Backward compatibility
-#define RCTUIApplication RCTPlatformApplication
-
 NS_ASSUME_NONNULL_END

packages/react-native/React/RCTUIKit/RCTUILabel.h

@@ -14,7 +14,7 @@
 #import <React/RCTUIKitCompat.h>
 
 #if !TARGET_OS_OSX
-typedef UILabel RCTUILabel;
+@compatibility_alias RCTUILabel UILabel;
 #else
 @interface RCTUILabel : NSTextField
 NS_ASSUME_NONNULL_BEGIN

packages/react-native/React/RCTUIKit/RCTUIScrollView.h

@@ -17,7 +17,7 @@
 
 #import <UIKit/UIKit.h>
 
-#define RCTUIScrollView UIScrollView
+@compatibility_alias RCTUIScrollView UIScrollView;
 #define RCTUIScrollViewDelegate UIScrollViewDelegate
 
 #else // TARGET_OS_OSX [

packages/react-native/React/RCTUIKit/RCTUISlider.h

@@ -14,7 +14,7 @@
 #import <React/RCTUIKitCompat.h>
 
 #if !TARGET_OS_OSX
-typedef UISlider RCTUISlider;
+@compatibility_alias RCTUISlider UISlider;
 #else
 @protocol RCTUISliderDelegate;
 

packages/react-native/React/RCTUIKit/RCTUISwitch.h

@@ -14,7 +14,7 @@
 #import <React/RCTUIKitCompat.h>
 
 #if !TARGET_OS_OSX
-typedef UISwitch RCTUISwitch;
+@compatibility_alias RCTUISwitch UISwitch;
 #else
 @interface RCTUISwitch : NSSwitch
 NS_ASSUME_NONNULL_BEGIN