catmeow/setup-android
1
0
Fork 0
mirror of https://github.com/android-actions/setup-android synced 2024-11-25 22:58:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change "Licence" to "License"

Browse source
This commit is contained in:
Vilius Sutkus '89 2023-11-21 22:35:25 +02:00
parent aeaba18a12
commit ade8112388
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -65,15 +65,15 @@ To install a different version, call setup-android with desired long version as
Current cmdline tools version can be found at https://developer.android.com/studio#command-line-tools-only Current cmdline tools version can be found at https://developer.android.com/studio#command-line-tools-only
# Android SDK Licences # Android SDK Licenses
Android SDK (unsurprisingly) is not public domain software, it comes with a licence. Android SDK (unsurprisingly) is not public domain software, it comes with a license.
Input parameter `accept-android-sdk-licenses` decides if Android SDK licences should be agreed to on behalf of the user of this action. Input parameter `accept-android-sdk-licenses` decides if Android SDK licenses should be agreed to on behalf of the user of this action.
Default option is 'yes', because otherwise SDK is unusable until said licences are agreed to. Default option is 'yes', because otherwise SDK is unusable until said licenses are agreed to.
Licences are quite long, to prevent a wall of text in the action output, licences can be agreed to silently. licenses are quite long, to prevent a wall of text in the action output, licenses can be agreed to silently.
Input parameter `log-accepted-android-sdk-licenses` controls whether licence texts should be printed or omitted from the text output. Defaults to 'true'. Input parameter `log-accepted-android-sdk-licenses` controls whether license texts should be printed or omitted from the text output. Defaults to 'true'.
# Thanks # Thanks
Based on the project [android-problem-matchers-action](https://github.com/jonasb/android-problem-matchers-action) from [@jonasb](https://github.com/jonasb) Based on the project [android-problem-matchers-action](https://github.com/jonasb/android-problem-matchers-action) from [@jonasb](https://github.com/jonasb)

4
action.yml
View file

@ -9,12 +9,12 @@ inputs:
default: '10406996' default: '10406996'
accept-android-sdk-licenses: accept-android-sdk-licenses:
description: 'Android SDK is usable only after the licence agreement. Should setup-android agree to the licences, provided by "sdkmanager --licenses"' description: 'Android SDK is usable only after the license agreement. Should setup-android agree to the licences, provided by "sdkmanager --licenses"'
required: false required: false
default: 'true' default: 'true'
log-accepted-android-sdk-licenses: log-accepted-android-sdk-licenses:
description: 'Should accepted licences be logged. If not, accepted licences will be accepted silently' description: 'Should accepted licenses be logged. If not, accepted licences will be accepted silently'
required: false required: false
default: 'true' default: 'true'

2
dist/index.js vendored
View file

@ -28266,7 +28266,7 @@ function run() {
} }
const sdkManagerExe = yield installSdkManager(); const sdkManagerExe = yield installSdkManager();
if (core.getBooleanInput('accept-android-sdk-licenses')) { if (core.getBooleanInput('accept-android-sdk-licenses')) {
core.info('Accepting Android SDK licences'); core.info('Accepting Android SDK licenses');
yield callSdkManager(sdkManagerExe, '--licenses', core.getBooleanInput('log-accepted-android-sdk-licenses')); yield callSdkManager(sdkManagerExe, '--licenses', core.getBooleanInput('log-accepted-android-sdk-licenses'));
} }
yield callSdkManager(sdkManagerExe, 'tools'); yield callSdkManager(sdkManagerExe, 'tools');

2
src/main.ts
View file

@ -149,7 +149,7 @@ async function run(): Promise<void> {
const sdkManagerExe = await installSdkManager() const sdkManagerExe = await installSdkManager()
if (core.getBooleanInput('accept-android-sdk-licenses')) { if (core.getBooleanInput('accept-android-sdk-licenses')) {
core.info('Accepting Android SDK licences') core.info('Accepting Android SDK licenses')
await callSdkManager( await callSdkManager(
sdkManagerExe, sdkManagerExe,
'--licenses', '--licenses',