rename flutter_export to flutter_darwin_export to prevent naming conflict (#23933)

2026-02-20 02:29:02 +08:00 · 2021-01-25 16:25:07 -08:00 · 2021-01-25 16:25:07 -08:00 · ecbafdd523
commit ecbafdd523
parent 970e864305
23 changed files with 48 additions and 48 deletions
--- a/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h
@ -42,7 +42,7 @@ typedef int64_t FlutterBinaryMessengerConnection;
 * method calls.
 * - `FlutterEventChannel`, which supports commuication using event streams.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterBinaryMessenger <NSObject>
 /**
 * Sends a binary message to the Flutter side on the specified channel, expecting
--- a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h
@ -32,7 +32,7 @@ typedef void (^FlutterMessageHandler)(id _Nullable message, FlutterReply callbac
 * A channel for communicating with the Flutter side using basic, asynchronous
 * message passing.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterBasicMessageChannel : NSObject
 /**
 * Creates a `FlutterBasicMessageChannel` with the specified name and binary
@ -150,14 +150,14 @@ typedef void (^FlutterMethodCallHandler)(FlutterMethodCall* call, FlutterResult
 * A constant used with `FlutterMethodCallHandler` to respond to the call of an
 * unknown method.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 extern NSObject const* FlutterMethodNotImplemented;

 /**
 * A channel for communicating with the Flutter side using invocation of
 * asynchronous methods.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterMethodChannel : NSObject
 /**
 * Creates a `FlutterMethodChannel` with the specified name and binary messenger.
@ -272,7 +272,7 @@ typedef void (^FlutterEventSink)(id _Nullable event);
 /**
 * A strategy for exposing an event stream to the Flutter side.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterStreamHandler
 /**
 * Sets up an event stream and begin emitting events.
@ -310,13 +310,13 @@ FLUTTER_EXPORT
 /**
 * A constant used with `FlutterEventChannel` to indicate end of stream.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 extern NSObject const* FlutterEndOfEventStream;

 /**
 * A channel for communicating with the Flutter side using event streams.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterEventChannel : NSObject
 /**
 * Creates a `FlutterEventChannel` with the specified name and binary messenger.
--- a/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h
@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 * A message encoding/decoding mechanism.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterMessageCodec
 /**
 * Returns a shared instance of this `FlutterMessageCodec`.
@ -48,7 +48,7 @@ FLUTTER_EXPORT
 *
 * On the Dart side, messages are represented using `ByteData`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterBinaryCodec : NSObject <FlutterMessageCodec>
@end

@ -59,7 +59,7 @@ FLUTTER_EXPORT
 * [StringCodec](https://api.flutter.dev/flutter/services/StringCodec-class.html)
 * on the Dart side. These parts of the Flutter SDK are evolved synchronously.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStringCodec : NSObject <FlutterMessageCodec>
@end

@ -77,7 +77,7 @@ FLUTTER_EXPORT
 * [`dart:convert`](https://api.dartlang.org/stable/dart-convert/JSON-constant.html)
 * package.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterJSONMessageCodec : NSObject <FlutterMessageCodec>
@end

@ -88,7 +88,7 @@ FLUTTER_EXPORT
 *
 * The encoding is extensible via subclasses overriding `writeValue`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStandardWriter : NSObject
 /**
 * Create a `FlutterStandardWriter` who will write to \p data.
@ -128,7 +128,7 @@ FLUTTER_EXPORT
 *
 * The encoding is extensible via subclasses overriding `readValueOfType`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStandardReader : NSObject
 /**
 * Create a new `FlutterStandardReader` who reads from \p data.
@ -168,7 +168,7 @@ FLUTTER_EXPORT
 * A factory of compatible reader/writer instances using the Flutter standard
 * binary encoding or extensions thereof.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStandardReaderWriter : NSObject
 /**
 * Create a new `FlutterStandardWriter` for writing to \p data.
@ -205,7 +205,7 @@ FLUTTER_EXPORT
 * - `NSArray`: `List`
 * - `NSDictionary`: `Map`
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStandardMessageCodec : NSObject <FlutterMessageCodec>
 /**
 * Create a `FlutterStandardMessageCodec` who will read and write to \p readerWriter.
@ -216,7 +216,7 @@ FLUTTER_EXPORT
 /**
 * Command object representing a method call on a `FlutterMethodChannel`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterMethodCall : NSObject
 /**
 * Creates a method call for invoking the specified named method with the
@ -242,7 +242,7 @@ FLUTTER_EXPORT
 * Error object representing an unsuccessful outcome of invoking a method
 * on a `FlutterMethodChannel`, or an error event on a `FlutterEventChannel`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterError : NSObject
 /**
 * Creates a `FlutterError` with the specified error code, message, and details.
@ -293,7 +293,7 @@ typedef NS_ENUM(NSInteger, FlutterStandardDataType) {
 * double-precision representation is used for floats. The platform's native
 * endianness is assumed.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStandardTypedData : NSObject
 /**
 * Creates a `FlutterStandardTypedData` which interprets the specified data
@ -352,7 +352,7 @@ FLUTTER_EXPORT
 * An arbitrarily large integer value, used with `FlutterStandardMessageCodec`
 * and `FlutterStandardMethodCodec`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 FLUTTER_UNAVAILABLE("Unavailable on 2018-08-31. Deprecated on 2018-01-09. "
                    "FlutterStandardBigInteger was needed because the Dart 1.0 int type had no "
                    "size limit. With Dart 2.0, the int type is a fixed-size, 64-bit signed "
@ -376,7 +376,7 @@ FLUTTER_UNAVAILABLE("Unavailable on 2018-08-31. Deprecated on 2018-01-09. "
 * error details `NSObject`, possibly `nil`. These data items are used to
 * populate a `FlutterError`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterMethodCodec
 /**
 * Provides access to a shared instance this codec.
@ -440,7 +440,7 @@ FLUTTER_EXPORT
 * Values supported as methods arguments and result payloads are
 * those supported as top-level or leaf values by `FlutterJSONMessageCodec`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterJSONMethodCodec : NSObject <FlutterMethodCodec>
@end

@ -454,7 +454,7 @@ FLUTTER_EXPORT
 * Values supported as method arguments and result payloads are those supported by
 * `FlutterStandardMessageCodec`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterStandardMethodCodec : NSObject <FlutterMethodCodec>
 /**
 * Create a `FlutterStandardMethodCodec` who will read and write to \p readerWriter.
--- a/shell/platform/darwin/common/framework/Headers/FlutterMacros.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterMacros.h
@ -7,11 +7,11 @@

 #if defined(FLUTTER_FRAMEWORK)

-#define FLUTTER_EXPORT __attribute__((visibility("default")))
+#define FLUTTER_DARWIN_EXPORT __attribute__((visibility("default")))

 #else  // defined(FLUTTER_SDK)

-#define FLUTTER_EXPORT
+#define FLUTTER_DARWIN_EXPORT

 #endif  // defined(FLUTTER_SDK)

--- a/shell/platform/darwin/common/framework/Headers/FlutterTexture.h
+++ b/shell/platform/darwin/common/framework/Headers/FlutterTexture.h
@ -12,7 +12,7 @@

 NS_ASSUME_NONNULL_BEGIN

-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 /**
 * Represents a texture that can be shared with Flutter.
 *
@ -31,7 +31,7 @@ FLUTTER_EXPORT
 - (void)onTextureUnregistered:(NSObject<FlutterTexture>*)texture;
@end

-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 /**
 * A collection of registered `FlutterTexture`'s.
 */
--- a/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h
@ -23,7 +23,7 @@
 * this class. Developers of custom app delegate classes should copy and paste
 * code as necessary from FlutterAppDelegate.mm.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterAppDelegate
    : UIResponder <UIApplicationDelegate, FlutterPluginRegistry, FlutterAppLifeCycleProvider>

--- a/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h
@ -13,7 +13,7 @@
 * An object containing the result of `FlutterCallbackCache`'s `lookupCallbackInformation`
 * method.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterCallbackInformation : NSObject
 /**
 * The name of the callback.
@ -33,7 +33,7 @@ FLUTTER_EXPORT
 * The cache containing callback information for spawning a
 * `FlutterHeadlessDartRunner`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterCallbackCache : NSObject
 /**
 * Returns the callback information for the given callback handle.
--- a/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h
@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 * A set of Flutter and Dart assets used by a `FlutterEngine` to initialize execution.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterDartProject : NSObject

 /**
--- a/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h
@ -55,7 +55,7 @@ extern NSString* const FlutterDefaultInitialRoute;
 * either `-runWithEntrypoint:` or `-runWithEntrypoint:libraryURI` is invoked.
 * One of these methods must be invoked before calling `-setViewController:`.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterEngine : NSObject <FlutterTextureRegistry, FlutterPluginRegistry>

 /**
--- a/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterEngineGroup.h
@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 * @warning This class is a work-in-progress and may change.
 * @see https://github.com/flutter/flutter/issues/72009
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterEngineGroup : NSObject
 - (instancetype)init NS_UNAVAILABLE;

--- a/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h
@ -29,7 +29,7 @@ typedef void (^FlutterHeadlessDartRunnerCallback)(BOOL success);
 * Most callers should prefer using `FlutterEngine` directly; this interface exists
 * for legacy support.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 FLUTTER_DEPRECATED("FlutterEngine should be used rather than FlutterHeadlessDartRunner")
@interface FlutterHeadlessDartRunner : FlutterEngine

--- a/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h
@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (UIView*)view;
@end

-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterPlatformViewFactory <NSObject>
 /**
 * Create a `FlutterPlatformView`.
--- a/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h
@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
 * Propagates `UIAppDelegate` callbacks to registered plugins.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterPluginAppLifeCycleDelegate : NSObject
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
                                               <UNUserNotificationCenterDelegate>
--- a/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
+++ b/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 * The object passed as the sender is the `FlutterViewController` associated
 * with the update.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 extern NSNotificationName const FlutterSemanticsUpdateNotification;

 /**
@ -47,7 +47,7 @@ extern NSNotificationName const FlutterSemanticsUpdateNotification;
 * Dart-related state and asynchronous tasks when navigating back and forth between a
 * FlutterViewController and other `UIViewController`s.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 #ifdef __IPHONE_13_4
@interface FlutterViewController
    : UIViewController <FlutterTextureRegistry, FlutterPluginRegistry, UIPointerInteractionDelegate>
--- a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h
@ -6,7 +6,7 @@
 #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h"

 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 #endif
@interface FlutterBinaryMessengerRelay : NSObject <FlutterBinaryMessenger>
@property(nonatomic, assign) NSObject<FlutterBinaryMessenger>* parent;
--- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h
@ -45,7 +45,7 @@
@end

 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 #endif
@interface FlutterTextInputView : UIView <UITextInput>

--- a/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h
+++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h
@ -14,13 +14,13 @@ namespace flutter {
 class FlutterPlatformViewsController;
 }

-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 extern NSNotificationName const FlutterViewControllerWillDealloc;

-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 extern NSNotificationName const FlutterViewControllerHideHomeIndicator;

-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
 extern NSNotificationName const FlutterViewControllerShowHomeIndicator;

@interface FlutterViewController ()
--- a/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h
@ -24,7 +24,7 @@
 * this class. Developers of custom app delegate classes should copy and paste
 * code as necessary from FlutterAppDelegate.mm.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterAppDelegate : NSObject <NSApplicationDelegate>

 /**
--- a/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h
@ -14,7 +14,7 @@
 *
 * TODO(stuartmorgan): Align API with FlutterDartProject, and combine.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterDartProject : NSObject

 /**
--- a/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h
@ -20,7 +20,7 @@
 /**
 * Coordinates a single instance of execution of a Flutter engine.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterEngine : NSObject <FlutterTextureRegistry, FlutterPluginRegistry>

 /**
--- a/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterPluginMacOS.h
@ -22,7 +22,7 @@
 * Currently the macOS version of FlutterPlugin has very limited functionality, but is expected to
 * expand over time to more closely match the functionality of the iOS FlutterPlugin.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterPlugin <NSObject>

 /**
--- a/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h
@ -20,7 +20,7 @@
 * Currently the macOS PluginRegistrar has very limited functionality, but is expected to expand
 * over time to more closely match the functionality of FlutterPluginRegistrar.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@protocol FlutterPluginRegistrar <NSObject>

 /**
--- a/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h
+++ b/shell/platform/darwin/macos/framework/Headers/FlutterViewController.h
@ -25,7 +25,7 @@ typedef NS_ENUM(NSInteger, FlutterMouseTrackingMode) {
 /**
 * Controls a view that displays Flutter content and manages input.
 */
-FLUTTER_EXPORT
+FLUTTER_DARWIN_EXPORT
@interface FlutterViewController : NSViewController <FlutterPluginRegistry>

 /**