From 999543b7ce7f90d880ff44fae408d884ee7c6107 Mon Sep 17 00:00:00 2001 From: jesswrd Date: Wed, 26 Nov 2025 13:44:45 -0600 Subject: [PATCH 1/3] re-add the null safety checks --- script/tool/lib/src/update_dependency_command.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/tool/lib/src/update_dependency_command.dart b/script/tool/lib/src/update_dependency_command.dart index 8f2e5bfcaf06..07ec43d0a786 100644 --- a/script/tool/lib/src/update_dependency_command.dart +++ b/script/tool/lib/src/update_dependency_command.dart @@ -116,7 +116,7 @@ class UpdateDependencyCommand extends PackageLoopingCommand { final String? version = getNullableStringArg(_versionFlag); if (version == null) { final PubVersionFinderResponse response = await _pubVersionFinder - .getPackageVersion(packageName: _targetPubPackage); + .getPackageVersion(packageName: _targetPubPackage!); switch (response.result) { case PubVersionFinderResult.success: _targetVersion = response.versions.first.toString(); @@ -204,7 +204,7 @@ A version with a valid format (3 numbers separated by 2 periods) must be provide @override Future runForPackage(RepositoryPackage package) async { if (_targetPubPackage != null) { - return _runForPubDependency(package, _targetPubPackage); + return _runForPubDependency(package, _targetPubPackage!); } if (_targetAndroidDependency != null) { return _runForAndroidDependency(package); From 2cdae27716f5edb866127d4c238d6d65e3aba90f Mon Sep 17 00:00:00 2001 From: jesswrd Date: Wed, 26 Nov 2025 14:07:43 -0600 Subject: [PATCH 2/3] assigning the nullable field to local variable may fix things --- script/tool/lib/src/update_dependency_command.dart | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/script/tool/lib/src/update_dependency_command.dart b/script/tool/lib/src/update_dependency_command.dart index 07ec43d0a786..630dfdb15499 100644 --- a/script/tool/lib/src/update_dependency_command.dart +++ b/script/tool/lib/src/update_dependency_command.dart @@ -112,22 +112,23 @@ class UpdateDependencyCommand extends PackageLoopingCommand { // Setup for updating pub dependency. _targetPubPackage = getNullableStringArg(_pubPackageFlag); - if (_targetPubPackage != null) { + final String? targetPubPackage = _targetPubPackage; + if (targetPubPackage != null) { final String? version = getNullableStringArg(_versionFlag); if (version == null) { final PubVersionFinderResponse response = await _pubVersionFinder - .getPackageVersion(packageName: _targetPubPackage!); + .getPackageVersion(packageName: targetPubPackage); switch (response.result) { case PubVersionFinderResult.success: _targetVersion = response.versions.first.toString(); case PubVersionFinderResult.fail: printError(''' -Error fetching $_targetPubPackage version from pub: ${response.httpResponse.statusCode}: +Error fetching $targetPubPackage version from pub: ${response.httpResponse.statusCode}: ${response.httpResponse.body} '''); throw ToolExit(_exitNoTargetVersion); case PubVersionFinderResult.noPackageFound: - printError('$_targetPubPackage does not exist on pub'); + printError('$targetPubPackage does not exist on pub'); throw ToolExit(_exitNoTargetVersion); } } else { @@ -203,8 +204,9 @@ A version with a valid format (3 numbers separated by 2 periods) must be provide @override Future runForPackage(RepositoryPackage package) async { - if (_targetPubPackage != null) { - return _runForPubDependency(package, _targetPubPackage!); + final String? targetPubPackage = _targetPubPackage; + if (targetPubPackage != null) { + return _runForPubDependency(package, targetPubPackage); } if (_targetAndroidDependency != null) { return _runForAndroidDependency(package); From 238448ef540158899a11e6f03a35ee56dc7a2a71 Mon Sep 17 00:00:00 2001 From: jesswrd Date: Wed, 26 Nov 2025 14:08:14 -0600 Subject: [PATCH 3/3] format --- .../lib/src/update_dependency_command.dart | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/script/tool/lib/src/update_dependency_command.dart b/script/tool/lib/src/update_dependency_command.dart index 630dfdb15499..658b25a7ca00 100644 --- a/script/tool/lib/src/update_dependency_command.dart +++ b/script/tool/lib/src/update_dependency_command.dart @@ -35,8 +35,8 @@ class UpdateDependencyCommand extends PackageLoopingCommand { super.gitDir, http.Client? httpClient, }) : _pubVersionFinder = PubVersionFinder( - httpClient: httpClient ?? http.Client(), - ) { + httpClient: httpClient ?? http.Client(), + ) { argParser.addOption(_pubPackageFlag, help: 'A pub package to update.'); argParser.addOption( _androidDependency, @@ -63,8 +63,7 @@ class UpdateDependencyCommand extends PackageLoopingCommand { ); argParser.addOption( _versionFlag, - help: - 'The version to update to.\n\n' + help: 'The version to update to.\n\n' '- For pub, defaults to the latest published version if not ' 'provided. This can be any constraint that pubspec.yaml allows; a ' 'specific version will be treated as the exact version for ' @@ -100,9 +99,8 @@ class UpdateDependencyCommand extends PackageLoopingCommand { @override Future initializeRun() async { const targetFlags = {_pubPackageFlag, _androidDependency}; - final Set passedTargetFlags = targetFlags - .where((String flag) => argResults![flag] != null) - .toSet(); + final Set passedTargetFlags = + targetFlags.where((String flag) => argResults![flag] != null).toSet(); if (passedTargetFlags.length != 1) { printError( 'Exactly one of the target flags must be provided: (${targetFlags.join(', ')})', @@ -400,9 +398,9 @@ A version with a valid format (3 numbers separated by 2 periods) must be provide ); final String newGradleWrapperPropertiesContents = oldFileToUpdateContents.replaceFirst( - dependencyVersionPattern, - newDependencyVersionEntry, - ); + dependencyVersionPattern, + newDependencyVersionEntry, + ); fileToUpdate.writeAsStringSync(newGradleWrapperPropertiesContents); } @@ -428,8 +426,8 @@ A version with a valid format (3 numbers separated by 2 periods) must be provide final File buildConfigurationFile = package .platformDirectory(FlutterPlatform.android) .childFile('build.gradle'); - final String buildConfigurationContents = buildConfigurationFile - .readAsStringSync(); + final String buildConfigurationContents = + buildConfigurationFile.readAsStringSync(); final validCompileSdkVersion = RegExp( r'(compileSdk|compileSdkVersion) \d{1,2}', ); @@ -488,8 +486,8 @@ A version with a valid format (3 numbers separated by 2 periods) must be provide return []; } return pigeonsDir.listSync().whereType().where( - (File file) => file.basename.endsWith('.dart'), - ); + (File file) => file.basename.endsWith('.dart'), + ); } /// Re-runs Pigeon generation for [package].