Use new cmdline-tools with support for running sdkmanager and avdmanager with Java 8+.

This commit is contained in:
Yang Chen
2020-03-05 14:05:05 +11:00
committed by Yang
parent e1015a487b
commit 4a949058e2
9 changed files with 43 additions and 141 deletions
-6
View File
@@ -21,7 +21,6 @@ const input_validator_1 = require("./input-validator");
const emulator_manager_1 = require("./emulator-manager");
const exec = __importStar(require("@actions/exec"));
const script_parser_1 = require("./script-parser");
const java_version_manager_1 = require("./java-version-manager");
function run() {
return __awaiter(this, void 0, void 0, function* () {
try {
@@ -73,9 +72,6 @@ function run() {
scripts.forEach((script) => __awaiter(this, void 0, void 0, function* () {
console.log(`${script}`);
}));
// use Java 8 for sdkmanager and avdmanager
const defaultJavaHome = yield java_version_manager_1.getCurrentJavaHome();
java_version_manager_1.setJavaHome(yield java_version_manager_1.getJavaHomeV8());
// install SDK
yield sdk_installer_1.installAndroidSdk(apiLevel, target, arch, emulatorBuild);
try {
@@ -85,8 +81,6 @@ function run() {
catch (error) {
core.setFailed(error.message);
}
// use default JAVA_HOME for running custom script
java_version_manager_1.setJavaHome(defaultJavaHome);
// execute the custom script
try {
// move to custom working directory if set