Use Xcode instruments to list devices #10801
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Eliminates the dependency on idevice_id from libimobiledevice. Instead, uses Xcode built-in functionality.
Member
Author
tvolkert
reviewed
Jun 16, 2017
| // | ||
| // my-mac-pro [2C10513E-4dA5-405C-8EF5-C44353DB3ADD] | ||
| // My iPhone (10.3.2) [75b90e947c5f429fa67f3e9169fda0d89f0492f1] | ||
| // iPhone 6s (9.3) [F6CEE7CF-81EB-4448-81B4-1755288C7C11] (Simulator) |
Contributor
There was a problem hiding this comment.
This regex won't catch this because of the trailing " (Simulator)"
Member
Author
There was a problem hiding this comment.
Yep, we only want real devices. Simulators should be discarded. Updated the comment.
tvolkert
reviewed
Jun 16, 2017
| // my-mac-pro [2C10513E-4dA5-405C-8EF5-C44353DB3ADD] | ||
| // My iPhone (10.3.2) [75b90e947c5f429fa67f3e9169fda0d89f0492f1] | ||
| // iPhone 6s (9.3) [F6CEE7CF-81EB-4448-81B4-1755288C7C11] (Simulator) | ||
| static final RegExp _deviceRegex = new RegExp(r'(.*) +\((.*)\) +\[(.*)]$'); |
Contributor
There was a problem hiding this comment.
\]
And my OCD really wants a ^ at the beginning :-)
tvolkert
reviewed
Jun 16, 2017
| // iPhone 6s (9.3) [F6CEE7CF-81EB-4448-81B4-1755288C7C11] (Simulator) | ||
| static final RegExp _deviceRegex = new RegExp(r'(.*) +\((.*)\) +\[(.*)]$'); | ||
|
|
||
| static List<IOSDevice> getAttachedDevices() { |
Contributor
There was a problem hiding this comment.
It looks like it might not be too bad to make this a Stream<IOSDevice>?
Member
Author
There was a problem hiding this comment.
I like it. I'll put together a follow-up PR.
tvolkert
approved these changes
Jun 16, 2017
cbracken
added a commit
to cbracken/flutter
that referenced
this pull request
Jun 17, 2017
This reverts commit 37bb5f1. Instruments worked well when this was originally landed, and on the following commit, but started failing two commits after this originall landed. Manual invocation of instruments on the build host currently results in: dyld: Library not loaded: @rpath/InstrumentsAnalysisCore.framework/Versions/A/InstrumentsAnalysisCore Referenced from: /Applications/Xcode8.0.app/Contents/Developer/usr/bin/instruments Reason: image not found Abort trap: 6 It appears the /Applications/Xcode8.0.app/Contents/Applications directory (which contains Instruments) is missing on the host.
cbracken
added a commit
that referenced
this pull request
Jun 17, 2017
* Revert "Make device discovery asynchronous (#10803)" This reverts commit 972be9c. * Revert "Use Xcode instruments to list devices (#10801)" This reverts commit 37bb5f1. This is to resolve a failure that looks related to a bad install of Xcode 8.0 on our build bots and should be reinstated when the infra issue is diagnosed and resolved. Instruments worked well when this was originally landed, and on the following commit, but started failing two commits after this originally landed. Manual invocation of instruments on the build host currently results in: ``` dyld: Library not loaded: @rpath/InstrumentsAnalysisCore.framework/Versions/A/InstrumentsAnalysisCore Referenced from: /Applications/Xcode8.0.app/Contents/Developer/usr/bin/instruments Reason: image not found Abort trap: 6 ``` It appears the /Applications/Xcode8.0.app/Contents/Applications directory (which contains Instruments) is missing on the host.
cbracken
added a commit
to cbracken/flutter
that referenced
this pull request
Jun 19, 2017
This reverts commit b2909a2. This resubmits the following patches: 1. Use Xcode instruments to list devices (flutter#10801) Eliminates the dependency on idevice_id from libimobiledevice. Instead, uses Xcode built-in functionality. 2. Make device discovery asynchronous (flutter#10803) Migrates DeviceDiscovery.devices and all device-specific lookup to be asynchronous.
cbracken
added a commit
that referenced
this pull request
Jun 19, 2017
This reverts commit b2909a2. This resubmits the following patches: 1. Use Xcode instruments to list devices (#10801) Eliminates the dependency on idevice_id from libimobiledevice. Instead, uses Xcode built-in functionality. 2. Make device discovery asynchronous (#10803) Migrates DeviceDiscovery.devices and all device-specific lookup to be asynchronous.
gspencergoog
pushed a commit
to gspencergoog/flutter
that referenced
this pull request
Jul 1, 2017
Eliminates the dependency on idevice_id from libimobiledevice. Instead, uses Xcode built-in functionality.
gspencergoog
pushed a commit
to gspencergoog/flutter
that referenced
this pull request
Jul 1, 2017
* Revert "Make device discovery asynchronous (flutter#10803)" This reverts commit 972be9c. * Revert "Use Xcode instruments to list devices (flutter#10801)" This reverts commit 37bb5f1. This is to resolve a failure that looks related to a bad install of Xcode 8.0 on our build bots and should be reinstated when the infra issue is diagnosed and resolved. Instruments worked well when this was originally landed, and on the following commit, but started failing two commits after this originally landed. Manual invocation of instruments on the build host currently results in: ``` dyld: Library not loaded: @rpath/InstrumentsAnalysisCore.framework/Versions/A/InstrumentsAnalysisCore Referenced from: /Applications/Xcode8.0.app/Contents/Developer/usr/bin/instruments Reason: image not found Abort trap: 6 ``` It appears the /Applications/Xcode8.0.app/Contents/Applications directory (which contains Instruments) is missing on the host.
gspencergoog
pushed a commit
to gspencergoog/flutter
that referenced
this pull request
Jul 1, 2017
This reverts commit b2909a2. This resubmits the following patches: 1. Use Xcode instruments to list devices (flutter#10801) Eliminates the dependency on idevice_id from libimobiledevice. Instead, uses Xcode built-in functionality. 2. Make device discovery asynchronous (flutter#10803) Migrates DeviceDiscovery.devices and all device-specific lookup to be asynchronous.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Eliminates the dependency on idevice_id from libimobiledevice. Instead,
uses Xcode built-in functionality.