Skip to content

Commit

Permalink
Increase recommended CocoaPods version to 1.11 (#98621)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmagman
jmagman committed Feb 24, 2022
1 parent 8d5903f commit 320d2cf
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion packages/flutter_tools/lib/src/macos/cocoapods.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ enum CocoaPodsStatus {
}

const Version cocoaPodsMinimumVersion = Version.withText(1, 9, 0, '1.9.0');
const Version cocoaPodsRecommendedVersion = Version.withText(1, 10, 0, '1.10.0');
const Version cocoaPodsRecommendedVersion = Version.withText(1, 11, 0, '1.11.0');

/// Cocoapods is a dependency management solution for iOS and macOS applications.
///
Expand Down
26 changes: 13 additions & 13 deletions packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,13 @@ void main() {

testWithoutContext('detects at recommended version', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('1.11.0');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended);
});

testWithoutContext('detects above recommended version', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.10.1');
pretendPodVersionIs('1.11.1');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended);
});
});
Expand Down Expand Up @@ -410,7 +410,7 @@ void main() {
testUsingContext('prints warning if macOS Podfile parses .flutter-plugins', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
fakeProcessManager.addCommands(const <FakeCommand>[
FakeCommand(
command: <String>['pod', 'install', '--verbose'],
Expand Down Expand Up @@ -449,7 +449,7 @@ void main() {
testUsingContext('throws, if specs repo is outdated.', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
fileSystem.file(fileSystem.path.join('project', 'ios', 'Podfile'))
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -499,7 +499,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('ffi $errorName failure on ARM macOS prompts gem install', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
fileSystem.file(fileSystem.path.join('project', 'ios', 'Podfile'))
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -542,7 +542,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('ffi failure on x86 macOS does not prompt gem install', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
fileSystem.file(fileSystem.path.join('project', 'ios', 'Podfile'))
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -586,7 +586,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('run pod install, if Podfile.lock is missing', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.ios.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand All @@ -613,7 +613,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('runs iOS pod install, if Manifest.lock is missing', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.ios.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -642,7 +642,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('runs macOS pod install, if Manifest.lock is missing', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.macos.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -671,7 +671,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('runs pod install, if Manifest.lock different from Podspec.lock', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.ios.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -703,7 +703,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('runs pod install, if flutter framework changed', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.ios.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -735,7 +735,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('runs pod install, if Podfile.lock is older than Podfile', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.ios.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down Expand Up @@ -789,7 +789,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
testUsingContext('a failed pod install deletes Pods/Manifest.lock', () async {
final FlutterProject projectUnderTest = setupProjectUnderTest();
pretendPodIsInstalled();
pretendPodVersionIs('1.10.0');
pretendPodVersionIs('100.0.0');
projectUnderTest.ios.podfile
..createSync()
..writeAsStringSync('Existing Podfile');
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_tools/test/general.shard/macos/cocoapods_validator_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void main() {
final ValidationMessage message = result.messages.first;
expect(message.type, ValidationMessageType.hint);
expect(message.message, contains('CocoaPods $currentVersion out of date'));
expect(message.message, contains('(1.10.0 is recommended)'));
expect(message.message, contains('(1.11.0 is recommended)'));
});
});
}
Expand Down

0 comments on commit 320d2cf

Please sign in to comment.