Unverified Commit a14ac4e3 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Bump recommended CocoaPods version to 1.8 (#52071)

parent f6a55125
...@@ -69,7 +69,7 @@ class CocoaPods { ...@@ -69,7 +69,7 @@ class CocoaPods {
Future<String> _versionText; Future<String> _versionText;
String get cocoaPodsMinimumVersion => '1.6.0'; String get cocoaPodsMinimumVersion => '1.6.0';
String get cocoaPodsRecommendedVersion => '1.6.0'; String get cocoaPodsRecommendedVersion => '1.8.0';
Future<bool> get isInstalled => Future<bool> get isInstalled =>
processUtils.exitsHappy(<String>['which', 'pod']); processUtils.exitsHappy(<String>['which', 'pod']);
......
...@@ -68,7 +68,7 @@ void main() { ...@@ -68,7 +68,7 @@ void main() {
projectUnderTest = FlutterProject.fromDirectory(fs.directory('project')); projectUnderTest = FlutterProject.fromDirectory(fs.directory('project'));
projectUnderTest.ios.xcodeProject.createSync(recursive: true); projectUnderTest.ios.xcodeProject.createSync(recursive: true);
cocoaPodsUnderTest = CocoaPods(); cocoaPodsUnderTest = CocoaPods();
pretendPodVersionIs('1.6.0'); pretendPodVersionIs('1.8.0');
fs.file(fs.path.join( fs.file(fs.path.join(
Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'cocoapods', 'Podfile-ios-objc', Cache.flutterRoot, 'packages', 'flutter_tools', 'templates', 'cocoapods', 'Podfile-ios-objc',
)) ))
...@@ -173,9 +173,17 @@ void main() { ...@@ -173,9 +173,17 @@ void main() {
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
}); });
testUsingContext('detects at recommended version', () async { testUsingContext('detects below recommended version', () async {
pretendPodIsInstalled(); pretendPodIsInstalled();
pretendPodVersionIs('1.6.0'); pretendPodVersionIs('1.6.0');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.belowRecommendedVersion);
}, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager,
});
testUsingContext('detects at recommended version', () async {
pretendPodIsInstalled();
pretendPodVersionIs('1.8.0');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended); expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
...@@ -183,7 +191,7 @@ void main() { ...@@ -183,7 +191,7 @@ void main() {
testUsingContext('detects above recommended version', () async { testUsingContext('detects above recommended version', () async {
pretendPodIsInstalled(); pretendPodIsInstalled();
pretendPodVersionIs('1.6.1'); pretendPodVersionIs('1.8.1');
expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended); expect(await cocoaPodsUnderTest.evaluateCocoaPodsInstallation, CocoaPodsStatus.recommended);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
ProcessManager: () => mockProcessManager, ProcessManager: () => mockProcessManager,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment