github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark ios-deploy version 2.0.0 as bad (#30578)

Browse Source 
Mark ios-deploy version 2.0.0 as bad.

ios-deploy before version 1.9.4 declares itself as v2.0.0
https://github.com/ios-control/ios-deploy/commits/master/src/ios-deploy/version.h
This commit is contained in:
Lau Ching Jun 2019-04-08 12:37:43 -07:00 committed by GitHub
parent a12c5618de
commit 294d7ea0cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_tools/lib/src/ios/ios_workflow.dart
View File

@ -52,6 +52,9 @@ class IOSValidator extends DoctorValidator {
String get iosDeployMinimumVersion => '1.9.4';
// ios-deploy <= v1.9.3 declares itself as v2.0.0
List<String> get iosDeployBadVersions => <String>['2.0.0'];
Future<String> get iosDeployVersionText async => (await runAsync(<String>['ios-deploy', '--version'])).processResult.stdout.replaceAll('\n', '');
bool get hasHomebrew => os.which('brew') != null;
@ -63,7 +66,8 @@ class IOSValidator extends DoctorValidator {
return false;
try {
final Version version = Version.parse(await iosDeployVersionText);
return version >= Version.parse(iosDeployMinimumVersion);
return version >= Version.parse(iosDeployMinimumVersion)
&& !iosDeployBadVersions.map((String v) => Version.parse(v)).contains(version);
} on FormatException catch (_) {
return false;
}

16
packages/flutter_tools/test/ios/ios_workflow_test.dart
View File

@ -230,6 +230,22 @@ Show information about a connected device.
CocoaPods: () => cocoaPods,
});
testUsingContext('Emits partial status when ios-deploy version is a known bad version', () async {
when(xcode.isInstalled).thenReturn(true);
when(xcode.versionText)
.thenReturn('Xcode 8.2.1\nBuild version 8C1002\n');
when(xcode.isInstalledAndMeetsVersionCheck).thenReturn(true);
when(xcode.eulaSigned).thenReturn(true);
when(xcode.isSimctlInstalled).thenReturn(true);
final IOSWorkflowTestTarget workflow = IOSWorkflowTestTarget(iosDeployVersionText: '2.0.0');
final ValidationResult result = await workflow.validate();
expect(result.type, ValidationType.partial);
}, overrides: <Type, Generator>{
IMobileDevice: () => iMobileDevice,
Xcode: () => xcode,
CocoaPods: () => cocoaPods,
});
testUsingContext('Emits partial status when simctl is not installed', () async {
when(xcode.isInstalled).thenReturn(true);
when(xcode.versionText)