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

Update logic for parsing sdk version number (#15918)

Browse Source 
* add logic to parse 11.3 sim runtime major version

* add null aware and bump group number

* add comment describing version
This commit is contained in:
Jonah Williams 2018-04-01 17:35:05 -07:00 committed by GitHub
parent 68db514ec0
commit 0c89920069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/lib/src/ios/simulators.dart
View File

@ -441,11 +441,11 @@ class IOSSimulator extends Device {
@override
Future<String> get sdkNameAndVersion async => category;
final RegExp _iosSdkRegExp = new RegExp(r'iOS (\d+)');
final RegExp _iosSdkRegExp = new RegExp(r'iOS( |-)(\d+)');
Future<int> get sdkMajorVersion async {
final Match sdkMatch = _iosSdkRegExp.firstMatch(await sdkNameAndVersion);
return int.parse(sdkMatch.group(1) ?? 11);
return int.parse(sdkMatch?.group(2) ?? 11);
}
@override

15
packages/flutter_tools/test/ios/simulators_test.dart
View File

@ -94,6 +94,21 @@ void main() {
});
});
group('sdkMajorVersion', () {
// This new version string appears in SimulatorApp-850 CoreSimulator-518.16 beta.
test('can be parsed from iOS-11-3', () async {
final IOSSimulator device = new IOSSimulator('x', name: 'iPhone SE', category: 'com.apple.CoreSimulator.SimRuntime.iOS-11-3');
expect(await device.sdkMajorVersion, 11);
});
test('can be parsed from iOS 11.2', () async {
final IOSSimulator device = new IOSSimulator('x', name: 'iPhone SE', category: 'iOS 11.2');
expect(await device.sdkMajorVersion, 11);
});
});
group('IOSSimulator.isSupported', () {
testUsingContext('Apple TV is unsupported', () {
expect(new IOSSimulator('x', name: 'Apple TV').isSupported(), false);