From 2cd1753c6c7202c335f03ba7978c0fa1baeeedbb Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 15 Sep 2020 18:44:09 -0700 Subject: [PATCH] [darwin] Header #import hygiene (#21193) This patch applies the following changes: * Rename a stray .cc file to .mm (connection_collection.cc). * Migrate Objective-C #includes to #import as per the style guide. * #include/#import order updated to reflect the style guide order: associated header, system/standard library headers, library headers, platform-specific includes. * Include cstring where we're using strlen. * Add a missing copyright header in SemanticsObjectTest.mm. Bugs: https://github.com/flutter/flutter/issues/60025 --- ci/licenses_golden/licenses_flutter | 2 +- .../darwin/common/buffer_conversions.mm | 2 +- shell/platform/darwin/common/command_line.h | 1 + shell/platform/darwin/common/command_line.mm | 2 +- .../Headers/FlutterBinaryMessenger.h | 2 +- .../framework/Headers/FlutterChannels.h | 4 +-- .../common/framework/Headers/FlutterCodecs.h | 3 +- .../common/framework/Headers/FlutterTexture.h | 2 +- .../framework/Source/FlutterChannels.mm | 2 +- .../framework/Source/FlutterChannelsTest.m | 3 +- .../common/framework/Source/FlutterCodecs.mm | 4 ++- .../framework/Source/FlutterStandardCodec.mm | 2 +- .../Source/FlutterStandardCodec_Internal.h | 2 +- .../Source/flutter_codecs_unittest.mm | 3 +- .../Source/flutter_standard_codec_unittest.mm | 3 +- shell/platform/darwin/ios/BUILD.gn | 2 +- .../darwin/ios/framework/Headers/Flutter.h | 28 +++++++++---------- .../framework/Headers/FlutterAppDelegate.h | 4 +-- .../framework/Headers/FlutterCallbackCache.h | 2 +- .../framework/Headers/FlutterDartProject.h | 2 +- .../ios/framework/Headers/FlutterEngine.h | 10 +++---- .../Headers/FlutterHeadlessDartRunner.h | 8 +++--- .../ios/framework/Headers/FlutterPlugin.h | 10 +++---- .../FlutterPluginAppLifeCycleDelegate.h | 2 +- .../framework/Headers/FlutterViewController.h | 12 ++++---- .../framework/Source/FlutterAppDelegate.mm | 9 +++--- .../Source/FlutterBinaryMessengerRelayTest.mm | 6 ++-- .../Source/FlutterCallbackCache_Internal.h | 2 +- .../framework/Source/FlutterDartProject.mm | 6 ++-- .../Source/FlutterDartProjectTest.mm | 1 + .../Source/FlutterDartProject_Internal.h | 2 +- .../ios/framework/Source/FlutterEngine.mm | 7 ++--- .../Source/FlutterEnginePlatformViewTest.mm | 2 +- .../ios/framework/Source/FlutterEngineTest.mm | 3 +- .../framework/Source/FlutterEngine_Internal.h | 16 +++++------ .../Source/FlutterHeadlessDartRunner.mm | 13 ++++----- .../ios/framework/Source/FlutterOverlayView.h | 10 +++---- .../framework/Source/FlutterOverlayView.mm | 8 +++--- .../framework/Source/FlutterPlatformPlugin.h | 4 +-- .../framework/Source/FlutterPlatformPlugin.mm | 15 +++++----- .../Source/FlutterPlatformPluginTest.mm | 2 +- .../framework/Source/FlutterPlatformViews.mm | 11 ++++---- .../Source/FlutterPlatformViewsTest.mm | 2 +- .../Source/FlutterPlatformViews_Internal.h | 10 +++---- .../Source/FlutterPlatformViews_Internal.mm | 4 +-- .../FlutterPluginAppLifeCycleDelegate.mm | 7 +++-- .../FlutterPluginAppLifeCycleDelegateTest.m | 5 ++-- .../framework/Source/FlutterTextInputPlugin.h | 4 +-- .../Source/FlutterTextInputPlugin.mm | 9 +++--- .../Source/FlutterTextInputPluginTest.m | 8 ++++-- .../darwin/ios/framework/Source/FlutterView.h | 9 +++--- .../ios/framework/Source/FlutterView.mm | 8 +++--- .../Source/FlutterViewControllerTest.mm | 4 +-- .../Source/FlutterViewController_Internal.h | 3 +- .../darwin/ios/framework/Source/IOKit.h | 4 +-- .../ios/framework/Source/SemanticsObject.h | 2 +- .../ios/framework/Source/SemanticsObject.mm | 4 +-- .../framework/Source/SemanticsObjectTest.mm | 8 ++++-- .../framework/Source/accessibility_bridge.h | 16 +++++------ .../framework/Source/accessibility_bridge.mm | 2 +- .../Source/accessibility_bridge_test.mm | 2 +- .../Source/accessibility_text_entry.mm | 4 +-- ...collection.cc => connection_collection.mm} | 14 ++++------ .../Source/platform_message_response_darwin.h | 2 +- .../platform_message_response_darwin.mm | 2 +- .../Source/platform_message_router.h | 2 +- .../Source/platform_message_router.mm | 4 +-- .../framework/Source/profiler_metrics_ios.mm | 6 ++-- .../ios/framework/Source/vsync_waiter_ios.mm | 2 +- shell/platform/darwin/ios/ios_context.h | 4 +-- shell/platform/darwin/ios/ios_context.mm | 8 +++--- shell/platform/darwin/ios/ios_context_gl.h | 6 ++-- shell/platform/darwin/ios/ios_context_gl.mm | 4 +-- shell/platform/darwin/ios/ios_context_metal.h | 2 +- .../platform/darwin/ios/ios_context_metal.mm | 4 +-- .../darwin/ios/ios_context_software.h | 2 +- .../darwin/ios/ios_context_software.mm | 2 +- .../darwin/ios/ios_external_texture_gl.h | 2 +- .../darwin/ios/ios_external_texture_gl.mm | 4 +-- .../darwin/ios/ios_external_texture_metal.h | 2 +- .../darwin/ios/ios_external_texture_metal.mm | 2 +- .../darwin/ios/ios_render_target_gl.h | 2 +- .../darwin/ios/ios_render_target_gl.mm | 2 +- shell/platform/darwin/ios/ios_surface.mm | 8 +++--- shell/platform/darwin/ios/ios_surface_gl.h | 6 ++-- shell/platform/darwin/ios/ios_surface_gl.mm | 4 +-- shell/platform/darwin/ios/ios_surface_metal.h | 2 +- .../platform/darwin/ios/ios_surface_metal.mm | 4 +-- .../darwin/ios/ios_surface_software.h | 4 +-- .../darwin/ios/ios_surface_software.mm | 2 +- .../darwin/ios/ios_switchable_gl_context.mm | 3 +- shell/platform/darwin/ios/platform_view_ios.h | 16 +++++------ .../platform/darwin/ios/platform_view_ios.mm | 2 +- .../darwin/ios/rendering_api_selection.mm | 2 +- .../framework/Headers/FlutterAppDelegate.h | 2 +- .../framework/Headers/FlutterDartProject.h | 2 +- .../macos/framework/Headers/FlutterEngine.h | 10 +++---- .../Headers/FlutterPluginRegistrarMacOS.h | 3 +- .../Source/FlutterEngineUnittests.mm | 6 ++-- .../Source/FlutterViewControllerTest.mm | 9 +++--- 100 files changed, 264 insertions(+), 248 deletions(-) rename shell/platform/darwin/ios/framework/Source/{connection_collection.cc => connection_collection.mm} (70%) diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index f0f0ce4a1..988b85631 100755 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -969,8 +969,8 @@ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_ FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm -FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.cc FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h +FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection.mm FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/connection_collection_test.mm FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h FILE: ../../../flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm diff --git a/shell/platform/darwin/common/buffer_conversions.mm b/shell/platform/darwin/common/buffer_conversions.mm index 943ff57c2..69e81de46 100644 --- a/shell/platform/darwin/common/buffer_conversions.mm +++ b/shell/platform/darwin/common/buffer_conversions.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/common/buffer_conversions.h" +#import "flutter/shell/platform/darwin/common/buffer_conversions.h" namespace flutter { diff --git a/shell/platform/darwin/common/command_line.h b/shell/platform/darwin/common/command_line.h index e3c6eecb5..807b8faae 100644 --- a/shell/platform/darwin/common/command_line.h +++ b/shell/platform/darwin/common/command_line.h @@ -6,6 +6,7 @@ #define FLUTTER_SHELL_PLATFORM_DARWIN_COMMON_COMMAND_LINE_H_ #include "flutter/fml/command_line.h" + #include "flutter/fml/macros.h" namespace flutter { diff --git a/shell/platform/darwin/common/command_line.mm b/shell/platform/darwin/common/command_line.mm index 6b601fae3..55533103c 100644 --- a/shell/platform/darwin/common/command_line.mm +++ b/shell/platform/darwin/common/command_line.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/common/command_line.h" +#import "flutter/shell/platform/darwin/common/command_line.h" #import diff --git a/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h b/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h index 3ce459921..ec1949df5 100644 --- a/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h +++ b/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h @@ -7,7 +7,7 @@ #import -#include "FlutterMacros.h" +#import "FlutterMacros.h" NS_ASSUME_NONNULL_BEGIN /** diff --git a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h index 5c1d5c607..540128307 100644 --- a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h +++ b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h @@ -5,8 +5,8 @@ #ifndef FLUTTER_FLUTTERCHANNELS_H_ #define FLUTTER_FLUTTERCHANNELS_H_ -#include "FlutterBinaryMessenger.h" -#include "FlutterCodecs.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterCodecs.h" NS_ASSUME_NONNULL_BEGIN /** diff --git a/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h b/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h index 1390c9af8..8bbab3bda 100644 --- a/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h +++ b/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h @@ -6,7 +6,8 @@ #define FLUTTER_FLUTTERCODECS_H_ #import -#include "FlutterMacros.h" + +#import "FlutterMacros.h" NS_ASSUME_NONNULL_BEGIN diff --git a/shell/platform/darwin/common/framework/Headers/FlutterTexture.h b/shell/platform/darwin/common/framework/Headers/FlutterTexture.h index 7c3435c83..54ab0623b 100644 --- a/shell/platform/darwin/common/framework/Headers/FlutterTexture.h +++ b/shell/platform/darwin/common/framework/Headers/FlutterTexture.h @@ -8,7 +8,7 @@ #import #import -#include "FlutterMacros.h" +#import "FlutterMacros.h" NS_ASSUME_NONNULL_BEGIN diff --git a/shell/platform/darwin/common/framework/Source/FlutterChannels.mm b/shell/platform/darwin/common/framework/Source/FlutterChannels.mm index a4a6fb58c..d225a2ee8 100644 --- a/shell/platform/darwin/common/framework/Source/FlutterChannels.mm +++ b/shell/platform/darwin/common/framework/Source/FlutterChannels.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. // FLUTTER_NOLINT -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" #pragma mark - Basic message channel diff --git a/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m b/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m index d95b905ca..3c52bddf8 100644 --- a/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m +++ b/shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m @@ -6,9 +6,10 @@ #error ARC must be enabled! #endif +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" + #import #import -#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" @interface MockBinaryMessenger : NSObject @property(nonatomic, copy) NSString* channel; diff --git a/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm b/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm index 8f517a4f1..3f5379165 100644 --- a/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm +++ b/shell/platform/darwin/common/framework/Source/FlutterCodecs.mm @@ -3,7 +3,9 @@ // found in the LICENSE file. // FLUTTER_NOLINT -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" + +#include @implementation FlutterBinaryCodec + (instancetype)sharedInstance { diff --git a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm index 79636695a..a76ec3672 100644 --- a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm +++ b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. // FLUTTER_NOLINT -#include "FlutterStandardCodec_Internal.h" +#import "flutter/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h" #pragma mark - Codec for basic message channel diff --git a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h index 62cfd0aa9..4cd871084 100644 --- a/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h +++ b/shell/platform/darwin/common/framework/Source/FlutterStandardCodec_Internal.h @@ -5,7 +5,7 @@ #ifndef SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_ #define SHELL_PLATFORM_DARWIN_COMMON_FRAMEWORK_SOURCE_FLUTTERSTANDARDCODECINTERNAL_H_ -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" typedef NS_ENUM(NSInteger, FlutterStandardField) { FlutterStandardFieldNil, diff --git a/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm b/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm index 34d0d08ba..ee515934f 100644 --- a/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm +++ b/shell/platform/darwin/common/framework/Source/flutter_codecs_unittest.mm @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" + #include "gtest/gtest.h" TEST(FlutterStringCodec, CanEncodeAndDecodeNil) { diff --git a/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm b/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm index 6e7dd6e72..5095dc273 100644 --- a/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm +++ b/shell/platform/darwin/common/framework/Source/flutter_standard_codec_unittest.mm @@ -3,7 +3,8 @@ // found in the LICENSE file. // FLUTTER_NOLINT -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterCodecs.h" + #include "gtest/gtest.h" void checkEncodeDecode(id value, NSData* expectedEncoding) { diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn index 327dfdd16..e66f17645 100644 --- a/shell/platform/darwin/ios/BUILD.gn +++ b/shell/platform/darwin/ios/BUILD.gn @@ -75,8 +75,8 @@ source_set("flutter_framework_source") { "framework/Source/accessibility_bridge.mm", "framework/Source/accessibility_text_entry.h", "framework/Source/accessibility_text_entry.mm", - "framework/Source/connection_collection.cc", "framework/Source/connection_collection.h", + "framework/Source/connection_collection.mm", "framework/Source/platform_message_response_darwin.h", "framework/Source/platform_message_response_darwin.mm", "framework/Source/platform_message_router.h", diff --git a/shell/platform/darwin/ios/framework/Headers/Flutter.h b/shell/platform/darwin/ios/framework/Headers/Flutter.h index d91eba757..964096280 100644 --- a/shell/platform/darwin/ios/framework/Headers/Flutter.h +++ b/shell/platform/darwin/ios/framework/Headers/Flutter.h @@ -5,19 +5,19 @@ #ifndef FLUTTER_FLUTTER_H_ #define FLUTTER_FLUTTER_H_ -#include "FlutterAppDelegate.h" -#include "FlutterBinaryMessenger.h" -#include "FlutterCallbackCache.h" -#include "FlutterChannels.h" -#include "FlutterCodecs.h" -#include "FlutterDartProject.h" -#include "FlutterEngine.h" -#include "FlutterHeadlessDartRunner.h" -#include "FlutterMacros.h" -#include "FlutterPlatformViews.h" -#include "FlutterPlugin.h" -#include "FlutterPluginAppLifeCycleDelegate.h" -#include "FlutterTexture.h" -#include "FlutterViewController.h" +#import "FlutterAppDelegate.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterCallbackCache.h" +#import "FlutterChannels.h" +#import "FlutterCodecs.h" +#import "FlutterDartProject.h" +#import "FlutterEngine.h" +#import "FlutterHeadlessDartRunner.h" +#import "FlutterMacros.h" +#import "FlutterPlatformViews.h" +#import "FlutterPlugin.h" +#import "FlutterPluginAppLifeCycleDelegate.h" +#import "FlutterTexture.h" +#import "FlutterViewController.h" #endif // FLUTTER_FLUTTER_H_ diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h b/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h index 8684a22ea..ff050b94b 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h @@ -7,8 +7,8 @@ #import -#include "FlutterMacros.h" -#include "FlutterPlugin.h" +#import "FlutterMacros.h" +#import "FlutterPlugin.h" /** * `UIApplicationDelegate` subclass for simple apps that want default behavior. diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h b/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h index 8849dca01..78bdb4ae1 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h @@ -7,7 +7,7 @@ #import -#include "FlutterMacros.h" +#import "FlutterMacros.h" /** * An object containing the result of `FlutterCallbackCache`'s `lookupCallbackInformation` diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h b/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h index 6df32a6b5..ff3a54b17 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h @@ -7,7 +7,7 @@ #import -#include "FlutterMacros.h" +#import "FlutterMacros.h" NS_ASSUME_NONNULL_BEGIN diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h b/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h index 87b775331..98ccb8354 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h @@ -8,11 +8,11 @@ #import #import -#include "FlutterBinaryMessenger.h" -#include "FlutterDartProject.h" -#include "FlutterMacros.h" -#include "FlutterPlugin.h" -#include "FlutterTexture.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterDartProject.h" +#import "FlutterMacros.h" +#import "FlutterPlugin.h" +#import "FlutterTexture.h" @class FlutterViewController; diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h b/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h index 1994cfc81..40bc84d82 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h @@ -7,10 +7,10 @@ #import -#include "FlutterBinaryMessenger.h" -#include "FlutterDartProject.h" -#include "FlutterEngine.h" -#include "FlutterMacros.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterDartProject.h" +#import "FlutterEngine.h" +#import "FlutterMacros.h" /** * A callback for when FlutterHeadlessDartRunner has attempted to start a Dart diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h b/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h index 2073d4b6f..9d3a9a2c5 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h @@ -8,11 +8,11 @@ #import #import -#include "FlutterBinaryMessenger.h" -#include "FlutterChannels.h" -#include "FlutterCodecs.h" -#include "FlutterPlatformViews.h" -#include "FlutterTexture.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterChannels.h" +#import "FlutterCodecs.h" +#import "FlutterPlatformViews.h" +#import "FlutterTexture.h" NS_ASSUME_NONNULL_BEGIN @protocol FlutterPluginRegistrar; diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h b/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h index 95a4f2334..21fa6e508 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_ #define FLUTTER_FLUTTERPLUGINAPPLIFECYCLEDELEGATE_H_ -#include "FlutterPlugin.h" +#import "FlutterPlugin.h" NS_ASSUME_NONNULL_BEGIN diff --git a/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h b/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h index 4468ce7ea..8491708fa 100644 --- a/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h +++ b/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h @@ -8,12 +8,12 @@ #import #include -#include "FlutterBinaryMessenger.h" -#include "FlutterDartProject.h" -#include "FlutterEngine.h" -#include "FlutterMacros.h" -#include "FlutterPlugin.h" -#include "FlutterTexture.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterDartProject.h" +#import "FlutterEngine.h" +#import "FlutterMacros.h" +#import "FlutterPlugin.h" +#import "FlutterTexture.h" NS_ASSUME_NONNULL_BEGIN diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm index 3a6d113b5..d1834c3a4 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h" + #include "flutter/fml/logging.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate_internal.h" static NSString* kUIBackgroundMode = @"UIBackgroundModes"; static NSString* kRemoteNotificationCapabitiliy = @"remote-notification"; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm index a0a0753d6..f4e6374a9 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelayTest.mm @@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h" + #import #import -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" -#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h" + +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" FLUTTER_ASSERT_ARC diff --git a/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h index 5bb2e7bf7..bc4219c14 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h @@ -5,7 +5,7 @@ #ifndef FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_ #define FLUTTER_FLUTTERCALLBACKCACHE_INTERNAL_H_ -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h" @interface FlutterCallbackCache () diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm index f080460f9..62b9c23c4 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm @@ -4,7 +4,7 @@ #define FML_USED_ON_EMBEDDER -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" #include "flutter/common/task_runners.h" #include "flutter/fml/mapping.h" @@ -13,8 +13,8 @@ #include "flutter/runtime/dart_vm.h" #include "flutter/shell/common/shell.h" #include "flutter/shell/common/switches.h" -#include "flutter/shell/platform/darwin/common/command_line.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" +#import "flutter/shell/platform/darwin/common/command_line.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" extern "C" { #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm index eed1bd9cc..0a3dff7db 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProjectTest.mm @@ -3,6 +3,7 @@ // found in the LICENSE file. #import + #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" FLUTTER_ASSERT_ARC diff --git a/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h index daac68e66..b5570a321 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h @@ -8,7 +8,7 @@ #include "flutter/common/settings.h" #include "flutter/runtime/platform_data.h" #include "flutter/shell/common/engine.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterDartProject.h" NS_ASSUME_NONNULL_BEGIN diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm index 1d715b01d..61966fd85 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm @@ -17,10 +17,7 @@ #include "flutter/shell/common/shell.h" #include "flutter/shell/common/switches.h" #include "flutter/shell/common/thread_host.h" -#include "flutter/shell/platform/darwin/common/command_line.h" -#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h" -#include "flutter/shell/profiling/sampling_profiler.h" - +#import "flutter/shell/platform/darwin/common/command_line.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterObservatoryPublisher.h" @@ -32,6 +29,8 @@ #import "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h" #import "flutter/shell/platform/darwin/ios/ios_surface.h" #import "flutter/shell/platform/darwin/ios/platform_view_ios.h" +#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h" +#include "flutter/shell/profiling/sampling_profiler.h" NSString* const FlutterDefaultDartEntrypoint = nil; NSString* const FlutterDefaultInitialRoute = nil; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm index 1e4045913..a202eba4d 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEnginePlatformViewTest.mm @@ -7,7 +7,7 @@ #import #import -#import "flutter/fml/message_loop.h" +#include "flutter/fml/message_loop.h" #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h" #import "flutter/shell/platform/darwin/ios/platform_view_ios.h" diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm index e7a68f9a7..656f6f55b 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEngineTest.mm @@ -4,7 +4,8 @@ #import #import -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" + +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterBinaryMessengerRelay.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Test.h" diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h index 93e6cbac5..54a2c7547 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h @@ -7,8 +7,6 @@ #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h" -#import "FlutterPlatformViews_Internal.h" - #include "flutter/fml/memory/weak_ptr.h" #include "flutter/fml/task_runner.h" #include "flutter/lib/ui/window/pointer_data_packet.h" @@ -16,13 +14,13 @@ #include "flutter/shell/common/platform_view.h" #include "flutter/shell/common/rasterizer.h" #include "flutter/shell/common/shell.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" -#include "flutter/shell/platform/darwin/ios/platform_view_ios.h" - -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" +#import "flutter/shell/platform/darwin/ios/platform_view_ios.h" @interface FlutterEngine () diff --git a/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm b/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm index 6299e9e68..71c62522a 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterHeadlessDartRunner.mm @@ -4,8 +4,6 @@ #define FML_USED_ON_EMBEDDER -#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h" - #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterHeadlessDartRunner.h" #include @@ -18,11 +16,12 @@ #include "flutter/shell/common/shell.h" #include "flutter/shell/common/switches.h" #include "flutter/shell/common/thread_host.h" -#include "flutter/shell/platform/darwin/common/command_line.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h" -#include "flutter/shell/platform/darwin/ios/platform_view_ios.h" +#import "flutter/shell/platform/darwin/common/command_line.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterDartProject_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h" +#import "flutter/shell/platform/darwin/ios/platform_view_ios.h" @implementation FlutterHeadlessDartRunner { } diff --git a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h index 088959e69..cb56163c6 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h @@ -9,13 +9,13 @@ #include -#import "FlutterPlatformViews_Internal.h" - #include "flutter/fml/memory/weak_ptr.h" #include "flutter/shell/common/shell.h" -#include "flutter/shell/platform/darwin/ios/ios_context_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_context_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" + +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" /// UIViews that are used by |FlutterPlatformViews| to present Flutter /// rendering on top of system compositor rendering (ex. a web view). diff --git a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm index 4127061f3..f6a0cd823 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h" #include "flutter/common/settings.h" #include "flutter/common/task_runners.h" @@ -12,9 +12,9 @@ #include "flutter/fml/trace_event.h" #include "flutter/shell/common/platform_view.h" #include "flutter/shell/common/rasterizer.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_software.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_software.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" // This is mostly a duplication of FlutterView. diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h index e5466d04a..41dd485dc 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h @@ -6,8 +6,8 @@ #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTERPLATFORMPLUGIN_H_ #include "flutter/fml/memory/weak_ptr.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h" @interface FlutterPlatformPlugin : NSObject - (instancetype)init NS_UNAVAILABLE; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm index 87db2313d..b4d7f4f00 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.mm @@ -2,14 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h" -#include "flutter/fml/logging.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h" + +#import +#import +#import +#import -#include -#include -#include -#include +#include "flutter/fml/logging.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" namespace { diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm index 01f3ca4e6..691d627c3 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformPluginTest.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import #import #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformPlugin.h" #import "flutter/shell/platform/darwin/ios/platform_view_ios.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" @interface FlutterPlatformPluginTest : XCTestCase @end diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm index 2056880ae..7f732f7b4 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm @@ -4,20 +4,19 @@ #import -#import "FlutterOverlayView.h" -#import "flutter/shell/platform/darwin/ios/ios_surface.h" -#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" - #include #include #include #include -#include "FlutterPlatformViews_Internal.h" #include "flutter/flow/rtree.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/common/persistent_cache.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterOverlayView.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" namespace flutter { diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm index 39d6b987d..283a86cf2 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViewsTest.mm @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import #import #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" @@ -11,7 +12,6 @@ #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" #import "flutter/shell/platform/darwin/ios/platform_view_ios.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" FLUTTER_ASSERT_NOT_ARC @class FlutterPlatformViewsTestMockPlatformView; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h index f8c01083f..f0867bc4b 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h @@ -9,11 +9,11 @@ #include "flutter/flow/rtree.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/common/shell.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlatformViews.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPlugin.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" #include "third_party/skia/include/core/SkPictureRecorder.h" @class FlutterTouchInterceptingView; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm index 0179debf2..ff92a7a33 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" #include "flutter/fml/platform/darwin/cf_utils.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" static int kMaxPointsInVerb = 4; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm index 8358551a3..424d1eaef 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegate.mm @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h" + #include "flutter/fml/logging.h" #include "flutter/fml/paths.h" #include "flutter/lib/ui/plugins/callback_cache.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterCallbackCache_Internal.h" static const char* kCallbackCacheSubDir = "Library/Caches/"; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.m b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.m index 2a5e05370..da2cc2007 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.m +++ b/shell/platform/darwin/ios/framework/Source/FlutterPluginAppLifeCycleDelegateTest.m @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import #import -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" + +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterPluginAppLifeCycleDelegate.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" FLUTTER_ASSERT_ARC diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h index c5571ee10..cd611e003 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h @@ -7,8 +7,8 @@ #import -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputDelegate.h" @interface FlutterTextInputPlugin : NSObject diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm index ca276ab99..8dc527469 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.mm @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" -#include "flutter/fml/platform/darwin/string_range_sanitization.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" + +#import +#import -#include -#include +#include "flutter/fml/platform/darwin/string_range_sanitization.h" static const char _kTextAffinityDownstream[] = "TextAffinity.downstream"; static const char _kTextAffinityUpstream[] = "TextAffinity.upstream"; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m index f62f665fb..09bfda1b8 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m +++ b/shell/platform/darwin/ios/framework/Source/FlutterTextInputPluginTest.m @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" + +#import #import -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" + +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterEngine.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" FLUTTER_ASSERT_ARC diff --git a/shell/platform/darwin/ios/framework/Source/FlutterView.h b/shell/platform/darwin/ios/framework/Source/FlutterView.h index b767ceb6e..2806c3359 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterView.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterView.h @@ -5,16 +5,15 @@ #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_ #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_FLUTTER_VIEW_H_ -#include +#import #include -#import "FlutterPlatformViews_Internal.h" - #include "flutter/fml/memory/weak_ptr.h" #include "flutter/shell/common/shell.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" @protocol FlutterViewEngineDelegate diff --git a/shell/platform/darwin/ios/framework/Source/FlutterView.mm b/shell/platform/darwin/ios/framework/Source/FlutterView.mm index 707aa737f..8fb97f683 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterView.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterView.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" #include "flutter/common/settings.h" #include "flutter/common/task_runners.h" @@ -12,9 +12,9 @@ #include "flutter/fml/trace_event.h" #include "flutter/shell/common/platform_view.h" #include "flutter/shell/common/rasterizer.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_software.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_software.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" @implementation FlutterView { diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm index 2418ea58b..f15ea3766 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewControllerTest.mm @@ -4,12 +4,12 @@ #import #import + +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" -#include "FlutterBinaryMessenger.h" - FLUTTER_ASSERT_ARC @interface FlutterEngine () diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h index b1ffc01ae..367da8b80 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h @@ -6,7 +6,8 @@ #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_FLUTTERVIEWCONTROLLER_INTERNAL_H_ #include "flutter/fml/memory/weak_ptr.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" + +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" namespace flutter { class FlutterPlatformViewsController; diff --git a/shell/platform/darwin/ios/framework/Source/IOKit.h b/shell/platform/darwin/ios/framework/Source/IOKit.h index 6f95655ca..6b177a8e2 100644 --- a/shell/platform/darwin/ios/framework/Source/IOKit.h +++ b/shell/platform/darwin/ios/framework/Source/IOKit.h @@ -14,9 +14,9 @@ #ifndef FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_IOKIT_H_ #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_FRAMEWORK_SOURCE_IOKIT_H_ -#if __cplusplus +#if defined(__cplusplus) extern "C" { -#endif // __cplusplus +#endif // defined(__cplusplus) #include #include diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.h b/shell/platform/darwin/ios/framework/Source/SemanticsObject.h index 793d8981b..dded845d7 100644 --- a/shell/platform/darwin/ios/framework/Source/SemanticsObject.h +++ b/shell/platform/darwin/ios/framework/Source/SemanticsObject.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/memory/weak_ptr.h" #include "flutter/lib/ui/semantics/semantics_node.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h" constexpr int32_t kRootNodeId = 0; diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm index ba2f8abbd..546e9c5c2 100644 --- a/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm +++ b/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" namespace { diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm index ee5540508..6234130c4 100644 --- a/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm +++ b/shell/platform/darwin/ios/framework/Source/SemanticsObjectTest.mm @@ -1,8 +1,12 @@ +// Copyright 2013 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import #import -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterMacros.h" #import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" FLUTTER_ASSERT_ARC diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h index 3d0fdeb84..7a6d2ff5d 100644 --- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h +++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h @@ -5,24 +5,24 @@ #ifndef SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_ #define SHELL_PLATFORM_IOS_FRAMEWORK_SOURCE_ACCESSIBILITY_BRIDGE_H_ +#import + #include #include #include #include -#import - #include "flutter/fml/macros.h" #include "flutter/fml/memory/weak_ptr.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/lib/ui/semantics/custom_accessibility_action.h" #include "flutter/lib/ui/semantics/semantics_node.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterChannels.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterTextInputPlugin.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/SemanticsObject.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h" #include "third_party/skia/include/core/SkRect.h" namespace flutter { diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm index ca4b2618a..bad9aca0f 100644 --- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm +++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge.mm @@ -3,10 +3,10 @@ // found in the LICENSE file. #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h" + #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterEngine_Internal.h" #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterViewController_Internal.h" #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h" - #import "flutter/shell/platform/darwin/ios/platform_view_ios.h" #pragma GCC diagnostic error "-Wundeclared-selector" diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm index e554cb333..7f73bc0a5 100644 --- a/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm +++ b/shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#import #import #import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" @@ -10,7 +11,6 @@ #import "flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h" #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h" #import "flutter/shell/platform/darwin/ios/platform_view_ios.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" FLUTTER_ASSERT_NOT_ARC @class MockPlatformView; diff --git a/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm b/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm index f39f19174..d9bf1cb86 100644 --- a/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm +++ b/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.mm @@ -4,8 +4,8 @@ #import -#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_text_entry.h" static const UIAccessibilityTraits UIAccessibilityTraitUndocumentedEmptyLine = 0x800000000000; diff --git a/shell/platform/darwin/ios/framework/Source/connection_collection.cc b/shell/platform/darwin/ios/framework/Source/connection_collection.mm similarity index 70% rename from shell/platform/darwin/ios/framework/Source/connection_collection.cc rename to shell/platform/darwin/ios/framework/Source/connection_collection.mm index be042b7dd..fc9e73410 100644 --- a/shell/platform/darwin/ios/framework/Source/connection_collection.cc +++ b/shell/platform/darwin/ios/framework/Source/connection_collection.mm @@ -2,18 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/connection_collection.h" namespace flutter { -ConnectionCollection::Connection ConnectionCollection::AquireConnection( - const std::string& name) { +ConnectionCollection::Connection ConnectionCollection::AquireConnection(const std::string& name) { Connection nextConnection = ++counter_; connections_[name] = nextConnection; return nextConnection; } -std::string ConnectionCollection::CleanupConnection( - ConnectionCollection::Connection connection) { +std::string ConnectionCollection::CleanupConnection(ConnectionCollection::Connection connection) { if (connection > 0) { std::string channel; for (auto& keyValue : connections_) { @@ -30,13 +28,11 @@ std::string ConnectionCollection::CleanupConnection( return ""; } -bool ConnectionCollection::IsValidConnection( - ConnectionCollection::Connection connection) { +bool ConnectionCollection::IsValidConnection(ConnectionCollection::Connection connection) { return connection > 0; } -ConnectionCollection::Connection ConnectionCollection::MakeErrorConnection( - int errCode) { +ConnectionCollection::Connection ConnectionCollection::MakeErrorConnection(int errCode) { if (errCode < 0) { return -1 * errCode; } diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h index ca18f6c4e..8db0d7dfd 100644 --- a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h +++ b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h @@ -12,7 +12,7 @@ #include "flutter/fml/platform/darwin/scoped_block.h" #include "flutter/fml/task_runner.h" #include "flutter/lib/ui/window/platform_message_response.h" -#include "flutter/shell/platform/darwin/common/buffer_conversions.h" +#import "flutter/shell/platform/darwin/common/buffer_conversions.h" typedef void (^PlatformMessageResponseCallback)(NSData*); diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm index 89f0f2d58..e7e09855c 100644 --- a/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm +++ b/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_response_darwin.h" namespace flutter { diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_router.h b/shell/platform/darwin/ios/framework/Source/platform_message_router.h index b4915bd6b..ef80878dc 100644 --- a/shell/platform/darwin/ios/framework/Source/platform_message_router.h +++ b/shell/platform/darwin/ios/framework/Source/platform_message_router.h @@ -10,7 +10,7 @@ #include "flutter/fml/memory/weak_ptr.h" #include "flutter/fml/platform/darwin/scoped_block.h" #include "flutter/lib/ui/window/platform_message.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterBinaryMessenger.h" namespace flutter { diff --git a/shell/platform/darwin/ios/framework/Source/platform_message_router.mm b/shell/platform/darwin/ios/framework/Source/platform_message_router.mm index 0f8d09794..8fb81cc4a 100644 --- a/shell/platform/darwin/ios/framework/Source/platform_message_router.mm +++ b/shell/platform/darwin/ios/framework/Source/platform_message_router.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h" #include -#include "flutter/shell/platform/darwin/common/buffer_conversions.h" +#import "flutter/shell/platform/darwin/common/buffer_conversions.h" namespace flutter { diff --git a/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.mm b/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.mm index 6433b1529..05ffca34d 100644 --- a/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.mm +++ b/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.mm @@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/profiler_metrics_ios.h" + #import -#import "IOKit.h" + +#import "flutter/shell/platform/darwin/ios/framework/Source/IOKit.h" namespace { diff --git a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm index 63564239d..8d5d8138d 100644 --- a/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm +++ b/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h" #include diff --git a/shell/platform/darwin/ios/ios_context.h b/shell/platform/darwin/ios/ios_context.h index f3def03f3..21ffc8001 100644 --- a/shell/platform/darwin/ios/ios_context.h +++ b/shell/platform/darwin/ios/ios_context.h @@ -11,8 +11,8 @@ #include "flutter/flow/texture.h" #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" -#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" +#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h" #include "third_party/skia/include/gpu/GrDirectContext.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_context.mm b/shell/platform/darwin/ios/ios_context.mm index 4cdd22a9f..0472ba6fc 100644 --- a/shell/platform/darwin/ios/ios_context.mm +++ b/shell/platform/darwin/ios/ios_context.mm @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" #include "flutter/fml/logging.h" -#include "flutter/shell/platform/darwin/ios/ios_context_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_context_software.h" +#import "flutter/shell/platform/darwin/ios/ios_context_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_context_software.h" #if FLUTTER_SHELL_ENABLE_METAL -#include "flutter/shell/platform/darwin/ios/ios_context_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_context_metal.h" #endif // FLUTTER_SHELL_ENABLE_METAL namespace flutter { diff --git a/shell/platform/darwin/ios/ios_context_gl.h b/shell/platform/darwin/ios/ios_context_gl.h index 1adea8235..69260e190 100644 --- a/shell/platform/darwin/ios/ios_context_gl.h +++ b/shell/platform/darwin/ios/ios_context_gl.h @@ -8,9 +8,9 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/common/platform_view.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" -#include "flutter/shell/platform/darwin/ios/ios_context_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_render_target_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_context_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_render_target_gl.h" @class CAEAGLLayer; diff --git a/shell/platform/darwin/ios/ios_context_gl.mm b/shell/platform/darwin/ios/ios_context_gl.mm index d34c78a18..4de8f1193 100644 --- a/shell/platform/darwin/ios/ios_context_gl.mm +++ b/shell/platform/darwin/ios/ios_context_gl.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_context_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_context_gl.h" #import #include "flutter/shell/common/shell_io_manager.h" #include "flutter/shell/gpu/gpu_surface_gl_delegate.h" -#include "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_context_metal.h b/shell/platform/darwin/ios/ios_context_metal.h index 8a3387c92..79d177fdc 100644 --- a/shell/platform/darwin/ios/ios_context_metal.h +++ b/shell/platform/darwin/ios/ios_context_metal.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/cf_utils.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" #include "third_party/skia/include/gpu/GrDirectContext.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_context_metal.mm b/shell/platform/darwin/ios/ios_context_metal.mm index 0f7aac0e2..a41d3d4c0 100644 --- a/shell/platform/darwin/ios/ios_context_metal.mm +++ b/shell/platform/darwin/ios/ios_context_metal.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_context_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_context_metal.h" #include "flutter/fml/logging.h" #include "flutter/shell/common/persistent_cache.h" -#include "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h" #include "third_party/skia/include/gpu/GrContextOptions.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_context_software.h b/shell/platform/darwin/ios/ios_context_software.h index e2ac59d0e..4407be603 100644 --- a/shell/platform/darwin/ios/ios_context_software.h +++ b/shell/platform/darwin/ios/ios_context_software.h @@ -6,7 +6,7 @@ #define FLUTTER_SHELL_PLATFORM_DARWIN_IOS_IOS_CONTEXT_SOFTWARE_H_ #include "flutter/fml/macros.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_context_software.mm b/shell/platform/darwin/ios/ios_context_software.mm index 12c191f79..261fdc44a 100644 --- a/shell/platform/darwin/ios/ios_context_software.mm +++ b/shell/platform/darwin/ios/ios_context_software.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_context_software.h" +#import "flutter/shell/platform/darwin/ios/ios_context_software.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.h b/shell/platform/darwin/ios/ios_external_texture_gl.h index 6a63357a7..09220a3d3 100644 --- a/shell/platform/darwin/ios/ios_external_texture_gl.h +++ b/shell/platform/darwin/ios/ios_external_texture_gl.h @@ -8,7 +8,7 @@ #include "flutter/flow/texture.h" #include "flutter/fml/platform/darwin/cf_utils.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_external_texture_gl.mm b/shell/platform/darwin/ios/ios_external_texture_gl.mm index 627da33f0..688e3072e 100644 --- a/shell/platform/darwin/ios/ios_external_texture_gl.mm +++ b/shell/platform/darwin/ios/ios_external_texture_gl.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_external_texture_gl.h" #import #import #import -#include "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h" #include "third_party/skia/include/core/SkSurface.h" #include "third_party/skia/include/core/SkYUVAIndex.h" #include "third_party/skia/include/gpu/GrBackendSurface.h" diff --git a/shell/platform/darwin/ios/ios_external_texture_metal.h b/shell/platform/darwin/ios/ios_external_texture_metal.h index 90e9e9574..ac0deb103 100644 --- a/shell/platform/darwin/ios/ios_external_texture_metal.h +++ b/shell/platform/darwin/ios/ios_external_texture_metal.h @@ -13,7 +13,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/cf_utils.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" #include "third_party/skia/include/core/SkImage.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_external_texture_metal.mm b/shell/platform/darwin/ios/ios_external_texture_metal.mm index 058a4738c..859022bc0 100644 --- a/shell/platform/darwin/ios/ios_external_texture_metal.mm +++ b/shell/platform/darwin/ios/ios_external_texture_metal.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_external_texture_metal.h" #include "flutter/fml/logging.h" #include "third_party/skia/include/core/SkYUVAIndex.h" diff --git a/shell/platform/darwin/ios/ios_render_target_gl.h b/shell/platform/darwin/ios/ios_render_target_gl.h index dc0b0a2fa..f2c972f94 100644 --- a/shell/platform/darwin/ios/ios_render_target_gl.h +++ b/shell/platform/darwin/ios/ios_render_target_gl.h @@ -13,7 +13,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/common/platform_view.h" -#include "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h" +#import "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_render_target_gl.mm b/shell/platform/darwin/ios/ios_render_target_gl.mm index a8972822f..28fb24263 100644 --- a/shell/platform/darwin/ios/ios_render_target_gl.mm +++ b/shell/platform/darwin/ios/ios_render_target_gl.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_render_target_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_render_target_gl.h" #include diff --git a/shell/platform/darwin/ios/ios_surface.mm b/shell/platform/darwin/ios/ios_surface.mm index bcdb233ce..1583e0c41 100644 --- a/shell/platform/darwin/ios/ios_surface.mm +++ b/shell/platform/darwin/ios/ios_surface.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_surface_software.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_software.h" #if FLUTTER_SHELL_ENABLE_METAL -#include "flutter/shell/platform/darwin/ios/ios_surface_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_metal.h" #endif // FLUTTER_SHELL_ENABLE_METAL namespace flutter { diff --git a/shell/platform/darwin/ios/ios_surface_gl.h b/shell/platform/darwin/ios/ios_surface_gl.h index 79e453445..ca40ffed4 100644 --- a/shell/platform/darwin/ios/ios_surface_gl.h +++ b/shell/platform/darwin/ios/ios_surface_gl.h @@ -8,9 +8,9 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/gpu/gpu_surface_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" -#include "flutter/shell/platform/darwin/ios/ios_render_target_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_render_target_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" @class CAEAGLLayer; diff --git a/shell/platform/darwin/ios/ios_surface_gl.mm b/shell/platform/darwin/ios/ios_surface_gl.mm index 6178e73f0..3565365f7 100644 --- a/shell/platform/darwin/ios/ios_surface_gl.mm +++ b/shell/platform/darwin/ios/ios_surface_gl.mm @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_surface_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_gl.h" #include "flutter/fml/trace_event.h" #include "flutter/shell/gpu/gpu_surface_gl.h" -#include "flutter/shell/platform/darwin/ios/ios_context_gl.h" +#import "flutter/shell/platform/darwin/ios/ios_context_gl.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_surface_metal.h b/shell/platform/darwin/ios/ios_surface_metal.h index 6b3534493..7d1e4d5d1 100644 --- a/shell/platform/darwin/ios/ios_surface_metal.h +++ b/shell/platform/darwin/ios/ios_surface_metal.h @@ -7,7 +7,7 @@ #include "flutter/fml/macros.h" #include "flutter/shell/gpu/gpu_surface_delegate.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" @class CAMetalLayer; diff --git a/shell/platform/darwin/ios/ios_surface_metal.mm b/shell/platform/darwin/ios/ios_surface_metal.mm index df0d2739c..e7e4d12fc 100644 --- a/shell/platform/darwin/ios/ios_surface_metal.mm +++ b/shell/platform/darwin/ios/ios_surface_metal.mm @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_surface_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_metal.h" #include "flutter/shell/gpu/gpu_surface_metal.h" -#include "flutter/shell/platform/darwin/ios/ios_context_metal.h" +#import "flutter/shell/platform/darwin/ios/ios_context_metal.h" namespace flutter { diff --git a/shell/platform/darwin/ios/ios_surface_software.h b/shell/platform/darwin/ios/ios_surface_software.h index e8fd6832a..59242f358 100644 --- a/shell/platform/darwin/ios/ios_surface_software.h +++ b/shell/platform/darwin/ios/ios_surface_software.h @@ -9,8 +9,8 @@ #include "flutter/fml/macros.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/gpu/gpu_surface_software.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" @class CALayer; diff --git a/shell/platform/darwin/ios/ios_surface_software.mm b/shell/platform/darwin/ios/ios_surface_software.mm index 03e85aec6..1363bfea9 100644 --- a/shell/platform/darwin/ios/ios_surface_software.mm +++ b/shell/platform/darwin/ios/ios_surface_software.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_surface_software.h" +#import "flutter/shell/platform/darwin/ios/ios_surface_software.h" #include diff --git a/shell/platform/darwin/ios/ios_switchable_gl_context.mm b/shell/platform/darwin/ios/ios_switchable_gl_context.mm index 279db9c0e..895ce2128 100644 --- a/shell/platform/darwin/ios/ios_switchable_gl_context.mm +++ b/shell/platform/darwin/ios/ios_switchable_gl_context.mm @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h" +#import "flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h" + #import namespace flutter { diff --git a/shell/platform/darwin/ios/platform_view_ios.h b/shell/platform/darwin/ios/platform_view_ios.h index 16e79448d..8e63bbda2 100644 --- a/shell/platform/darwin/ios/platform_view_ios.h +++ b/shell/platform/darwin/ios/platform_view_ios.h @@ -12,14 +12,14 @@ #include "flutter/fml/memory/weak_ptr.h" #include "flutter/fml/platform/darwin/scoped_nsobject.h" #include "flutter/shell/common/platform_view.h" -#include "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" -#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h" -#include "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h" -#include "flutter/shell/platform/darwin/ios/ios_context.h" -#include "flutter/shell/platform/darwin/ios/ios_surface.h" -#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h" +#import "flutter/shell/platform/darwin/common/framework/Headers/FlutterTexture.h" +#import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterView.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge.h" +#import "flutter/shell/platform/darwin/ios/framework/Source/platform_message_router.h" +#import "flutter/shell/platform/darwin/ios/ios_context.h" +#import "flutter/shell/platform/darwin/ios/ios_surface.h" +#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h" @class FlutterViewController; diff --git a/shell/platform/darwin/ios/platform_view_ios.mm b/shell/platform/darwin/ios/platform_view_ios.mm index e36a3bb7c..faf764be7 100644 --- a/shell/platform/darwin/ios/platform_view_ios.mm +++ b/shell/platform/darwin/ios/platform_view_ios.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/platform_view_ios.h" +#import "flutter/shell/platform/darwin/ios/platform_view_ios.h" #include diff --git a/shell/platform/darwin/ios/rendering_api_selection.mm b/shell/platform/darwin/ios/rendering_api_selection.mm index fd3ef0c29..6ee84bcc6 100644 --- a/shell/platform/darwin/ios/rendering_api_selection.mm +++ b/shell/platform/darwin/ios/rendering_api_selection.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "flutter/shell/platform/darwin/ios/rendering_api_selection.h" +#import "flutter/shell/platform/darwin/ios/rendering_api_selection.h" #include #include diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h b/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h index d5a736efd..46e06f4bc 100644 --- a/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h +++ b/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h @@ -7,7 +7,7 @@ #import -#include "FlutterMacros.h" +#import "FlutterMacros.h" /** * `NSApplicationDelegate` subclass for simple apps that want default behavior. diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h b/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h index fe35a5272..ea35b15f7 100644 --- a/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h +++ b/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h @@ -7,7 +7,7 @@ #import -#include "FlutterMacros.h" +#import "FlutterMacros.h" /** * A set of Flutter and Dart assets used by a `FlutterEngine` to initialize execution. diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h b/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h index 23b2eb556..3ebbd16fd 100644 --- a/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h +++ b/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h @@ -7,11 +7,11 @@ #import -#include "FlutterBinaryMessenger.h" -#include "FlutterDartProject.h" -#include "FlutterMacros.h" -#include "FlutterPluginRegistrarMacOS.h" -#include "FlutterTexture.h" +#import "FlutterBinaryMessenger.h" +#import "FlutterDartProject.h" +#import "FlutterMacros.h" +#import "FlutterPluginRegistrarMacOS.h" +#import "FlutterTexture.h" // TODO: Merge this file with the iOS FlutterEngine.h. diff --git a/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h b/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h index bd760823a..f428355c5 100644 --- a/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h +++ b/shell/platform/darwin/macos/framework/Headers/FlutterPluginRegistrarMacOS.h @@ -4,11 +4,10 @@ #import -#import "FlutterPluginMacOS.h" - #import "FlutterBinaryMessenger.h" #import "FlutterChannels.h" #import "FlutterMacros.h" +#import "FlutterPluginMacOS.h" #import "FlutterTexture.h" // TODO: Merge this file and FlutterPluginMacOS.h with the iOS FlutterPlugin.h, sharing all but diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngineUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngineUnittests.mm index e960c84cd..2637db3a8 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEngineUnittests.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEngineUnittests.mm @@ -3,9 +3,9 @@ // found in the LICENSE file. // FLUTTER_NOLINT -#include "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h" -#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h" -#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" +#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h" +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h" +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" #include "flutter/testing/testing.h" namespace flutter::testing { diff --git a/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm b/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm index 505a573c0..e696393b5 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm @@ -4,11 +4,12 @@ #import "flutter/shell/platform/darwin/macos/framework/Source/FlutterViewController_Internal.h" -#include "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h" -#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h" -#include "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" +#import + +#import "flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h" +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterDartProject_Internal.h" +#import "flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h" #include "flutter/testing/testing.h" -#import "third_party/ocmock/Source/OCMock/OCMock.h" namespace flutter::testing { -- GitLab