Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[macOS,iOS] Improve CocoaPods upgrade instructions #135453

Merged
merged 2 commits into from
Sep 25, 2023
Merged

[macOS,iOS] Improve CocoaPods upgrade instructions #135453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5a44f1
[macOS,iOS] Improve CocoaPods upgrade instructions
cbracken Sep 25, 2023
dc6b6bf
Merge branch 'master' into cocoapods-upgrade-string
cbracken Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/flutter_tools/lib/src/macos/cocoapods.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ const String outOfDatePluginsPodfileConsequence = '''

const String cocoaPodsInstallInstructions = 'see https://guides.cocoapods.org/using/getting-started.html#installation for instructions.';

const String cocoaPodsUpdateInstructions = 'see https://guides.cocoapods.org/using/getting-started.html#updating-cocoapods for instructions.';

const String podfileIosMigrationInstructions = '''
rm ios/Podfile''';

Expand Down
21 changes: 9 additions & 12 deletions packages/flutter_tools/lib/src/macos/cocoapods_validator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,28 @@ class CocoaPodsValidator extends DoctorValidator {
.evaluateCocoaPodsInstallation;

ValidationType status = ValidationType.success;
if (cocoaPodsStatus == CocoaPodsStatus.recommended) {
messages.add(ValidationMessage(_userMessages.cocoaPodsVersion((await _cocoaPods.cocoaPodsVersionText).toString())));
} else {
if (cocoaPodsStatus == CocoaPodsStatus.notInstalled) {
switch (cocoaPodsStatus) {
case CocoaPodsStatus.recommended:
messages.add(ValidationMessage(_userMessages.cocoaPodsVersion((await _cocoaPods.cocoaPodsVersionText).toString())));
case CocoaPodsStatus.notInstalled:
status = ValidationType.missing;
messages.add(ValidationMessage.error(
_userMessages.cocoaPodsMissing(noCocoaPodsConsequence, cocoaPodsInstallInstructions)));

} else if (cocoaPodsStatus == CocoaPodsStatus.brokenInstall) {
case CocoaPodsStatus.brokenInstall:
status = ValidationType.missing;
messages.add(ValidationMessage.error(
_userMessages.cocoaPodsBrokenInstall(brokenCocoaPodsConsequence, cocoaPodsInstallInstructions)));

} else if (cocoaPodsStatus == CocoaPodsStatus.unknownVersion) {
case CocoaPodsStatus.unknownVersion:
status = ValidationType.partial;
messages.add(ValidationMessage.hint(
_userMessages.cocoaPodsUnknownVersion(unknownCocoaPodsConsequence, cocoaPodsInstallInstructions)));
} else {
case CocoaPodsStatus.belowMinimumVersion:
case CocoaPodsStatus.belowRecommendedVersion:
status = ValidationType.partial;
final String currentVersionText = (await _cocoaPods.cocoaPodsVersionText).toString();
messages.add(ValidationMessage.hint(
_userMessages.cocoaPodsOutdated(currentVersionText, cocoaPodsRecommendedVersion.toString(), noCocoaPodsConsequence, cocoaPodsInstallInstructions)));
}
_userMessages.cocoaPodsOutdated(currentVersionText, cocoaPodsRecommendedVersion.toString(), noCocoaPodsConsequence, cocoaPodsUpdateInstructions)));
}

return ValidationResult(status, messages);
}
}
1 change: 1 addition & 0 deletions packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ void main() {
expect(message.type, ValidationMessageType.hint);
expect(message.message, contains('CocoaPods $currentVersion out of date'));
expect(message.message, contains('(1.11.0 is recommended)'));
expect(message.message, contains('getting-started.html#updating-cocoapods'));
});
});
}
Expand Down