From ade811238830651624ce0e1cbbcebaa702e6f469 Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Tue, 21 Nov 2023 22:35:25 +0200 Subject: [PATCH] Change "Licence" to "License" --- README.md | 12 ++++++------ action.yml | 4 ++-- dist/index.js | 2 +- src/main.ts | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5424839..8e8465f 100644 --- a/README.md +++ b/README.md @@ -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 -# 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. -Default option is 'yes', because otherwise SDK is unusable until said licences are agreed to. +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 licenses are agreed to. -Licences are quite long, to prevent a wall of text in the action output, licences 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'. +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 license texts should be printed or omitted from the text output. Defaults to 'true'. # Thanks Based on the project [android-problem-matchers-action](https://github.com/jonasb/android-problem-matchers-action) from [@jonasb](https://github.com/jonasb) diff --git a/action.yml b/action.yml index 178e182..d982c13 100644 --- a/action.yml +++ b/action.yml @@ -9,12 +9,12 @@ inputs: default: '10406996' 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 default: 'true' 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 default: 'true' diff --git a/dist/index.js b/dist/index.js index a8bb5b9..b98dbf5 100644 --- a/dist/index.js +++ b/dist/index.js @@ -28266,7 +28266,7 @@ function run() { } const sdkManagerExe = yield installSdkManager(); 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, 'tools'); diff --git a/src/main.ts b/src/main.ts index c0b8950..b31dc92 100644 --- a/src/main.ts +++ b/src/main.ts @@ -149,7 +149,7 @@ async function run(): Promise { const sdkManagerExe = await installSdkManager() if (core.getBooleanInput('accept-android-sdk-licenses')) { - core.info('Accepting Android SDK licences') + core.info('Accepting Android SDK licenses') await callSdkManager( sdkManagerExe, '--licenses',