From fea4a91ab6ec451a22d6c6aed96788a39eb29b0c Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Fri, 23 Sep 2016 16:59:03 -0700 Subject: [PATCH] Flutter run support for iOS 10 (#6028) With iOS 10, the syslog format changed from: Sep 23 16:04:17 cbracken-iPhone Runner[6188] : .* to: Sep 23 16:04:17 cbracken-iPhone Runner(libsystem_asl.dylib)[6188] : .* This updates the observatory port scraping to handle either case. --- packages/flutter_tools/lib/src/ios/devices.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 441899259d7..ac2b816cbba 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -431,8 +431,11 @@ class _IOSDeviceLogReader extends DeviceLogReader { }); } - // Match for lines like "Runner[297] : " in syslog. - static final RegExp _runnerRegex = new RegExp(r'Runner\[[\d]+\] <[A-Za-z]+>: '); + // Match for lines for the runner in syslog. + // + // iOS 9 format: Runner[297] : + // iOS 10 format: Runner(libsystem_asl.dylib)[297] : + static final RegExp _runnerRegex = new RegExp(r'Runner[(.*)]\[[\d]+\] <[A-Za-z]+>: '); void _onLine(String line) { Match match = _runnerRegex.firstMatch(line);