From 19a7fbf02f492842ecfdf711df5e05a9d2019137 Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Mon, 6 Apr 2020 13:23:00 -0700 Subject: [PATCH] Fixed nullability in plugin header and overridden type mismatch error. (#17532) --- shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h | 2 +- .../darwin/ios/framework/Source/FlutterAppDelegate.mm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h b/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h index 81d03d7ea..06d20498a 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h @@ -398,7 +398,7 @@ typedef enum { * * @param pluginKey The unique key identifying the plugin. */ -- (NSObject*)registrarForPlugin:(NSString*)pluginKey; +- (nullable NSObject*)registrarForPlugin:(NSString*)pluginKey; /** * Returns whether the specified plugin has been registered. * diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm index 42a4081cc..204261cf2 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm @@ -8,6 +8,8 @@ #include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" #include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h" +#pragma GCC diagnostic error "-Woverriding-method-mismatch" + static NSString* kUIBackgroundMode = @"UIBackgroundModes"; static NSString* kRemoteNotificationCapabitiliy = @"remote-notification"; static NSString* kBackgroundFetchCapatibility = @"fetch"; @@ -201,7 +203,7 @@ static NSString* kBackgroundFetchCapatibility = @"fetch"; #pragma mark - Selectors handling -- (void)addApplicationLifeCycleDelegate:(NSObject*)delegate { +- (void)addApplicationLifeCycleDelegate:(NSObject*)delegate { [_lifeCycleDelegate addDelegate:delegate]; } -- GitLab