Merge remote-tracking branch 'origin/main' into feat/hooks-esm-support

Author: NathanWalker

Gruntfile.js

@@ -248,15 +248,40 @@ function registerTestingDependenciesTasks(grunt) {
 	const generatedVersionFilePath = path.join(configsBasePath, "test-deps-versions-generated.json");
 
 	grunt.registerTask("generate_unit_testing_dependencies", async function () {
-		var done = this.async();
+		const done = this.async();
+
 		const dependenciesVersions = {};
-		const testDependencies = grunt.file.readJSON(path.join(configsBasePath, "test-dependencies.json"));
-		for (var dependency of testDependencies) {
-			const dependencyVersion = dependency.version || await latestVersion(dependency.name);
-			dependenciesVersions[dependency.name] = dependencyVersion;
+		let testDependencies;
+
+		try {
+			testDependencies = grunt.file.readJSON(path.join(configsBasePath, "test-dependencies.json"));
+		} catch (err) {
+			grunt.log.error("Could not read test-dependencies.json:", err);
+			return done(false);
 		}
-		grunt.file.write(generatedVersionFilePath, JSON.stringify(dependenciesVersions));
-		done();
+
+		
+		// Kick off all version resolutions in parallel
+		const versionPromises = testDependencies.map(dep => {
+			if (dep.version) {
+				dependenciesVersions[dep.name] = dep.version;
+				return Promise.resolve();
+			}
+			return latestVersion(dep.name).then(v => {
+				dependenciesVersions[dep.name] = v;
+			});
+		});
+
+		Promise.all(versionPromises)
+			.then(() => {
+				grunt.file.write(generatedVersionFilePath, JSON.stringify(dependenciesVersions, null, 2));
+				grunt.log.writeln("Wrote", generatedVersionFilePath);
+				done();
+			})
+			.catch(err => {
+				grunt.log.error(err);
+				done(false);
+			});
 	});
 
 	grunt.registerTask("verify_unit_testing_dependencies", function () {

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

@@ -235,7 +235,7 @@ export class AndroidEmulatorServices
 		const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);
 		const bestVersion = best && best.version && semver.coerce(best.version);
 
-		return bestVersion && semver.gte(bestVersion, minVersion) ? best : null;
+		return !bestVersion || semver.gte(bestVersion, minVersion) ? best : null;
 	}
 
 	private async waitForEmulatorBootToComplete(

lib/common/mobile/emulator-helper.ts

@@ -5,6 +5,7 @@ import { injector } from "../yok";
 export class EmulatorHelper implements Mobile.IEmulatorHelper {
 	// https://developer.android.com/guide/topics/manifest/uses-sdk-element
 	public mapAndroidApiLevelToVersion = {
+		"android-36": "16.0.0",
 		"android-35": "15.0.0",
 		"android-34": "14.0.0",
 		"android-33": "13.0.0",