diff --git a/dev/benchmarks/macrobenchmarks/ios/Flutter/Debug.xcconfig b/dev/benchmarks/macrobenchmarks/ios/Flutter/Debug.xcconfig index e8efba11468..ec97fc6f302 100644 --- a/dev/benchmarks/macrobenchmarks/ios/Flutter/Debug.xcconfig +++ b/dev/benchmarks/macrobenchmarks/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/dev/benchmarks/macrobenchmarks/ios/Flutter/Release.xcconfig b/dev/benchmarks/macrobenchmarks/ios/Flutter/Release.xcconfig index 399e9340e6f..c4855bfe200 100644 --- a/dev/benchmarks/macrobenchmarks/ios/Flutter/Release.xcconfig +++ b/dev/benchmarks/macrobenchmarks/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Debug.xcconfig b/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Debug.xcconfig index 785633d3a86..4b81f9b2d20 100644 --- a/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Debug.xcconfig +++ b/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Release.xcconfig b/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Release.xcconfig index 5fba960c3af..5caa9d1579e 100644 --- a/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Release.xcconfig +++ b/dev/benchmarks/macrobenchmarks/macos/Flutter/Flutter-Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Debug.xcconfig b/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Debug.xcconfig index e8efba11468..ec97fc6f302 100644 --- a/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Debug.xcconfig +++ b/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Release.xcconfig b/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Release.xcconfig index 399e9340e6f..c4855bfe200 100644 --- a/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Release.xcconfig +++ b/dev/integration_tests/flutter_driver_screenshot_test/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/dev/integration_tests/flutter_gallery/ios/Flutter/Debug.xcconfig b/dev/integration_tests/flutter_gallery/ios/Flutter/Debug.xcconfig index 9803018ca79..f5ba6d46215 100644 --- a/dev/integration_tests/flutter_gallery/ios/Flutter/Debug.xcconfig +++ b/dev/integration_tests/flutter_gallery/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ #include "Generated.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" diff --git a/dev/integration_tests/flutter_gallery/ios/Flutter/Release.xcconfig b/dev/integration_tests/flutter_gallery/ios/Flutter/Release.xcconfig index a4a8c604e13..075d0bd32d0 100644 --- a/dev/integration_tests/flutter_gallery/ios/Flutter/Release.xcconfig +++ b/dev/integration_tests/flutter_gallery/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ #include "Generated.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" diff --git a/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Debug.xcconfig b/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Debug.xcconfig index 785633d3a86..4b81f9b2d20 100644 --- a/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Debug.xcconfig +++ b/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Release.xcconfig b/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Release.xcconfig index 5fba960c3af..5caa9d1579e 100644 --- a/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Release.xcconfig +++ b/dev/integration_tests/flutter_gallery/macos/Flutter/Flutter-Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "ephemeral/Flutter-Generated.xcconfig" diff --git a/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Debug.xcconfig b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Debug.xcconfig index e8efba11468..ec97fc6f302 100644 --- a/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Debug.xcconfig +++ b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Release.xcconfig b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Release.xcconfig index 399e9340e6f..c4855bfe200 100644 --- a/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Release.xcconfig +++ b/dev/integration_tests/ios_app_with_extensions/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/dev/integration_tests/release_smoke_test/ios/Flutter/Debug.xcconfig b/dev/integration_tests/release_smoke_test/ios/Flutter/Debug.xcconfig index e8efba11468..ec97fc6f302 100644 --- a/dev/integration_tests/release_smoke_test/ios/Flutter/Debug.xcconfig +++ b/dev/integration_tests/release_smoke_test/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/dev/integration_tests/release_smoke_test/ios/Flutter/Release.xcconfig b/dev/integration_tests/release_smoke_test/ios/Flutter/Release.xcconfig index 399e9340e6f..c4855bfe200 100644 --- a/dev/integration_tests/release_smoke_test/ios/Flutter/Release.xcconfig +++ b/dev/integration_tests/release_smoke_test/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/packages/flutter_tools/lib/src/macos/cocoapods.dart b/packages/flutter_tools/lib/src/macos/cocoapods.dart index ebc682bba92..226de788edc 100644 --- a/packages/flutter_tools/lib/src/macos/cocoapods.dart +++ b/packages/flutter_tools/lib/src/macos/cocoapods.dart @@ -272,7 +272,7 @@ class CocoaPods { final File file = xcodeProject.xcodeConfigFor(mode); if (file.existsSync()) { final String content = file.readAsStringSync(); - final String include = '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.${mode + final String include = '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.${mode .toLowerCase()}.xcconfig"'; if (!content.contains(include)) { file.writeAsStringSync('$include\n$content', flush: true); diff --git a/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Debug.xcconfig b/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Debug.xcconfig index da820d112b2..bc55acf1ec1 100644 --- a/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Debug.xcconfig +++ b/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Debug.xcconfig @@ -1,2 +1,2 @@ #include "Flutter.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" diff --git a/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Release.xcconfig b/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Release.xcconfig index d45274746e3..458f069e4b9 100644 --- a/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Release.xcconfig +++ b/packages/flutter_tools/templates/module/ios/host_app_ephemeral_cocoapods/Config.tmpl/Release.xcconfig @@ -1,2 +1,2 @@ #include "Flutter.xcconfig" -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" diff --git a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart index de94851b5d6..bf692ed8352 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart @@ -124,13 +124,13 @@ void main() { ]; const Map pluginContentWitnesses = { - 'ios/Flutter/Debug.xcconfig': '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"', - 'ios/Flutter/Release.xcconfig': '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"', + 'ios/Flutter/Debug.xcconfig': '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"', + 'ios/Flutter/Release.xcconfig': '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"', }; const Map modulePluginContentWitnesses = { - '.ios/Config/Debug.xcconfig': '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"', - '.ios/Config/Release.xcconfig': '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"', + '.ios/Config/Debug.xcconfig': '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"', + '.ios/Config/Release.xcconfig': '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"', }; void expectDependenciesResolved(String projectPath) { diff --git a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart index 29241110e8a..79226490eed 100644 --- a/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart @@ -273,11 +273,11 @@ void main() { final String debugContents = projectUnderTest.ios.xcodeConfigFor('Debug').readAsStringSync(); expect(debugContents, contains( - '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"\n')); + '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"\n')); expect(debugContents, contains('Existing debug config')); final String releaseContents = projectUnderTest.ios.xcodeConfigFor('Release').readAsStringSync(); expect(releaseContents, contains( - '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"\n')); + '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"\n')); expect(releaseContents, contains('Existing release config')); }, overrides: { FileSystem: () => fileSystem, @@ -305,11 +305,11 @@ void main() { final String debugContents = projectUnderTest.ios.xcodeConfigFor('Debug').readAsStringSync(); expect(debugContents, contains( - '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"\n')); + '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"\n')); expect(debugContents, contains('Existing debug config')); final String releaseContents = projectUnderTest.ios.xcodeConfigFor('Release').readAsStringSync(); expect(releaseContents, contains( - '#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"\n')); + '#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"\n')); expect(releaseContents, contains('Existing release config')); }, overrides: { FileSystem: () => fileSystem, diff --git a/packages/integration_test/example/ios/Flutter/Debug.xcconfig b/packages/integration_test/example/ios/Flutter/Debug.xcconfig index e8efba11468..ec97fc6f302 100644 --- a/packages/integration_test/example/ios/Flutter/Debug.xcconfig +++ b/packages/integration_test/example/ios/Flutter/Debug.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/packages/integration_test/example/ios/Flutter/Release.xcconfig b/packages/integration_test/example/ios/Flutter/Release.xcconfig index 399e9340e6f..c4855bfe200 100644 --- a/packages/integration_test/example/ios/Flutter/Release.xcconfig +++ b/packages/integration_test/example/ios/Flutter/Release.xcconfig @@ -1,2 +1,2 @@ -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig"