From 66f6dc8ca692890f5e8ebccc157f8c05f8c0458c Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Thu, 23 May 2019 16:29:33 -0700 Subject: [PATCH] Update macOS code for the plugin API rename FLEPlugin* was renamed FlutterPlugin*; this updates all the runner and plugin code for that change. --- example/macos/PluginRegistrant.h | 2 +- example/macos/PluginRegistrant.m | 2 +- plugins/color_panel/macos/FLEColorPanelPlugin.h | 2 +- plugins/color_panel/macos/FLEColorPanelPlugin.mm | 2 +- plugins/example_plugin/macos/Classes/FDEExamplePlugin.h | 2 +- plugins/example_plugin/macos/Classes/FDEExamplePlugin.m | 2 +- plugins/file_chooser/macos/FLEFileChooserPlugin.h | 2 +- plugins/file_chooser/macos/FLEFileChooserPlugin.mm | 4 ++-- plugins/menubar/macos/FLEMenubarPlugin.h | 2 +- plugins/menubar/macos/FLEMenubarPlugin.mm | 4 ++-- plugins/window_size/macos/FLEWindowSizePlugin.h | 2 +- plugins/window_size/macos/FLEWindowSizePlugin.mm | 2 +- testbed/macos/PluginRegistrant.h | 2 +- testbed/macos/PluginRegistrant.m | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/example/macos/PluginRegistrant.h b/example/macos/PluginRegistrant.h index 11447afe2..5ccd52b3a 100644 --- a/example/macos/PluginRegistrant.h +++ b/example/macos/PluginRegistrant.h @@ -15,5 +15,5 @@ #import @interface PluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; ++ (void)registerWithRegistry:(NSObject*)registry; @end diff --git a/example/macos/PluginRegistrant.m b/example/macos/PluginRegistrant.m index 9cbe3e1d8..837e7dcfe 100644 --- a/example/macos/PluginRegistrant.m +++ b/example/macos/PluginRegistrant.m @@ -20,7 +20,7 @@ @implementation PluginRegistrant -+ (void)registerWithRegistry:(NSObject*)registry { ++ (void)registerWithRegistry:(NSObject*)registry { // Add your plugin regitration here. } diff --git a/plugins/color_panel/macos/FLEColorPanelPlugin.h b/plugins/color_panel/macos/FLEColorPanelPlugin.h index a34761430..ed79c7577 100644 --- a/plugins/color_panel/macos/FLEColorPanelPlugin.h +++ b/plugins/color_panel/macos/FLEColorPanelPlugin.h @@ -20,6 +20,6 @@ * A FlutterPlugin to manage macOS's shared NSColorPanel singleton. * Responsible for managing the panel's display state and sending selected color data to Flutter. */ -@interface FLEColorPanelPlugin : NSObject +@interface FLEColorPanelPlugin : NSObject @end diff --git a/plugins/color_panel/macos/FLEColorPanelPlugin.mm b/plugins/color_panel/macos/FLEColorPanelPlugin.mm index df64e3625..e5d39e57b 100644 --- a/plugins/color_panel/macos/FLEColorPanelPlugin.mm +++ b/plugins/color_panel/macos/FLEColorPanelPlugin.mm @@ -23,7 +23,7 @@ @implementation FLEColorPanelPlugin { FlutterMethodChannel *_channel; } -+ (void)registerWithRegistrar:(id)registrar { ++ (void)registerWithRegistrar:(id)registrar { FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:@(plugins_color_panel::kChannelName) binaryMessenger:registrar.messenger]; diff --git a/plugins/example_plugin/macos/Classes/FDEExamplePlugin.h b/plugins/example_plugin/macos/Classes/FDEExamplePlugin.h index 85b3f297b..c0a3f25b9 100644 --- a/plugins/example_plugin/macos/Classes/FDEExamplePlugin.h +++ b/plugins/example_plugin/macos/Classes/FDEExamplePlugin.h @@ -19,6 +19,6 @@ /** * An example Flutter plugin for macOS. */ -@interface FDEExamplePlugin : NSObject +@interface FDEExamplePlugin : NSObject @end diff --git a/plugins/example_plugin/macos/Classes/FDEExamplePlugin.m b/plugins/example_plugin/macos/Classes/FDEExamplePlugin.m index 7fe53f424..1cb9227f7 100644 --- a/plugins/example_plugin/macos/Classes/FDEExamplePlugin.m +++ b/plugins/example_plugin/macos/Classes/FDEExamplePlugin.m @@ -16,7 +16,7 @@ @implementation FDEExamplePlugin -+ (void)registerWithRegistrar:(id)registrar { ++ (void)registerWithRegistrar:(id)registrar { FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:@"example_plugin" binaryMessenger:registrar.messenger]; FDEExamplePlugin *instance = [[FDEExamplePlugin alloc] init]; diff --git a/plugins/file_chooser/macos/FLEFileChooserPlugin.h b/plugins/file_chooser/macos/FLEFileChooserPlugin.h index d5e6f132c..20eed34cd 100644 --- a/plugins/file_chooser/macos/FLEFileChooserPlugin.h +++ b/plugins/file_chooser/macos/FLEFileChooserPlugin.h @@ -21,6 +21,6 @@ * Responsible for creating and showing instances of NSSavePanel or NSOpenPanel and sending * selected file paths to flutter clients, via system channels. */ -@interface FLEFileChooserPlugin : NSObject +@interface FLEFileChooserPlugin : NSObject @end diff --git a/plugins/file_chooser/macos/FLEFileChooserPlugin.mm b/plugins/file_chooser/macos/FLEFileChooserPlugin.mm index ff80865ab..41e1e8377 100644 --- a/plugins/file_chooser/macos/FLEFileChooserPlugin.mm +++ b/plugins/file_chooser/macos/FLEFileChooserPlugin.mm @@ -76,9 +76,9 @@ - (void)configureOpenPanel:(nonnull NSOpenPanel *)panel } } -#pragma FLEPlugin implementation +#pragma FlutterPlugin implementation -+ (void)registerWithRegistrar:(id)registrar { ++ (void)registerWithRegistrar:(id)registrar { FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:@(plugins_file_chooser::kChannelName) binaryMessenger:registrar.messenger]; diff --git a/plugins/menubar/macos/FLEMenubarPlugin.h b/plugins/menubar/macos/FLEMenubarPlugin.h index 164d8f18b..d5496962a 100644 --- a/plugins/menubar/macos/FLEMenubarPlugin.h +++ b/plugins/menubar/macos/FLEMenubarPlugin.h @@ -19,7 +19,7 @@ /** * A Flutter plugin to control the native menu bar. */ -@interface FLEMenubarPlugin : NSObject +@interface FLEMenubarPlugin : NSObject /** * The menu item that Flutter-provided menus should be inserted after. If unset, Flutter-provided diff --git a/plugins/menubar/macos/FLEMenubarPlugin.mm b/plugins/menubar/macos/FLEMenubarPlugin.mm index 5b0eba8bd..3d0717d2d 100644 --- a/plugins/menubar/macos/FLEMenubarPlugin.mm +++ b/plugins/menubar/macos/FLEMenubarPlugin.mm @@ -114,9 +114,9 @@ - (void)flutterMenuItemSelected:(id)sender { [_channel invokeMethod:@(plugins_menubar::kMenuItemSelectedCallbackMethod) arguments:@(item.tag)]; } -#pragma FLEPlugin implementation +#pragma FlutterPlugin implementation -+ (void)registerWithRegistrar:(id)registrar { ++ (void)registerWithRegistrar:(id)registrar { FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:@(plugins_menubar::kChannelName) binaryMessenger:registrar.messenger]; diff --git a/plugins/window_size/macos/FLEWindowSizePlugin.h b/plugins/window_size/macos/FLEWindowSizePlugin.h index 6190b224a..1d5af890d 100644 --- a/plugins/window_size/macos/FLEWindowSizePlugin.h +++ b/plugins/window_size/macos/FLEWindowSizePlugin.h @@ -20,6 +20,6 @@ * A FlutterPlugin to manage macOS's shared NSColorPanel singleton. * Responsible for managing the panel's display state and sending selected color data to Flutter. */ -@interface FLEWindowSizePlugin : NSObject +@interface FLEWindowSizePlugin : NSObject @end diff --git a/plugins/window_size/macos/FLEWindowSizePlugin.mm b/plugins/window_size/macos/FLEWindowSizePlugin.mm index d52c0fdec..3513e82c3 100644 --- a/plugins/window_size/macos/FLEWindowSizePlugin.mm +++ b/plugins/window_size/macos/FLEWindowSizePlugin.mm @@ -66,7 +66,7 @@ @implementation FLEWindowSizePlugin { NSView *_flutterView; } -+ (void)registerWithRegistrar:(id)registrar { ++ (void)registerWithRegistrar:(id)registrar { FlutterMethodChannel *channel = [FlutterMethodChannel methodChannelWithName:@(plugins_window_size::kChannelName) binaryMessenger:registrar.messenger]; diff --git a/testbed/macos/PluginRegistrant.h b/testbed/macos/PluginRegistrant.h index 11447afe2..5ccd52b3a 100644 --- a/testbed/macos/PluginRegistrant.h +++ b/testbed/macos/PluginRegistrant.h @@ -15,5 +15,5 @@ #import @interface PluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; ++ (void)registerWithRegistry:(NSObject*)registry; @end diff --git a/testbed/macos/PluginRegistrant.m b/testbed/macos/PluginRegistrant.m index c8512cc8b..3063f9ec5 100644 --- a/testbed/macos/PluginRegistrant.m +++ b/testbed/macos/PluginRegistrant.m @@ -26,7 +26,7 @@ @implementation PluginRegistrant -+ (void)registerWithRegistry:(NSObject*)registry { ++ (void)registerWithRegistry:(NSObject*)registry { [FDEExamplePlugin registerWithRegistrar:[registry registrarForPlugin:@"FDEExamplePlugin"]]; [FLEColorPanelPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLEColorPanelPlugin"]]; [FLEFileChooserPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLEFileChooserPlugin"]];