@@ -453,21 +453,13 @@ abstract class FlutterCommand extends Command<void> {
453453 /// The `hide` argument indicates whether or not to hide these options when
454454 /// the user asks for help.
455455 void usesFilesystemOptions ({required bool hide}) {
456- argParser.addDescriptors (const < OptionDescriptor <Object ?>> [
457- BuildInfoOptions .outputDill,
458- BuildInfoOptions .fileSystemRoot,
459- BuildInfoOptions .fileSystemScheme,
460- ], hideOverride: hide);
456+ const FilesystemOptionsBundle ().register (this , argParser, hideOverride: hide);
461457 }
462458
463459 /// Adds options for connecting to the Dart VM Service port.
464460 void usesPortOptions ({required bool verboseHelp}) {
465- argParser.addDescriptors (const < OptionDescriptor <Object ?>> [
466- DebuggingOptionDescriptors .vmServicePort,
467- DebuggingOptionDescriptors .deviceVmservicePort,
468- DebuggingOptionDescriptors .hostVmservicePort,
469- ], verboseHelp: verboseHelp);
470- _usesPortOption = true ;
461+ const VmServicePortOptionsBundle (includeIpv6: false )
462+ .register (this , argParser, verboseHelp: verboseHelp);
471463 }
472464
473465 /// Add option values for output directory of artifacts
@@ -488,11 +480,8 @@ abstract class FlutterCommand extends Command<void> {
488480 }
489481
490482 void addDdsOptions ({required bool verboseHelp}) {
491- argParser.addDescriptors (const < OptionDescriptor <Object ?>> [
492- DebuggingOptionDescriptors .ddsPort,
493- DebuggingOptionDescriptors .dds,
494- DebuggingOptionDescriptors .disableDds,
495- ], verboseHelp: verboseHelp);
483+ const DdsAndDevToolsOptionsBundle (includeDevTools: false )
484+ .register (this , argParser, verboseHelp: verboseHelp);
496485 }
497486
498487 late final bool enableDds = getValue (DebuggingOptionDescriptors .dds);
@@ -692,20 +681,11 @@ abstract class FlutterCommand extends Command<void> {
692681 bool excludeDebug = false ,
693682 bool excludeRelease = false ,
694683 }) {
695- configureBuildModes (
684+ BuildModeOptionsBundle (
696685 defaultToRelease: defaultToRelease,
697686 excludeDebug: excludeDebug,
698687 excludeRelease: excludeRelease,
699- );
700-
701- if (! excludeDebug) {
702- CommonOptions .debugMode.addTo (argParser, verboseHelp: verboseHelp);
703- }
704- CommonOptions .profileMode.addTo (argParser, verboseHelp: verboseHelp);
705- if (! excludeRelease) {
706- CommonOptions .releaseMode.addTo (argParser, verboseHelp: verboseHelp);
707- CommonOptions .jitReleaseMode.addTo (argParser, verboseHelp: verboseHelp);
708- }
688+ ).register (this , argParser, verboseHelp: verboseHelp);
709689 }
710690
711691 void addSplitDebugInfoOption () {
@@ -747,10 +727,7 @@ abstract class FlutterCommand extends Command<void> {
747727 }
748728
749729 void addAndroidSpecificBuildOptions ({bool hide = false }) {
750- BuildInfoOptions .androidGradleDaemon.addTo (argParser, hideOverride: hide);
751- BuildInfoOptions .androidSkipBuildDependencyValidation.addTo (argParser, hideOverride: hide);
752- BuildInfoOptions .androidProjectArg.addTo (argParser, hideOverride: hide);
753- BuildInfoOptions .androidProjectCacheDir.addTo (argParser, hideOverride: hide);
730+ const AndroidGradleOptionsBundle ().register (this , argParser, hideOverride: hide);
754731 }
755732
756733 void addNativeNullAssertions ({bool hide = false }) {
0 commit comments