DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show CocoaPods version in hint text (#40117)

Browse Source
This commit is contained in:
Jenn Magder 2019-09-10 13:26:32 -07:00 committed by GitHub
parent 3f98fb7949
commit 12229264e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/base/user_messages.dart
View File

@ -167,8 +167,8 @@ class UserMessages {
'$consequence\n'
'To upgrade:\n'
'$upgradeInstructions';
String cocoaPodsOutdated(String recVersion, String consequence, String upgradeInstructions) =>
'CocoaPods out of date ($recVersion is recommended).\n'
String cocoaPodsOutdated(String currentVersion, String recVersion, String consequence, String upgradeInstructions) =>
'CocoaPods $currentVersion out of date ($recVersion is recommended).\n'
'$consequence\n'
'To upgrade:\n'
'$upgradeInstructions';

3
packages/flutter_tools/lib/src/macos/cocoapods_validator.dart
View File

@ -45,8 +45,9 @@ class CocoaPodsValidator extends DoctorValidator {
userMessages.cocoaPodsUnknownVersion(unknownCocoaPodsConsequence, cocoaPodsUpgradeInstructions)));
} else {
status = ValidationType.partial;
final String currentVersionText = await cocoaPods.cocoaPodsVersionText;
messages.add(ValidationMessage.hint(
userMessages.cocoaPodsOutdated(cocoaPods.cocoaPodsRecommendedVersion, noCocoaPodsConsequence, cocoaPodsUpgradeInstructions)));
userMessages.cocoaPodsOutdated(currentVersionText, cocoaPods.cocoaPodsRecommendedVersion, noCocoaPodsConsequence, cocoaPodsUpgradeInstructions)));
}
}

11
packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
View File

@ -62,9 +62,20 @@ void main() {
testUsingContext('Emits partial status when CocoaPods version is too low', () async {
when(cocoaPods.evaluateCocoaPodsInstallation)
.thenAnswer((_) async => CocoaPodsStatus.belowRecommendedVersion);
const String currentVersion = '1.4.0';
when(cocoaPods.cocoaPodsVersionText)
.thenAnswer((_) async => currentVersion);
const String recommendedVersion = '1.8.0';
when(cocoaPods.cocoaPodsRecommendedVersion)
.thenAnswer((_) => recommendedVersion);
const CocoaPodsValidator workflow = CocoaPodsValidator();
final ValidationResult result = await workflow.validate();
expect(result.type, ValidationType.partial);
expect(result.messages.length, 1);
final ValidationMessage message = result.messages.first;
expect(message.type, ValidationMessageType.hint);
expect(message.message, contains('CocoaPods $currentVersion out of date'));
expect(message.message, contains('($recommendedVersion is recommended)'));
}, overrides: <Type, Generator>{
CocoaPods: () => cocoaPods,
});