Merge branch 'main' into fix-aab-build-script

pull/512/head
Andrew Kahr 2023-02-19 20:29:42 -08:00
commit bd4b55929f
4 changed files with 10 additions and 10 deletions

View File

@ -53,7 +53,7 @@ inputs:
description: '[Deprecated] Use androidExportType instead. Whether to build .aab instead of .apk' description: '[Deprecated] Use androidExportType instead. Whether to build .aab instead of .apk'
androidExportType: androidExportType:
required: false required: false
default: 'androidPackage' default: ''
description: description:
'The android export type. Should be androidPackage for apk, androidAppBundle for aab, or androidStudioProject for 'The android export type. Should be androidPackage for apk, androidAppBundle for aab, or androidStudioProject for
an android studio project.' an android studio project.'
@ -83,11 +83,11 @@ inputs:
description: 'The android target API level.' description: 'The android target API level.'
androidSymbolType: androidSymbolType:
required: false required: false
default: 'none' default: 'public'
description: 'The android symbol type to export. Should be "none", "public" or "debugging".' description: 'The android symbol type to export. Should be "none", "public" or "debugging".'
sshAgent: sshAgent:
required: false required: false
default: 'public' default: ''
description: 'SSH Agent path to forward to the container' description: 'SSH Agent path to forward to the container'
gitPrivateToken: gitPrivateToken:
required: false required: false

6
dist/index.js vendored
View File

@ -7231,9 +7231,9 @@ class Input {
} }
static get androidExportType() { static get androidExportType() {
// TODO: remove this in V3 // TODO: remove this in V3
const exportType = Input.getInput('androidExportType'); const exportType = Input.getInput('androidExportType') || '';
if (exportType) { if (exportType !== '') {
return exportType || 'androidPackage'; return exportType;
} }
return Input.androidAppBundle ? 'androidAppBundle' : 'androidPackage'; return Input.androidAppBundle ? 'androidAppBundle' : 'androidPackage';
// End TODO // End TODO

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@ -142,10 +142,10 @@ class Input {
static get androidExportType() { static get androidExportType() {
// TODO: remove this in V3 // TODO: remove this in V3
const exportType = Input.getInput('androidExportType'); const exportType = Input.getInput('androidExportType') || '';
if (exportType) { if (exportType !== '') {
return exportType || 'androidPackage'; return exportType;
} }
return Input.androidAppBundle ? 'androidAppBundle' : 'androidPackage'; return Input.androidAppBundle ? 'androidAppBundle' : 'androidPackage';