From d939b8435036717bea44b8e224b977c6b6b81688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sharma?=
 <737941+loic-sharma@users.noreply.github.com>
Date: Mon, 4 Nov 2024 12:32:34 -0800
Subject: [PATCH] Remove use_modular_headers! from Swift Podfiles (#156257)

We added `use_modular_headers!` to our `Podfile`s as we originally planned to phase out `use_frameworks!` (see https://github.com/flutter/flutter/pull/42204). However, our plans have now changed and we are instead phasing out CocoaPods entirely in favor of Swift Package Manager.

CocoaPods's `use_frameworks!` and `use_modular_headers!` are two different overlapping options that should not be used together. This change removes the `use_modular_headers!` from the macOS `Podfile` and the iOS Swift `Podfile` (the iOS Objective-C template was recently deprecated https://github.com/flutter/flutter/pull/155867).

This change only affects _new_ Flutter apps. This change does not include an automatic migration as that could break existing apps. Instead, users are encouraged to migrate from CocoaPods to Swift Package Manager.

https://github.com/flutter/flutter/issues/156259
---
 dev/benchmarks/complex_layout/ios/Podfile                    | 1 -
 dev/benchmarks/complex_layout/macos/Podfile                  | 1 -
 dev/benchmarks/macrobenchmarks/macos/Podfile                 | 1 -
 dev/integration_tests/channels/macos/Podfile                 | 1 -
 dev/integration_tests/flavors/macos/Podfile                  | 1 -
 dev/integration_tests/flutter_gallery/macos/Podfile          | 1 -
 dev/integration_tests/ios_app_with_extensions/ios/Podfile    | 2 --
 dev/integration_tests/ui/macos/Podfile                       | 1 -
 examples/api/macos/Podfile                                   | 1 -
 packages/flutter_tools/templates/cocoapods/Podfile-ios-swift | 1 -
 packages/flutter_tools/templates/cocoapods/Podfile-macos     | 1 -
 11 files changed, 12 deletions(-)

diff --git a/dev/benchmarks/complex_layout/ios/Podfile b/dev/benchmarks/complex_layout/ios/Podfile
index 279576f388..01d4aa611b 100644
--- a/dev/benchmarks/complex_layout/ios/Podfile
+++ b/dev/benchmarks/complex_layout/ios/Podfile
@@ -29,7 +29,6 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
diff --git a/dev/benchmarks/complex_layout/macos/Podfile b/dev/benchmarks/complex_layout/macos/Podfile
index 049abe2954..ae77cc1d42 100644
--- a/dev/benchmarks/complex_layout/macos/Podfile
+++ b/dev/benchmarks/complex_layout/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
 end
diff --git a/dev/benchmarks/macrobenchmarks/macos/Podfile b/dev/benchmarks/macrobenchmarks/macos/Podfile
index 049abe2954..ae77cc1d42 100644
--- a/dev/benchmarks/macrobenchmarks/macos/Podfile
+++ b/dev/benchmarks/macrobenchmarks/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
 end
diff --git a/dev/integration_tests/channels/macos/Podfile b/dev/integration_tests/channels/macos/Podfile
index c795730db8..29c8eb3294 100644
--- a/dev/integration_tests/channels/macos/Podfile
+++ b/dev/integration_tests/channels/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/dev/integration_tests/flavors/macos/Podfile b/dev/integration_tests/flavors/macos/Podfile
index d13a68fd42..ab23367c44 100644
--- a/dev/integration_tests/flavors/macos/Podfile
+++ b/dev/integration_tests/flavors/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/dev/integration_tests/flutter_gallery/macos/Podfile b/dev/integration_tests/flutter_gallery/macos/Podfile
index 47c1b18fed..dd603efb98 100644
--- a/dev/integration_tests/flutter_gallery/macos/Podfile
+++ b/dev/integration_tests/flutter_gallery/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
 
diff --git a/dev/integration_tests/ios_app_with_extensions/ios/Podfile b/dev/integration_tests/ios_app_with_extensions/ios/Podfile
index 363dd24038..3bdee419ef 100644
--- a/dev/integration_tests/ios_app_with_extensions/ios/Podfile
+++ b/dev/integration_tests/ios_app_with_extensions/ios/Podfile
@@ -29,7 +29,6 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 end
@@ -37,7 +36,6 @@ end
 target 'watch Extension' do
   platform :watchos
   use_frameworks!
-  use_modular_headers!
 
   pod 'EFQRCode', '6.0'
 end
diff --git a/dev/integration_tests/ui/macos/Podfile b/dev/integration_tests/ui/macos/Podfile
index 049abe2954..ae77cc1d42 100644
--- a/dev/integration_tests/ui/macos/Podfile
+++ b/dev/integration_tests/ui/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
 end
diff --git a/examples/api/macos/Podfile b/examples/api/macos/Podfile
index 049abe2954..ae77cc1d42 100644
--- a/examples/api/macos/Podfile
+++ b/examples/api/macos/Podfile
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
 end
diff --git a/packages/flutter_tools/templates/cocoapods/Podfile-ios-swift b/packages/flutter_tools/templates/cocoapods/Podfile-ios-swift
index d97f17e223..e549ee22f3 100644
--- a/packages/flutter_tools/templates/cocoapods/Podfile-ios-swift
+++ b/packages/flutter_tools/templates/cocoapods/Podfile-ios-swift
@@ -29,7 +29,6 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/packages/flutter_tools/templates/cocoapods/Podfile-macos b/packages/flutter_tools/templates/cocoapods/Podfile-macos
index c795730db8..29c8eb3294 100644
--- a/packages/flutter_tools/templates/cocoapods/Podfile-macos
+++ b/packages/flutter_tools/templates/cocoapods/Podfile-macos
@@ -28,7 +28,6 @@ flutter_macos_podfile_setup
 
 target 'Runner' do
   use_frameworks!
-  use_modular_headers!
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do