Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
61bce1d8
Unverified
Commit
61bce1d8
authored
Sep 25, 2021
by
Christopher Fujino
Committed by
GitHub
Sep 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] remove non-null check from AndroidValidator (#90090)
parent
2f9df031
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
android_workflow.dart
packages/flutter_tools/lib/src/android/android_workflow.dart
+1
-2
user_messages.dart
packages/flutter_tools/lib/src/base/user_messages.dart
+1
-1
android_workflow_test.dart
...ols/test/general.shard/android/android_workflow_test.dart
+0
-1
user_messages_test.dart
...ter_tools/test/general.shard/base/user_messages_test.dart
+1
-1
No files found.
packages/flutter_tools/lib/src/android/android_workflow.dart
View file @
61bce1d8
...
@@ -202,7 +202,6 @@ class AndroidValidator extends DoctorValidator {
...
@@ -202,7 +202,6 @@ class AndroidValidator extends DoctorValidator {
if
(
androidSdkLatestVersion
.
sdkLevel
<
kAndroidSdkMinVersion
||
androidSdkLatestVersion
.
buildToolsVersion
<
kAndroidSdkBuildToolsMinVersion
)
{
if
(
androidSdkLatestVersion
.
sdkLevel
<
kAndroidSdkMinVersion
||
androidSdkLatestVersion
.
buildToolsVersion
<
kAndroidSdkBuildToolsMinVersion
)
{
messages
.
add
(
ValidationMessage
.
error
(
messages
.
add
(
ValidationMessage
.
error
(
_userMessages
.
androidSdkBuildToolsOutdated
(
_userMessages
.
androidSdkBuildToolsOutdated
(
_androidSdk
!.
sdkManagerPath
!,
kAndroidSdkMinVersion
,
kAndroidSdkMinVersion
,
kAndroidSdkBuildToolsMinVersion
.
toString
(),
kAndroidSdkBuildToolsMinVersion
.
toString
(),
_platform
,
_platform
,
...
@@ -458,7 +457,7 @@ class AndroidLicenseValidator extends DoctorValidator {
...
@@ -458,7 +457,7 @@ class AndroidLicenseValidator extends DoctorValidator {
return
exitCode
==
0
;
return
exitCode
==
0
;
}
on
ProcessException
catch
(
e
)
{
}
on
ProcessException
catch
(
e
)
{
throwToolExit
(
_userMessages
.
androidCannotRunSdkManager
(
throwToolExit
(
_userMessages
.
androidCannotRunSdkManager
(
_androidSdk
.
sdkManagerPath
!
,
_androidSdk
.
sdkManagerPath
??
''
,
e
.
toString
(),
e
.
toString
(),
_platform
,
_platform
,
));
));
...
...
packages/flutter_tools/lib/src/base/user_messages.dart
View file @
61bce1d8
...
@@ -117,7 +117,7 @@ class UserMessages {
...
@@ -117,7 +117,7 @@ class UserMessages {
'Android sdkmanager tool was found, but failed to run (
$sdkManagerPath
): "
$error
".
\n
'
'Android sdkmanager tool was found, but failed to run (
$sdkManagerPath
): "
$error
".
\n
'
'Try re-installing or updating your Android SDK,
\n
'
'Try re-installing or updating your Android SDK,
\n
'
'visit
${_androidSdkInstallUrl(platform)}
for detailed instructions.'
;
'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
'
'Flutter requires Android SDK
$sdkMinVersion
and the Android BuildTools
$buildToolsMinVersion
\n
'
'To update the Android SDK visit
${_androidSdkInstallUrl(platform)}
for detailed instructions.'
;
'To update the Android SDK visit
${_androidSdkInstallUrl(platform)}
for detailed instructions.'
;
String
get
androidMissingCmdTools
=>
'cmdline-tools component is missing
\n
'
String
get
androidMissingCmdTools
=>
'cmdline-tools component is missing
\n
'
...
...
packages/flutter_tools/test/general.shard/android/android_workflow_test.dart
View file @
61bce1d8
...
@@ -386,7 +386,6 @@ Review licenses that have not been accepted (y/N)?
...
@@ -386,7 +386,6 @@ Review licenses that have not been accepted (y/N)?
..
latestVersion
=
sdkVersion
;
..
latestVersion
=
sdkVersion
;
final
String
errorMessage
=
UserMessages
().
androidSdkBuildToolsOutdated
(
final
String
errorMessage
=
UserMessages
().
androidSdkBuildToolsOutdated
(
sdk
.
sdkManagerPath
,
kAndroidSdkMinVersion
,
kAndroidSdkMinVersion
,
kAndroidSdkBuildToolsMinVersion
.
toString
(),
kAndroidSdkBuildToolsMinVersion
.
toString
(),
FakePlatform
(),
FakePlatform
(),
...
...
packages/flutter_tools/test/general.shard/base/user_messages_test.dart
View file @
61bce1d8
...
@@ -27,7 +27,7 @@ void main() {
...
@@ -27,7 +27,7 @@ void main() {
_checkInstallationURL
((
Platform
platform
)
=>
userMessages
.
androidSdkInstallHelp
(
platform
));
_checkInstallationURL
((
Platform
platform
)
=>
userMessages
.
androidSdkInstallHelp
(
platform
));
_checkInstallationURL
((
Platform
platform
)
=>
userMessages
.
androidMissingSdkManager
(
'/'
,
platform
));
_checkInstallationURL
((
Platform
platform
)
=>
userMessages
.
androidMissingSdkManager
(
'/'
,
platform
));
_checkInstallationURL
((
Platform
platform
)
=>
userMessages
.
androidCannotRunSdkManager
(
'/'
,
''
,
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
));
_checkInstallationURL
((
Platform
platform
)
=>
userMessages
.
androidStudioInstallation
(
platform
));
});
});
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment