development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-12 19:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] remove non-null check from AndroidValidator (#90090)

Browse source
This commit is contained in:
Christopher Fujino 2021-09-25 16:53:06 -07:00 committed by GitHub
parent 2f9df031fe
commit 61bce1d83b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/flutter_tools/lib/src/android/android_workflow.dart
View file

@ -202,7 +202,6 @@ class AndroidValidator extends DoctorValidator {
if (androidSdkLatestVersion.sdkLevel < kAndroidSdkMinVersion || androidSdkLatestVersion.buildToolsVersion < kAndroidSdkBuildToolsMinVersion) {
messages.add(ValidationMessage.error(
_userMessages.androidSdkBuildToolsOutdated(
_androidSdk!.sdkManagerPath!,
kAndroidSdkMinVersion,
kAndroidSdkBuildToolsMinVersion.toString(),
_platform,
@ -458,7 +457,7 @@ class AndroidLicenseValidator extends DoctorValidator {
return exitCode == 0;
} on ProcessException catch (e) {
throwToolExit(_userMessages.androidCannotRunSdkManager(
_androidSdk.sdkManagerPath!,
_androidSdk.sdkManagerPath ?? '',
e.toString(),
_platform,
));

2
packages/flutter_tools/lib/src/base/user_messages.dart
View file

@ -117,7 +117,7 @@ class UserMessages {
'Android sdkmanager tool was found, but failed to run ($sdkManagerPath): "$error".\n'
'Try re-installing or updating your Android SDK,\n'
'visit ${_androidSdkInstallUrl(platform)} for detailed instructions.';
String androidSdkBuildToolsOutdated(String managerPath, int sdkMinVersion, String buildToolsMinVersion, Platform platform) =>
String androidSdkBuildToolsOutdated(int sdkMinVersion, String buildToolsMinVersion, Platform platform) =>
'Flutter requires Android SDK $sdkMinVersion and the Android BuildTools $buildToolsMinVersion\n'
'To update the Android SDK visit ${_androidSdkInstallUrl(platform)} for detailed instructions.';
String get androidMissingCmdTools => 'cmdline-tools component is missing\n'

1
packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
View file

@ -386,7 +386,6 @@ Review licenses that have not been accepted (y/N)?
..latestVersion = sdkVersion;
final String errorMessage = UserMessages().androidSdkBuildToolsOutdated(
sdk.sdkManagerPath,
kAndroidSdkMinVersion,
kAndroidSdkBuildToolsMinVersion.toString(),
FakePlatform(),

2
packages/flutter_tools/test/general.shard/base/user_messages_test.dart
View file

@ -27,7 +27,7 @@ void main() {
_checkInstallationURL((Platform platform) => userMessages.androidSdkInstallHelp(platform));
_checkInstallationURL((Platform platform) => userMessages.androidMissingSdkManager('/', platform));
_checkInstallationURL((Platform platform) => userMessages.androidCannotRunSdkManager('/', '', platform));
_checkInstallationURL((Platform platform) => userMessages.androidSdkBuildToolsOutdated('/', 0, '', platform));
_checkInstallationURL((Platform platform) => userMessages.androidSdkBuildToolsOutdated(0, '', platform));
_checkInstallationURL((Platform platform) => userMessages.androidStudioInstallation(platform));
});
}