From 534dba8661fc039509061e03364448741b279748 Mon Sep 17 00:00:00 2001 From: Greg Spencer Date: Mon, 6 Mar 2023 15:40:03 -0800 Subject: [PATCH 1/2] Fix imports for FlutterApplication --- .../darwin/macos/framework/Source/FlutterApplication.mm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm b/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm index 5667dfa1f5a37..2ff927b80cb8e 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm @@ -5,10 +5,11 @@ #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterApplication.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterApplication_Internal.h" +#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h" +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h" +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" + #include "flutter/shell/platform/embedder/embedder.h" -#import "shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h" -#import "shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h" -#import "shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" // An NSApplication subclass that implements overrides necessary for some // Flutter features, like application lifecycle handling. From 99e947ed1150ef6937f58d0472789ecbb1c85b44 Mon Sep 17 00:00:00 2001 From: Greg Spencer Date: Mon, 6 Mar 2023 16:04:22 -0800 Subject: [PATCH 2/2] Remove extra line --- .../platform/darwin/macos/framework/Source/FlutterApplication.mm | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm b/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm index 2ff927b80cb8e..62c3a65338914 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterApplication.mm @@ -8,7 +8,6 @@ #import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate_Internal.h" #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" - #include "flutter/shell/platform/embedder/embedder.h" // An NSApplication subclass that implements overrides necessary for some