Skip to content

Commit

Permalink
Merge branch 'kevin-david:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
mdarvanaghi authored Jan 13, 2025
2 parents bc77b67 + b98f430 commit 64952a2
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 `33.0.0` by default.
**Optional:** You can manually specify a version of build-tools to use. We use `35.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 (33.0.0) -- optional
BUILD_TOOLS_VERSION: "34.0.0"
# override default build-tools version (35.0.0) -- optional
BUILD_TOOLS_VERSION: "35.0.0"

# Example use of `signedReleaseFile` output -- not needed
- uses: actions/upload-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26180,7 +26180,7 @@ __webpack_async_result__();
async function signApkFile(apkFile, signingKeyFile, alias, keyStorePassword, keyPassword, doZipAlign, usePageAlign, v1SigningEnabled, v2SigningEnabled, v3SigningEnabled, v4SigningEnabled) {
_actions_core__WEBPACK_IMPORTED_MODULE_1__.debug('Zipaligning APK file');
// Find zipalign executable
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '33.0.0';
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '35.0.0';
const androidHome = process.env.ANDROID_HOME;
const buildTools = path__WEBPACK_IMPORTED_MODULE_3__.join(androidHome, `build-tools/${buildToolsVersion}`);
if (!fs__WEBPACK_IMPORTED_MODULE_4__.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 @@ -20,7 +20,7 @@ export async function signApkFile(
core.debug('Zipaligning APK file');

// Find zipalign executable
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '33.0.0';
const buildToolsVersion = process.env.BUILD_TOOLS_VERSION || '35.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 64952a2

Please sign in to comment.