From c1d2b854ef3d6f6da13003b7921ef7afa90aa9f4 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 4 Nov 2022 10:36:01 -0700 Subject: [PATCH] Change some required nullable parameters in tool to non-null (#114115) --- .../lib/src/commands/precache.dart | 18 +++++++++--------- .../lib/src/ios/code_signing.dart | 6 +----- .../lib/src/isolated/devfs_web.dart | 6 +++--- .../lib/src/test/flutter_web_goldens.dart | 6 +++--- .../general.shard/ios/code_signing_test.dart | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/packages/flutter_tools/lib/src/commands/precache.dart b/packages/flutter_tools/lib/src/commands/precache.dart index 08632310327d..35e664c9b699 100644 --- a/packages/flutter_tools/lib/src/commands/precache.dart +++ b/packages/flutter_tools/lib/src/commands/precache.dart @@ -14,7 +14,7 @@ import '../runner/flutter_command.dart'; class PrecacheCommand extends FlutterCommand { PrecacheCommand({ bool verboseHelp = false, - required Cache? cache, + required Cache cache, required Platform platform, required Logger logger, required FeatureFlags featureFlags, @@ -58,7 +58,7 @@ class PrecacheCommand extends FlutterCommand { help: 'Precache the unsigned macOS binaries when available.', hide: !verboseHelp); } - final Cache? _cache; + final Cache _cache; final Logger _logger; final Platform _platform; final FeatureFlags _featureFlags; @@ -133,21 +133,21 @@ class PrecacheCommand extends FlutterCommand { Future runCommand() async { // Re-lock the cache. if (_platform.environment['FLUTTER_ALREADY_LOCKED'] != 'true') { - await _cache!.lock(); + await _cache.lock(); } if (boolArgDeprecated('force')) { - _cache!.clearStampFiles(); + _cache.clearStampFiles(); } final bool includeAllPlatforms = boolArgDeprecated('all-platforms'); if (includeAllPlatforms) { - _cache!.includeAllPlatforms = true; + _cache.includeAllPlatforms = true; } if (boolArgDeprecated('use-unsigned-mac-binaries')) { - _cache!.useUnsignedMacBinaries = true; + _cache.useUnsignedMacBinaries = true; } final Set explicitlyEnabled = _explicitArtifactSelections(); - _cache!.platformOverrideArtifacts = explicitlyEnabled; + _cache.platformOverrideArtifacts = explicitlyEnabled; // If the user did not provide any artifact flags, then download // all artifacts that correspond to an enabled platform. @@ -164,8 +164,8 @@ class PrecacheCommand extends FlutterCommand { requiredArtifacts.add(artifact); } } - if (!await _cache!.isUpToDate()) { - await _cache!.updateAll(requiredArtifacts); + if (!await _cache.isUpToDate()) { + await _cache.updateAll(requiredArtifacts); } else { _logger.printStatus('Already up-to-date.'); } diff --git a/packages/flutter_tools/lib/src/ios/code_signing.dart b/packages/flutter_tools/lib/src/ios/code_signing.dart index e9df8dd6a4a3..13d63185e780 100644 --- a/packages/flutter_tools/lib/src/ios/code_signing.dart +++ b/packages/flutter_tools/lib/src/ios/code_signing.dart @@ -97,17 +97,13 @@ final RegExp _certificateOrganizationalUnitExtractionPattern = RegExp(r'OU=([a-z /// Will return null if none are found, if the user cancels or if the Xcode /// project has a development team set in the project's build settings. Future?> getCodeSigningIdentityDevelopmentTeamBuildSetting({ - required Map? buildSettings, + required Map buildSettings, required ProcessManager processManager, required Platform platform, required Logger logger, required Config config, required Terminal terminal, }) async { - if (buildSettings == null) { - return null; - } - // If the user already has it set in the project build settings itself, // continue with that. if (_isNotEmpty(buildSettings[_developmentTeamBuildSettingName])) { diff --git a/packages/flutter_tools/lib/src/isolated/devfs_web.dart b/packages/flutter_tools/lib/src/isolated/devfs_web.dart index 6e6fc1389b9b..f9ff1f193ebf 100644 --- a/packages/flutter_tools/lib/src/isolated/devfs_web.dart +++ b/packages/flutter_tools/lib/src/isolated/devfs_web.dart @@ -83,11 +83,11 @@ const String _kDefaultIndex = ''' /// This is only used in development mode. class WebExpressionCompiler implements ExpressionCompiler { WebExpressionCompiler(this._generator, { - required FileSystem? fileSystem, + required FileSystem fileSystem, }) : _fileSystem = fileSystem; final ResidentCompiler _generator; - final FileSystem? _fileSystem; + final FileSystem _fileSystem; @override Future compileExpressionToJs( @@ -106,7 +106,7 @@ class WebExpressionCompiler implements ExpressionCompiler { if (compilerOutput != null && compilerOutput.outputFilename != null) { final String content = utf8.decode( - _fileSystem!.file(compilerOutput.outputFilename).readAsBytesSync()); + _fileSystem.file(compilerOutput.outputFilename).readAsBytesSync()); return ExpressionCompilationResult( content, compilerOutput.errorCount > 0); } diff --git a/packages/flutter_tools/lib/src/test/flutter_web_goldens.dart b/packages/flutter_tools/lib/src/test/flutter_web_goldens.dart index ea23742eb627..fa0edeab2ffa 100644 --- a/packages/flutter_tools/lib/src/test/flutter_web_goldens.dart +++ b/packages/flutter_tools/lib/src/test/flutter_web_goldens.dart @@ -27,7 +27,7 @@ class TestGoldenComparator { TestGoldenComparator(this.shellPath, this.compilerFactory, { required Logger logger, required FileSystem fileSystem, - required ProcessManager? processManager, + required ProcessManager processManager, required this.webRenderer, }) : tempDir = fileSystem.systemTempDirectory.createTempSync('flutter_web_platform.'), _logger = logger, @@ -39,7 +39,7 @@ class TestGoldenComparator { final TestCompiler Function() compilerFactory; final Logger _logger; final FileSystem _fileSystem; - final ProcessManager? _processManager; + final ProcessManager _processManager; final WebRendererMode webRenderer; TestCompiler? _compiler; @@ -95,7 +95,7 @@ class TestGoldenComparator { 'FLUTTER_TEST_BROWSER': 'chrome', 'FLUTTER_WEB_RENDERER': webRenderer == WebRendererMode.html ? 'html' : 'canvaskit', }; - return _processManager!.start(command, environment: environment); + return _processManager.start(command, environment: environment); } Future compareGoldens(Uri testUri, Uint8List bytes, Uri goldenKey, bool? updateGoldens) async { diff --git a/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart index d22ee5ec214d..04ef1235266d 100644 --- a/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart @@ -39,7 +39,7 @@ void main() { testWithoutContext('No auto-sign if Xcode project settings are not available', () async { final Map? signingConfigs = await getCodeSigningIdentityDevelopmentTeamBuildSetting( - buildSettings: null, + buildSettings: {}, processManager: FakeProcessManager.empty(), platform: macosPlatform, logger: logger,