Skip to content

Commit b035a23

Browse files
Merge pull request #5201 from NativeScript/vladimirov/fix-emulator-29-start
fix: emulator 29 is not started by default
2 parents eeb7524 + a360ba2 commit b035a23

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

lib/common/mobile/android/android-emulator-services.ts

+9-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,15 @@ export class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService
144144
}
145145

146146
private getBestFit(emulators: Mobile.IDeviceInfo[]) {
147-
const best = _(emulators).maxBy(emulator => emulator.version);
147+
let best: Mobile.IDeviceInfo = null;
148+
for (const emulator of emulators) {
149+
const currentVersion = emulator.version && semver.coerce(emulator.version);
150+
const currentBestVersion = best && best.version && semver.coerce(best.version);
151+
if (!best || (currentVersion && currentBestVersion && semver.gt(currentVersion, currentBestVersion))) {
152+
best = emulator;
153+
}
154+
}
155+
148156
const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);
149157
const bestVersion = best && best.version && semver.coerce(best.version);
150158

lib/common/test/unit-tests/services/json-file-settings-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ describe("jsonFileSettingsService", () => {
129129
const result = await new Promise((resolve, reject) => {
130130
setTimeout(() => {
131131
jsonFileSettingsService.getSettingValue<number>("prop1", { cacheTimeout: 1 }).then(resolve, reject);
132-
}, 2);
132+
}, 10);
133133
});
134134

135135
assert.equal(result, null);

npm-shrinkwrap.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nativescript",
33
"preferGlobal": true,
4-
"version": "6.3.1",
4+
"version": "6.3.2",
55
"author": "Telerik <[email protected]>",
66
"description": "Command-line interface for building NativeScript projects",
77
"bin": {

0 commit comments

Comments
 (0)