use_modular_headers (#42204)

dev/benchmarks/macrobenchmarks/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/integration_tests/android_views/ios/Podfile

@@ -33,6 +33,8 @@ def parse_KV_file(file, separator='=')
 end
 
 target 'Runner' do
+  use_modular_headers!
+
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.
   system('rm -rf .symlinks')

dev/integration_tests/android_views/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/integration_tests/channels/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

dev/integration_tests/channels/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @interface Pair : NSObject
 @property(atomic, readonly, strong, nullable) NSObject* left;

dev/integration_tests/codegen/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/integration_tests/external_ui/ios/Runner/AppDelegate.m

@@ -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 "AppDelegate.h"
+#import "AppDelegate.h"
 
 @interface AppDelegate ()
   @property (atomic) uint64_t textureId;

dev/integration_tests/flavors/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/integration_tests/ios_add2app/Podfile

@@ -5,6 +5,7 @@ flutter_application_path = 'flutterapp/'
 load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
 
 target 'ios_add2app' do
+  use_modular_headers!
   install_all_flutter_pods(flutter_application_path)
 end
 

dev/integration_tests/ios_host_app/Host/ViewController.m

@@ -1,6 +1,11 @@
 #import "ViewController.h"
-#import <Flutter/Flutter.h>
-#import <FlutterPluginRegistrant/GeneratedPluginRegistrant.h>
+
+@import Flutter;
+@import FlutterPluginRegistrant;
+
+// Prove plugins can be module-imported from the host app.
+@import device_info;
+@import google_maps_flutter;
 
 @implementation ViewController
 

dev/integration_tests/ios_host_app/Podfile

@@ -4,5 +4,6 @@ flutter_application_path = '../hello'
 load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
 
 target 'Host' do
+  use_modular_headers!
   install_all_flutter_pods flutter_application_path
 end

dev/integration_tests/ios_host_app_swift/Host/AppDelegate.swift

@@ -1,5 +1,9 @@
 import UIKit
 
+// Prove plugins can be module-imported from the host app.
+import device_info
+import google_maps_flutter
+
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
   func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {

dev/integration_tests/ios_host_app_swift/Podfile

@@ -4,5 +4,6 @@ flutter_application_path = '../hello'
 load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
 
 target 'Host' do
+  use_modular_headers!
   install_all_flutter_pods flutter_application_path
 end

dev/integration_tests/platform_interaction/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/integration_tests/release_smoke_test/ios/Podfile

@@ -33,6 +33,8 @@ def parse_KV_file(file, separator='=')
 end
 
 target 'Runner' do
+  use_modular_headers!
+  
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.
   system('rm -rf .symlinks')

dev/integration_tests/release_smoke_test/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/integration_tests/ui/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

dev/manual_tests/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

dev/manual_tests/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

examples/catalog/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

examples/flutter_gallery/ios/Podfile

@@ -27,6 +27,8 @@ def parse_KV_file(file,separator='=')
 end
 
 target 'Runner' do
+  use_modular_headers!
+  
   # Flutter Pods
   pod 'Flutter', :path => ENV['FLUTTER_FRAMEWORK_DIR']
   

examples/flutter_gallery/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

examples/flutter_view/ios/Podfile

@@ -7,6 +7,7 @@ install! 'cocoapods', :disable_input_output_paths => true
 target 'Runner' do
   # Uncomment this line if you're using Swift or would like to use dynamic frameworks
    use_frameworks!
+   use_modular_headers!
 
   # Pods for Runner
   pod 'MaterialControls', '~> 1.2.2'

examples/flutter_view/ios/Runner/AppDelegate.m

@@ -1,4 +1,4 @@
-#include "AppDelegate.h"
+#import "AppDelegate.h"
 #import <Flutter/Flutter.h>
 
 @implementation AppDelegate

examples/hello_world/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

examples/hello_world/ios/Runner/GeneratedPluginRegistrant.h

@@ -7,8 +7,11 @@
 
 #import <Flutter/Flutter.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface GeneratedPluginRegistrant : NSObject
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
 @end
 
+NS_ASSUME_NONNULL_END
 #endif /* GeneratedPluginRegistrant_h */

examples/image_list/ios/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

examples/layers/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

examples/platform_view/ios/Podfile

@@ -27,6 +27,8 @@ def parse_KV_file(file, separator='=')
 end
 
 target 'Runner' do
+  use_modular_headers!
+  
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.
   system('rm -rf .symlinks')

examples/platform_view/ios/Runner/AppDelegate.m

@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
-#include "PlatformViewController.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
+#import "PlatformViewController.h"
 
 @implementation AppDelegate {
   FlutterResult _flutterResult;

examples/stocks/ios/Runner/AppDelegate.m

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

packages/flutter_tools/lib/src/plugins.dart

@@ -454,10 +454,13 @@ const String _objcPluginRegistryHeaderTemplate = '''//
 
 #import <{{framework}}/{{framework}}.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface GeneratedPluginRegistrant : NSObject
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
 @end
 
+NS_ASSUME_NONNULL_END
 #endif /* GeneratedPluginRegistrant_h */
 ''';
 
@@ -466,10 +469,15 @@ const String _objcPluginRegistryImplementationTemplate = '''//
 //
 
 #import "GeneratedPluginRegistrant.h"
-{{#plugins}}
-#import <{{name}}/{{class}}.h>
-{{/plugins}}
 
+{{#plugins}}
+#if __has_include(<{{name}}/{{class}}.h>)
+#import <{{name}}/{{class}}.h>
+#else
+@import {{name}};
+#endif
+
+{{/plugins}}
 @implementation GeneratedPluginRegistrant
 
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {

packages/flutter_tools/templates/app/ios-objc.tmpl/Runner/AppDelegate.m

@@ -1,5 +1,5 @@
-#include "AppDelegate.h"
-#include "GeneratedPluginRegistrant.h"
+#import "AppDelegate.h"
+#import "GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate
 

packages/flutter_tools/templates/cocoapods/Podfile-ios-objc

@@ -33,6 +33,8 @@ def parse_KV_file(file, separator='=')
 end
 
 target 'Runner' do
+  use_modular_headers!
+  
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.
   system('rm -rf .symlinks')

packages/flutter_tools/templates/cocoapods/Podfile-ios-swift

@@ -34,6 +34,7 @@ end
 
 target 'Runner' do
   use_frameworks!
+  use_modular_headers!
 
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.

packages/flutter_tools/templates/cocoapods/Podfile-macos

@@ -44,6 +44,7 @@ end
 
 target 'Runner' do
   use_frameworks!
+  use_modular_headers!
 
   # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
   # referring to absolute paths on developers' machines.

packages/flutter_tools/templates/module/ios/host_app_ephemeral/Runner.tmpl/AppDelegate.m

@@ -1,4 +1,4 @@
-#include "AppDelegate.h"
+#import "AppDelegate.h"
 
 @implementation AppDelegate
 

packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Podfile.copy.tmpl

@@ -6,6 +6,8 @@ load File.join(flutter_application_path, '.ios', 'Flutter', 'podhelper.rb')
 use_frameworks!
 
 target 'Runner' do
+  use_modular_headers!
+  
   install_flutter_engine_pod
   install_flutter_plugin_pods flutter_application_path
 end

packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Runner.tmpl/AppDelegate.m

@@ -1,4 +1,4 @@
-#include "AppDelegate.h"
+#import "AppDelegate.h"
 #import "FlutterPluginRegistrant/GeneratedPluginRegistrant.h"
 
 @implementation AppDelegate