development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-13 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tools] Add Xcode version to non-verbose Flutter doctor (#87022)

Browse source
This commit is contained in:
Taha Tesser 2021-08-18 01:52:03 +03:00 committed by GitHub
parent a1ae4feac5
commit 42a6b7913c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/flutter_tools/lib/src/ios/xcodeproj.dart
View file

@ -58,6 +58,7 @@ class XcodeProjectInterpreter {
processManager: processManager, processManager: processManager,
), ),
_version = version, _version = version,
_versionText = version?.toString(),
_usage = usage; _usage = usage;
/// Create an [XcodeProjectInterpreter] for testing. /// Create an [XcodeProjectInterpreter] for testing.

6
packages/flutter_tools/lib/src/macos/xcode_validator.dart
View file

@ -32,9 +32,11 @@ class XcodeValidator extends DoctorValidator {
} }
final String? versionText = _xcode.versionText; final String? versionText = _xcode.versionText;
if (versionText != null) { if (versionText != null) {
messages.add(ValidationMessage(versionText)); xcodeVersionInfo = versionText;
if (xcodeVersionInfo.contains(',')) {
xcodeVersionInfo = xcodeVersionInfo.substring(0, xcodeVersionInfo.indexOf(','));
}
} }
if (!_xcode.isInstalledAndMeetsVersionCheck) { if (!_xcode.isInstalledAndMeetsVersionCheck) {
xcodeStatus = ValidationType.partial; xcodeStatus = ValidationType.partial;
messages.add(ValidationMessage.error(_userMessages.xcodeOutdated(xcodeRequiredVersion.toString()))); messages.add(ValidationMessage.error(_userMessages.xcodeOutdated(xcodeRequiredVersion.toString())));

6
packages/flutter_tools/test/general.shard/macos/xcode_validator_test.dart
View file

@ -23,6 +23,7 @@ void main() {
final XcodeValidator validator = XcodeValidator(xcode: xcode, userMessages: UserMessages()); final XcodeValidator validator = XcodeValidator(xcode: xcode, userMessages: UserMessages());
final ValidationResult result = await validator.validate(); final ValidationResult result = await validator.validate();
expect(result.type, ValidationType.missing); expect(result.type, ValidationType.missing);
expect(result.statusInfo, isNull);
expect(result.messages.last.type, ValidationMessageType.error); expect(result.messages.last.type, ValidationMessageType.error);
expect(result.messages.last.message, contains('Xcode not installed')); expect(result.messages.last.message, contains('Xcode not installed'));
}); });
@ -182,6 +183,11 @@ void main() {
final XcodeValidator validator = XcodeValidator(xcode: xcode, userMessages: UserMessages()); final XcodeValidator validator = XcodeValidator(xcode: xcode, userMessages: UserMessages());
final ValidationResult result = await validator.validate(); final ValidationResult result = await validator.validate();
expect(result.type, ValidationType.installed); expect(result.type, ValidationType.installed);
expect(result.messages.length, 1);
final ValidationMessage firstMessage = result.messages.first;
expect(firstMessage.type, ValidationMessageType.information);
expect(firstMessage.message, 'Xcode at /Library/Developer/CommandLineTools');
expect(result.statusInfo, '1000.0.0');
}); });
}); });
} }