Skip to content

[TIMOB-23146] iOS/WatchOS: Installing to Simulators hangs since Xcode 7.3 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2016
Merged

[TIMOB-23146] iOS/WatchOS: Installing to Simulators hangs since Xcode 7.3 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion lib/simulator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @module simulator
*
* @copyright
* Copyright (c) 2014-2015 by Appcelerator, Inc. All Rights Reserved.
* Copyright (c) 2014-2016 by Appcelerator, Inc. All Rights Reserved.
*
* @license
* Licensed under the terms of the Apache Public License.
Expand Down Expand Up @@ -935,6 +935,7 @@ function launch(simHandleOrUDID, options, callback) {
var smsRegExp = / SpringBoard\[\d+\]\: SMS Plugin initialized/,
systemLogRegExp = new RegExp(' ' + handle.appName + '\\[(\\d+)\\]: (.*)'),
watchLogMsgRegExp = handle.type === 'ios' && watchAppId ? new RegExp('companionappd\\[(\\d+)\\]: \\((.+)\\) WatchKit: application \\(' + watchAppId + '\\),?\w*(.*)') : null,
xcode73WatchLogMsgRegExp = handle.type === 'ios' && watchAppId ? new RegExp('Installation of ' + watchAppId + ' (.*).') : null,
watchInstallRegExp = /install status: (\d+), message: (.*)$/,
successRegExp = /succeeded|success/i,
crash1RegExp = /^\*\*\* Terminating app/, // objective-c issue
Expand All @@ -957,6 +958,18 @@ function launch(simHandleOrUDID, options, callback) {
return;
}

if (xcode73WatchLogMsgRegExp) {
if (m = line.match(xcode73WatchLogMsgRegExp)) {
if (m[1] === 'acknowledged') {
emitter.emit('log-debug', __('Watch App installed successfully!'));
handle.installed = true;
} else {
simEmitter.emit('error', new Error(__('Watch App installation failure')));
}
return;
}
}

if (watchLogMsgRegExp) {
if (m = line.match(watchLogMsgRegExp)) {
// refine our regex now that we have the pid
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ioslib",
"version": "0.10.3",
"version": "0.10.4",
"description": "iOS Utility Library",
"keywords": [
"appcelerator",
Expand Down