Merge branch 'main' into release/v2

* main:
  Prepare for release 2.14.0.
  Support specifying SD card path or size.
  Update npm packages.
  Replace usages of deprecated ANDROID_HOME with ANDROID_ROOT_SDK. Bump build tools to 30.0.3. Update test-fixture dependencies.
  Update Compose Samples URL

node_modules/@actions/http-client/RELEASES.md

@@ -1,5 +1,11 @@
 ## Releases
 
+## 1.0.9
+Throw HttpClientError instead of a generic Error from the \<verb>Json() helper methods when the server responds with a non-successful status code. 
+
+## 1.0.8
+Fixed security issue where a redirect (e.g. 302) to another domain would pass headers.  The fix was to strip the authorization header if the hostname was different.  More [details in PR #27](https://github.com/actions/http-client/pull/27)
+
 ## 1.0.7
 Update NPM dependencies and add 429 to the list of HttpCodes
 
@@ -13,4 +19,4 @@ Adds \<verb>Json() helper methods for json over http scenarios.
 Started to add \<verb>Json() helper methods.  Do not use this release for that.  Use >= 1.0.5 since there was an issue with types.
 
 ## 1.0.1 to 1.0.3
-Adds proxy support.
+Adds proxy support.

node_modules/@actions/http-client/index.d.ts

@@ -42,6 +42,11 @@ export declare enum MediaTypes {
  * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
  */
 export declare function getProxyUrl(serverUrl: string): string;
+export declare class HttpClientError extends Error {
+    constructor(message: string, statusCode: number);
+    statusCode: number;
+    result?: any;
+}
 export declare class HttpClientResponse implements ifm.IHttpClientResponse {
     constructor(message: http.IncomingMessage);
     message: http.IncomingMessage;

node_modules/@actions/http-client/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = require("url");
 const http = require("http");
 const https = require("https");
 const pm = require("./proxy");
@@ -49,7 +48,7 @@ var MediaTypes;
  * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
  */
 function getProxyUrl(serverUrl) {
-    let proxyUrl = pm.getProxyUrl(url.parse(serverUrl));
+    let proxyUrl = pm.getProxyUrl(new URL(serverUrl));
     return proxyUrl ? proxyUrl.href : '';
 }
 exports.getProxyUrl = getProxyUrl;
@@ -68,6 +67,15 @@ const HttpResponseRetryCodes = [
 const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
 const ExponentialBackoffCeiling = 10;
 const ExponentialBackoffTimeSlice = 5;
+class HttpClientError extends Error {
+    constructor(message, statusCode) {
+        super(message);
+        this.name = 'HttpClientError';
+        this.statusCode = statusCode;
+        Object.setPrototypeOf(this, HttpClientError.prototype);
+    }
+}
+exports.HttpClientError = HttpClientError;
 class HttpClientResponse {
     constructor(message) {
         this.message = message;
@@ -86,7 +94,7 @@ class HttpClientResponse {
 }
 exports.HttpClientResponse = HttpClientResponse;
 function isHttps(requestUrl) {
-    let parsedUrl = url.parse(requestUrl);
+    let parsedUrl = new URL(requestUrl);
     return parsedUrl.protocol === 'https:';
 }
 exports.isHttps = isHttps;
@@ -191,7 +199,7 @@ class HttpClient {
         if (this._disposed) {
             throw new Error('Client has already been disposed.');
         }
-        let parsedUrl = url.parse(requestUrl);
+        let parsedUrl = new URL(requestUrl);
         let info = this._prepareRequest(verb, parsedUrl, headers);
         // Only perform retries on reads since writes may not be idempotent.
         let maxTries = this._allowRetries && RetryableHttpVerbs.indexOf(verb) != -1
@@ -230,7 +238,7 @@ class HttpClient {
                     // if there's no location to redirect to, we won't
                     break;
                 }
-                let parsedRedirectUrl = url.parse(redirectUrl);
+                let parsedRedirectUrl = new URL(redirectUrl);
                 if (parsedUrl.protocol == 'https:' &&
                     parsedUrl.protocol != parsedRedirectUrl.protocol &&
                     !this._allowRedirectDowngrade) {
@@ -346,7 +354,7 @@ class HttpClient {
      * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
      */
     getAgent(serverUrl) {
-        let parsedUrl = url.parse(serverUrl);
+        let parsedUrl = new URL(serverUrl);
         return this._getAgent(parsedUrl);
     }
     _prepareRequest(method, requestUrl, headers) {
@@ -419,7 +427,7 @@ class HttpClient {
                 maxSockets: maxSockets,
                 keepAlive: this._keepAlive,
                 proxy: {
-                    proxyAuth: proxyUrl.auth,
+                    proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`,
                     host: proxyUrl.hostname,
                     port: proxyUrl.port
                 }
@@ -514,12 +522,8 @@ class HttpClient {
                 else {
                     msg = 'Failed request: (' + statusCode + ')';
                 }
-                let err = new Error(msg);
-                // attach statusCode and body obj (if available) to the error object
-                err['statusCode'] = statusCode;
-                if (response.result) {
-                    err['result'] = response.result;
-                }
+                let err = new HttpClientError(msg, statusCode);
+                err.result = response.result;
                 reject(err);
             }
             else {

node_modules/@actions/http-client/interfaces.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import http = require('http');
-import url = require('url');
 export interface IHeaders {
     [key: string]: any;
 }
@@ -27,7 +26,7 @@ export interface IHttpClientResponse {
 }
 export interface IRequestInfo {
     options: http.RequestOptions;
-    parsedUrl: url.Url;
+    parsedUrl: URL;
     httpModule: any;
 }
 export interface IRequestOptions {

node_modules/@actions/http-client/package.json

@@ -1,33 +1,33 @@
 {
   "_args": [
     [
-      "@actions/http-client@1.0.8",
-      "/Users/yang/Desktop/Projects/android-emulator-runner"
+      "@actions/http-client@1.0.9",
+      "."
     ]
   ],
-  "_from": "@actions/http-client@1.0.8",
-  "_id": "@actions/http-client@1.0.8",
+  "_from": "@actions/http-client@1.0.9",
+  "_id": "@actions/http-client@1.0.9",
   "_inBundle": false,
-  "_integrity": "sha512-G4JjJ6f9Hb3Zvejj+ewLLKLf99ZC+9v+yCxoYf9vSyH+WkzPLB2LuUtRMGNkooMqdugGBFStIKXOuvH1W+EctA==",
+  "_integrity": "sha512-0O4SsJ7q+MK0ycvXPl2e6bMXV7dxAXOGjrXS1eTF9s2S401Tp6c/P3c3Joz04QefC1J6Gt942Wl2jbm3f4mLcg==",
   "_location": "/@actions/http-client",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "@actions/http-client@1.0.8",
+    "raw": "@actions/http-client@1.0.9",
     "name": "@actions/http-client",
     "escapedName": "@actions%2fhttp-client",
     "scope": "@actions",
-    "rawSpec": "1.0.8",
+    "rawSpec": "1.0.9",
     "saveSpec": null,
-    "fetchSpec": "1.0.8"
+    "fetchSpec": "1.0.9"
   },
   "_requiredBy": [
     "/@actions/tool-cache"
   ],
-  "_resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.8.tgz",
-  "_spec": "1.0.8",
-  "_where": "/Users/yang/Desktop/Projects/android-emulator-runner",
+  "_resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.9.tgz",
+  "_spec": "1.0.9",
+  "_where": ".",
   "author": {
     "name": "GitHub, Inc."
   },
@@ -66,5 +66,5 @@
     "format-check": "prettier --check *.ts && prettier --check **/*.ts",
     "test": "jest"
   },
-  "version": "1.0.8"
+  "version": "1.0.9"
 }

node_modules/@actions/http-client/proxy.d.ts

@@ -1,4 +1,2 @@
-/// <reference types="node" />
-import * as url from 'url';
-export declare function getProxyUrl(reqUrl: url.Url): url.Url | undefined;
-export declare function checkBypass(reqUrl: url.Url): boolean;
+export declare function getProxyUrl(reqUrl: URL): URL | undefined;
+export declare function checkBypass(reqUrl: URL): boolean;

node_modules/@actions/http-client/proxy.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = require("url");
 function getProxyUrl(reqUrl) {
     let usingSsl = reqUrl.protocol === 'https:';
     let proxyUrl;
@@ -15,7 +14,7 @@ function getProxyUrl(reqUrl) {
         proxyVar = process.env['http_proxy'] || process.env['HTTP_PROXY'];
     }
     if (proxyVar) {
-        proxyUrl = url.parse(proxyVar);
+        proxyUrl = new URL(proxyVar);
     }
     return proxyUrl;
 }