Skip to content
This repository was archived by the owner on Feb 2, 2021. It is now read-only.

Commit 34d33f1

Browse files
committed
Support for getting device by name and sdk
Fixes: NativeScript/nativescript-cli#2131 NativeScript/nativescript-cli#1548
1 parent 8fc0ffb commit 34d33f1

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

mobile/ios/simulator/ios-emulator-services.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class IosEmulatorServices implements Mobile.IiOSSimulatorService {
4242
public async startEmulator(emulatorImage?: string): Promise<string> {
4343
return this.$iOSSimResolver.iOSSim.startSimulator({
4444
id: emulatorImage,
45-
state: "None"
45+
state: "None",
46+
sdkVersion: this.$options.sdk
4647
});
4748
}
4849

mobile/mobile-core/devices-service.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,12 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
218218
* @param identifier running emulator or device identifier
219219
*/
220220
public getDeviceByIdentifier(identifier: string): Mobile.IDevice {
221-
const searchedDevice = _.find(this.getDeviceInstances(), (device: Mobile.IDevice) => { return device.deviceInfo.identifier === identifier; });
221+
const searchedDevice = _.find(this.getDeviceInstances(), (device: Mobile.IDevice) => {
222+
if (this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform) && device.isEmulator) {
223+
return device.deviceInfo.identifier === identifier || device.deviceInfo.displayName === identifier;
224+
}
225+
return device.deviceInfo.identifier === identifier;
226+
});
222227
if (!searchedDevice) {
223228
this.$errors.fail(this.$messages.Devices.NotFoundDeviceByIdentifierErrorMessageWithIdentifier, identifier, this.$staticConfig.CLIENT_NAME.toLowerCase());
224229
}

0 commit comments

Comments
 (0)