Skip to content

Commit

Permalink
Merge 'r0adkill/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kevin-david committed Aug 5, 2024
2 parents a5bdc9a + f30bdd3 commit 2b046fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Then copy the contents of the `.txt` file to your GH secrets

## ENV: `BUILD_TOOLS_VERSION`

**Optional:** You can manually specify a version of build-tools to use. We use `32.0.0` by default.
**Optional:** You can manually specify a version of build-tools to use. We use `33.0.0` by default.

## Outputs

Expand Down Expand Up @@ -77,8 +77,8 @@ steps:
keyPassword: ${{ secrets.KEY_PASSWORD }}
zipAlign: true
env:
# override default build-tools version (32.0.0) -- optional
BUILD_TOOLS_VERSION: "30.0.2"
# override default build-tools version (33.0.0) -- optional
BUILD_TOOLS_VERSION: "34.0.0"

# Example use of `signedReleaseFile` output -- not needed
- uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion lib/signing.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function signApkFile(apkFile, signingKeyFile, alias, keyStorePassword, keyPasswo
return __awaiter(this, void 0, void 0, function* () {
core.debug("Zipaligning APK file");
// Find zipalign executable
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '32.0.0';
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '33.0.0';
const androidHome = process.env.ANDROID_HOME;
const buildTools = path.join(androidHome, `build-tools/${buildToolsVersion}`);
if (!fs.existsSync(buildTools)) {
Expand Down
2 changes: 1 addition & 1 deletion src/signing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export async function signApkFile(
core.debug("Zipaligning APK file");

// Find zipalign executable
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '32.0.0';
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '33.0.0';
const androidHome = process.env.ANDROID_HOME;
const buildTools = path.join(androidHome!, `build-tools/${buildToolsVersion}`);
if (!fs.existsSync(buildTools)) {
Expand Down

0 comments on commit 2b046fb

Please sign in to comment.