[CP] Fix file deletion crash in BuildIOSArchiveCommand.runCommand (#138823)
Original PR: https://github.com/flutter/flutter/pull/138734
diff --git a/packages/flutter_tools/lib/src/commands/build_ios.dart b/packages/flutter_tools/lib/src/commands/build_ios.dart
index 93c1c62..c1c502e 100644
--- a/packages/flutter_tools/lib/src/commands/build_ios.dart
+++ b/packages/flutter_tools/lib/src/commands/build_ios.dart
@@ -11,6 +11,7 @@
import '../base/analyze_size.dart';
import '../base/common.dart';
+import '../base/error_handling_io.dart';
import '../base/logger.dart';
import '../base/process.dart';
import '../base/utils.dart';
@@ -492,7 +493,9 @@
],
);
} finally {
- generatedExportPlist?.deleteSync();
+ if (generatedExportPlist != null) {
+ ErrorHandlingFileSystem.deleteIfExists(generatedExportPlist);
+ }
status?.stop();
}
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/build_ipa_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/build_ipa_test.dart
index 802226b..9c71896 100644
--- a/packages/flutter_tools/test/commands.shard/hermetic/build_ipa_test.dart
+++ b/packages/flutter_tools/test/commands.shard/hermetic/build_ipa_test.dart
@@ -180,6 +180,7 @@
FakeCommand exportArchiveCommand({
String exportOptionsPlist = '/ExportOptions.plist',
File? cachePlist,
+ bool deleteExportOptionsPlist = false,
}) {
return FakeCommand(
command: <String>[
@@ -201,6 +202,9 @@
if (cachePlist != null) {
cachePlist.writeAsStringSync(fileSystem.file(_exportOptionsPlist).readAsStringSync());
}
+ if (deleteExportOptionsPlist) {
+ fileSystem.file(_exportOptionsPlist).deleteSync();
+ }
}
);
}
@@ -419,6 +423,40 @@
XcodeProjectInterpreter: () => FakeXcodeProjectInterpreterWithBuildSettings(),
});
+ testUsingContext('ipa build ignores deletion failure if generatedExportPlist does not exist', () async {
+ final File cachedExportOptionsPlist = fileSystem.file('/CachedExportOptions.plist');
+ final BuildCommand command = BuildCommand(
+ artifacts: artifacts,
+ androidSdk: FakeAndroidSdk(),
+ buildSystem: TestBuildSystem.all(BuildResult(success: true)),
+ logger: logger,
+ fileSystem: fileSystem,
+ processUtils: processUtils,
+ osUtils: FakeOperatingSystemUtils(),
+ );
+ fakeProcessManager.addCommands(<FakeCommand>[
+ xattrCommand,
+ setUpFakeXcodeBuildHandler(),
+ exportArchiveCommand(
+ exportOptionsPlist: _exportOptionsPlist,
+ cachePlist: cachedExportOptionsPlist,
+ deleteExportOptionsPlist: true,
+ ),
+ ]);
+ createMinimalMockProjectFiles();
+
+ await createTestCommandRunner(command).run(
+ const <String>['build', 'ipa', '--no-pub']
+ );
+ expect(fakeProcessManager, hasNoRemainingExpectations);
+ }, overrides: <Type, Generator>{
+ FileSystem: () => fileSystem,
+ Logger: () => logger,
+ ProcessManager: () => fakeProcessManager,
+ Platform: () => macosPlatform,
+ XcodeProjectInterpreter: () => FakeXcodeProjectInterpreterWithBuildSettings(),
+ });
+
testUsingContext('ipa build invokes xcodebuild and archives for app store', () async {
final File cachedExportOptionsPlist = fileSystem.file('/CachedExportOptions.plist');
final BuildCommand command = BuildCommand(
