Unverified Commit 2a54bb02 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Opt into CocoaPods parallel codesigning (#76833)

parent 2951363d
...@@ -172,6 +172,10 @@ List<String> _xcodeBuildSettingsLines({ ...@@ -172,6 +172,10 @@ List<String> _xcodeBuildSettingsLines({
// This holds because requiresProjectRoot is true for this command // This holds because requiresProjectRoot is true for this command
xcodeBuildSettings.add('FLUTTER_APPLICATION_PATH=${globals.fs.path.normalize(project.directory.path)}'); xcodeBuildSettings.add('FLUTTER_APPLICATION_PATH=${globals.fs.path.normalize(project.directory.path)}');
// Tell CocoaPods behavior to codesign in parallel with rest of scripts to speed it up.
// Value must be "true", not "YES". https://github.com/CocoaPods/CocoaPods/pull/6088
xcodeBuildSettings.add('COCOAPODS_PARALLEL_CODE_SIGN=true');
// Relative to FLUTTER_APPLICATION_PATH, which is [Directory.current]. // Relative to FLUTTER_APPLICATION_PATH, which is [Directory.current].
if (targetOverride != null) { if (targetOverride != null) {
xcodeBuildSettings.add('FLUTTER_TARGET=$targetOverride'); xcodeBuildSettings.add('FLUTTER_TARGET=$targetOverride');
......
...@@ -274,7 +274,8 @@ void main() { ...@@ -274,7 +274,8 @@ void main() {
'TRACK_WIDGET_CREATION=true', 'TRACK_WIDGET_CREATION=true',
'TREE_SHAKE_ICONS=true', 'TREE_SHAKE_ICONS=true',
'BUNDLE_SKSL_PATH=foo/bar.sksl.json', 'BUNDLE_SKSL_PATH=foo/bar.sksl.json',
'PACKAGE_CONFIG=/.dart_tool/package_config.json' 'PACKAGE_CONFIG=/.dart_tool/package_config.json',
'COCOAPODS_PARALLEL_CODE_SIGN=true',
])); ]));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => fileSystem, FileSystem: () => fileSystem,
......
...@@ -1056,6 +1056,7 @@ void main() { ...@@ -1056,6 +1056,7 @@ void main() {
expect(xcodeConfig, contains('FLUTTER_ROOT=')); expect(xcodeConfig, contains('FLUTTER_ROOT='));
expect(xcodeConfig, contains('FLUTTER_APPLICATION_PATH=')); expect(xcodeConfig, contains('FLUTTER_APPLICATION_PATH='));
expect(xcodeConfig, contains('FLUTTER_TARGET=')); expect(xcodeConfig, contains('FLUTTER_TARGET='));
expect(xcodeConfig, contains('COCOAPODS_PARALLEL_CODE_SIGN=true'));
// Generated export environment variables script // Generated export environment variables script
final String buildPhaseScriptPath = globals.fs.path.join('.ios', 'Flutter', 'flutter_export_environment.sh'); final String buildPhaseScriptPath = globals.fs.path.join('.ios', 'Flutter', 'flutter_export_environment.sh');
...@@ -1065,6 +1066,7 @@ void main() { ...@@ -1065,6 +1066,7 @@ void main() {
expect(buildPhaseScript, contains('FLUTTER_ROOT=')); expect(buildPhaseScript, contains('FLUTTER_ROOT='));
expect(buildPhaseScript, contains('FLUTTER_APPLICATION_PATH=')); expect(buildPhaseScript, contains('FLUTTER_APPLICATION_PATH='));
expect(buildPhaseScript, contains('FLUTTER_TARGET=')); expect(buildPhaseScript, contains('FLUTTER_TARGET='));
expect(buildPhaseScript, contains('COCOAPODS_PARALLEL_CODE_SIGN=true'));
// Generated podspec // Generated podspec
final String podspecPath = globals.fs.path.join('.ios', 'Flutter', 'flutter_project.podspec'); final String podspecPath = globals.fs.path.join('.ios', 'Flutter', 'flutter_project.podspec');
...@@ -1157,6 +1159,7 @@ void main() { ...@@ -1157,6 +1159,7 @@ void main() {
final String xcodeConfig = xcodeConfigFile.readAsStringSync(); final String xcodeConfig = xcodeConfigFile.readAsStringSync();
expect(xcodeConfig, contains('FLUTTER_ROOT=')); expect(xcodeConfig, contains('FLUTTER_ROOT='));
expect(xcodeConfig, contains('FLUTTER_APPLICATION_PATH=')); expect(xcodeConfig, contains('FLUTTER_APPLICATION_PATH='));
expect(xcodeConfig, contains('COCOAPODS_PARALLEL_CODE_SIGN=true'));
// App identification // App identification
final String xcodeProjectPath = globals.fs.path.join('ios', 'Runner.xcodeproj', 'project.pbxproj'); final String xcodeProjectPath = globals.fs.path.join('ios', 'Runner.xcodeproj', 'project.pbxproj');
expectExists(xcodeProjectPath); expectExists(xcodeProjectPath);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment