Parse scheme file with XML parser for SwiftPM migrator by vashworth · Pull Request #184525 · flutter/flutter

vashworth · 2026-04-02T16:37:43Z

Make scheme parsing more forgiving of whitespace differences.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

gemini-code-assist

Code Review

This pull request transitions the SwiftPackageManagerIntegrationMigration from line-based string manipulation to XML parsing for updating Xcode schemes. It also updates the migration detection criteria and includes a new test case for varied XML spacing. The review feedback highlights the necessity of XML-escaping attribute values like BuildableName, BlueprintName, and ReferencedContainer when they are re-inserted into string templates to prevent the generation of malformed XML.

gemini-code-assist · 2026-04-02T16:39:28Z

+    if (buildableNameAttr == null) {
      throw Exception('Failed to parse ${schemeFile.basename}: Could not find BuildableName.');
    }
+    final buildableName = 'BuildableName = "$buildableNameAttr"';


The buildableNameAttr value obtained from getAttribute is already decoded. When injecting it back into a string-based XML template, special characters like & or " must be re-encoded to ensure the resulting XML is valid. If a target name contains a double quote, it will break the XML structure.

Suggested change

final buildableName = 'BuildableName = "$buildableNameAttr"';

final buildableName = 'BuildableName = "${buildableNameAttr.replaceAll('&', '&').replaceAll('"', '"')}"';

gemini-code-assist · 2026-04-02T16:39:28Z

+    if (blueprintNameAttr == null) {
      throw Exception('Failed to parse ${schemeFile.basename}: Could not find BlueprintName.');
    }
+    final blueprintName = 'BlueprintName = "$blueprintNameAttr"';


Similar to buildableNameAttr, the blueprintNameAttr value should be XML-escaped before being placed into the template to prevent generating invalid XML if the target name contains special characters.

Suggested change

final blueprintName = 'BlueprintName = "$blueprintNameAttr"';

final blueprintName = 'BlueprintName = "${blueprintNameAttr.replaceAll('&', '&').replaceAll('"', '"')}"';

gemini-code-assist · 2026-04-02T16:39:28Z

        'Failed to parse ${schemeFile.basename}: Could not find ReferencedContainer.',
      );
    }
+    final referencedContainer = 'ReferencedContainer = "$referencedContainerAttr"';


The referencedContainerAttr value should be XML-escaped to ensure the generated XML remains valid even if the container path contains special characters.

Suggested change

final referencedContainer = 'ReferencedContainer = "$referencedContainerAttr"';

final referencedContainer = 'ReferencedContainer = "${referencedContainerAttr.replaceAll('&', '&').replaceAll('"', '"')}"';

bkonyi · 2026-04-02T16:40:50Z

                     $buildableName
                     $blueprintName
-                     $referencedContainer
+                     $referencedContainer>


Should this be />?

Nope, it's closed in the next line with </BuildableReference>

auto-submit · 2026-04-06T20:28:03Z

A reason for requesting a revert of flutter/flutter/184525 could
not be found or the reason was not properly formatted. Begin a comment with 'Reason for revert:' to tell the bot why
this issue is being reverted.

Renzo-Olivares · 2026-04-06T20:29:29Z

Reason for revert: tree breakage.

…tter/flutter#184525)

flutter/flutter@9cd60b5...a0924c7 2026-04-07 [email protected] Reland "[data_assets] Cleanup tests" (flutter/flutter#184714) 2026-04-07 [email protected] Use the WindowRegistry in the multiple_windows example app (flutter/flutter#184579) 2026-04-07 [email protected] Introduce command to build a swift package for SwiftPM add to app integration (flutter/flutter#184660) 2026-04-07 [email protected] Have `flutter create` create a pubspec.lock to ensure pinned versions are being used. (flutter/flutter#175352) 2026-04-07 [email protected] [widgets/raw_menu_anchor.dart] Always call onClose and onCloseRequested on descendants before parent. (flutter/flutter#182357) 2026-04-07 [email protected] `WindowsPlugin` should not crash when ffiPlugin enabled (flutter/flutter#184695) 2026-04-06 [email protected] Use full goto.google.com hostname for go/ links (flutter/flutter#184679) 2026-04-06 [email protected] Apply rect clipping to surface views (flutter/flutter#184471) 2026-04-06 [email protected] [A11y] Allow percentage strings like "50%" as `SemanticsValue` for `ProgressIndicator` (flutter/flutter#183670) 2026-04-06 [email protected] Fix invisible accessibility element before scroll view (flutter/flutter#184155) 2026-04-06 [email protected] Roll Skia from 163dfdf500c7 to e264d870a380 (2 revisions) (flutter/flutter#184674) 2026-04-06 [email protected] Keep last character obscured when toggling obscureText (flutter/flutter#183488) 2026-04-06 [email protected] Parse scheme file with XML parser for SwiftPM migrator (flutter/flutter#184525) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

Parse scheme file with XML parser for SwiftPM migrator

1a6c53f

vashworth requested a review from bkonyi April 2, 2026 16:37

github-actions Bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Apr 2, 2026

vashworth added the CICD Run CI/CD label Apr 2, 2026

gemini-code-assist Bot reviewed Apr 2, 2026

View reviewed changes

bkonyi approved these changes Apr 2, 2026

View reviewed changes

Merge branch 'master' into scheme_parse_xml

6b1f0c3

github-actions Bot removed the CICD Run CI/CD label Apr 6, 2026

vashworth added CICD Run CI/CD autosubmit Merge PR when tree becomes green via auto submit App labels Apr 6, 2026

auto-submit Bot added this pull request to the merge queue Apr 6, 2026

Merged via the queue into flutter:master with commit bf14796 Apr 6, 2026
141 of 142 checks passed

flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 6, 2026

Renzo-Olivares added the revert Autorevert PR (with "Reason for revert:" comment) label Apr 6, 2026

auto-submit Bot removed the revert Autorevert PR (with "Reason for revert:" comment) label Apr 6, 2026

Renzo-Olivares added revert Autorevert PR (with "Reason for revert:" comment) and removed revert Autorevert PR (with "Reason for revert:" comment) labels Apr 6, 2026

davidhicks980 mentioned this pull request Apr 6, 2026

[cupertino.dart] Implement CupertinoMenuAnchor and CupertinoMenuItem using RawMenuAnchor #182036

Merged

9 tasks

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

46101a6

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to d18ad52e656e (9 revisions) flutter/packages#11456

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

dc92325

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to 941e3f34c7bd (10 revisions) flutter/packages#11457

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

9330791

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to 3bdf02c1cab0 (11 revisions) flutter/packages#11458

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

fb8251a

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to 92d81d35ea30 (12 revisions) flutter/packages#11460

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

52db264

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to a0924c76b0fd (13 revisions) flutter/packages#11462

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

20279cd

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to a0924c76b0fd (13 revisions) flutter/packages#11463

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

465bf1a

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to a0924c76b0fd (13 revisions) flutter/packages#11464

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2026

bf14796a1 Parse scheme file with XML parser for SwiftPM migrator (flu…

9f6d692

…tter/flutter#184525)

engine-flutter-autoroll mentioned this pull request Apr 7, 2026

Roll Flutter from 9cd60b512fbc to b185b02c1d07 (14 revisions) flutter/packages#11465

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Parse scheme file with XML parser for SwiftPM migrator#184525

Parse scheme file with XML parser for SwiftPM migrator#184525
auto-submit[bot] merged 2 commits into
flutter:masterfrom
vashworth:scheme_parse_xml

vashworth commented Apr 2, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Apr 2, 2026

Uh oh!

gemini-code-assist Bot Apr 2, 2026

Uh oh!

gemini-code-assist Bot Apr 2, 2026

Uh oh!

bkonyi Apr 2, 2026

Uh oh!

vashworth Apr 2, 2026

Uh oh!

Uh oh!

auto-submit Bot commented Apr 6, 2026

Uh oh!

Renzo-Olivares commented Apr 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	final buildableName = 'BuildableName = "$buildableNameAttr"';
	final buildableName = 'BuildableName = "${buildableNameAttr.replaceAll('&', '&').replaceAll('"', '"')}"';

	final blueprintName = 'BlueprintName = "$blueprintNameAttr"';
	final blueprintName = 'BlueprintName = "${blueprintNameAttr.replaceAll('&', '&').replaceAll('"', '"')}"';

	final referencedContainer = 'ReferencedContainer = "$referencedContainerAttr"';
	final referencedContainer = 'ReferencedContainer = "${referencedContainerAttr.replaceAll('&', '&').replaceAll('"', '"')}"';

Conversation

vashworth commented Apr 2, 2026

Pre-launch Checklist

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

bkonyi Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

vashworth Apr 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

auto-submit Bot commented Apr 6, 2026

Uh oh!

Renzo-Olivares commented Apr 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants