Skip to content

Commit d8856b9

Browse files
authored
Remove the last vestiges of null-unsafety in flutter_tools. (flutter#164026)
The internal code using this was deleted in `cl/730558889`.
1 parent 8c7e186 commit d8856b9

34 files changed

+20
-309
lines changed

packages/flutter_tools/lib/src/android/android_device.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ class AndroidDevice extends Device {
617617
);
618618
}
619619

620-
final String dartVmFlags = computeDartVmFlags(debuggingOptions);
621620
final String? traceAllowlist = debuggingOptions.traceAllowlist;
622621
final String? traceSkiaAllowlist = debuggingOptions.traceSkiaAllowlist;
623622
final String? traceToFile = debuggingOptions.traceToFile;
@@ -684,7 +683,11 @@ class AndroidDevice extends Device {
684683
'disable-service-auth-codes',
685684
'true',
686685
],
687-
if (dartVmFlags.isNotEmpty) ...<String>['--es', 'dart-flags', dartVmFlags],
686+
if (debuggingOptions.dartFlags.isNotEmpty) ...<String>[
687+
'--es',
688+
'dart-flags',
689+
debuggingOptions.dartFlags,
690+
],
688691
if (debuggingOptions.useTestFonts) ...<String>['--ez', 'use-test-fonts', 'true'],
689692
if (debuggingOptions.verboseSystemLogs) ...<String>['--ez', 'verbose-logging', 'true'],
690693
if (userIdentifier != null) ...<String>['--user', userIdentifier],

packages/flutter_tools/lib/src/commands/attach.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class AttachCommand extends FlutterCommand {
8585
usesDartDefineOption();
8686
usesDeviceUserOption();
8787
addEnableExperimentation(hide: !verboseHelp);
88-
addNullSafetyModeOptions(hide: !verboseHelp);
8988
usesInitializeFromDillOption(hide: !verboseHelp);
9089
usesNativeAssetsOption(hide: !verboseHelp);
9190
argParser

packages/flutter_tools/lib/src/commands/build_aar.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class BuildAarCommand extends BuildSubCommand {
4848
usesDartDefineOption();
4949
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
5050
usesTrackWidgetCreation(verboseHelp: false);
51-
addNullSafetyModeOptions(hide: !verboseHelp);
5251
addEnableExperimentation(hide: !verboseHelp);
5352
addAndroidSpecificBuildOptions(hide: !verboseHelp);
5453
argParser.addMultiOption(

packages/flutter_tools/lib/src/commands/build_apk.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class BuildApkCommand extends BuildSubCommand {
3131
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
3232
addEnableExperimentation(hide: !verboseHelp);
3333
addBuildPerformanceFile(hide: !verboseHelp);
34-
addNullSafetyModeOptions(hide: !verboseHelp);
3534
usesAnalyzeSizeFlag();
3635
addAndroidSpecificBuildOptions(hide: !verboseHelp);
3736
addIgnoreDeprecationOption();

packages/flutter_tools/lib/src/commands/build_appbundle.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class BuildAppBundleCommand extends BuildSubCommand {
3434
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
3535
addBuildPerformanceFile(hide: !verboseHelp);
3636
usesTrackWidgetCreation(verboseHelp: verboseHelp);
37-
addNullSafetyModeOptions(hide: !verboseHelp);
3837
addEnableExperimentation(hide: !verboseHelp);
3938
usesAnalyzeSizeFlag();
4039
addAndroidSpecificBuildOptions(hide: !verboseHelp);

packages/flutter_tools/lib/src/commands/build_ios.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,6 @@ abstract class _BuildIOSSubCommand extends BuildSubCommand {
676676
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
677677
addEnableExperimentation(hide: !verboseHelp);
678678
addBuildPerformanceFile(hide: !verboseHelp);
679-
addNullSafetyModeOptions(hide: !verboseHelp);
680679
usesAnalyzeSizeFlag();
681680
argParser.addFlag(
682681
'codesign',

packages/flutter_tools/lib/src/commands/build_ios_framework.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ abstract class BuildFrameworkCommand extends BuildSubCommand {
4545
addSplitDebugInfoOption();
4646
addDartObfuscationOption();
4747
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
48-
addNullSafetyModeOptions(hide: !verboseHelp);
4948
addEnableExperimentation(hide: !verboseHelp);
5049

5150
argParser

packages/flutter_tools/lib/src/commands/build_web.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class BuildWebCommand extends BuildSubCommand {
3232
addBuildModeFlags(verboseHelp: verboseHelp);
3333
usesDartDefineOption();
3434
addEnableExperimentation(hide: !verboseHelp);
35-
addNullSafetyModeOptions(hide: !verboseHelp);
3635
addNativeNullAssertions();
3736

3837
//

packages/flutter_tools/lib/src/commands/packages.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ class PackagesGetCommand extends FlutterCommand {
243243
argParser.addFlag('enforce-lockfile');
244244
argParser.addFlag('precompile');
245245
argParser.addFlag('major-versions');
246-
argParser.addFlag('null-safety');
247246
argParser.addFlag('example', defaultsTo: true);
248247
argParser.addOption('sdk');
249248
argParser.addOption('path');

packages/flutter_tools/lib/src/commands/run.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment
209209
usesIpv6Flag(verboseHelp: verboseHelp);
210210
usesPubOption();
211211
usesTrackWidgetCreation(verboseHelp: verboseHelp);
212-
addNullSafetyModeOptions(hide: !verboseHelp);
213212
usesDeviceUserOption();
214213
usesDeviceTimeoutOption();
215214
usesDeviceConnectionOption();
@@ -360,7 +359,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment
360359
argParser.options.containsKey('fast-start') &&
361360
boolArg('fast-start') &&
362361
!runningWithPrebuiltApplication,
363-
nullAssertions: boolArg('null-assertions'),
364362
nativeNullAssertions: boolArg('native-null-assertions'),
365363
enableImpeller: enableImpeller,
366364
enableVulkanValidation: enableVulkanValidation,

0 commit comments

Comments
 (0)