Skip to content

WIP fix: fallback to checking for buildType if the flavor-less apk is not found #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP fix: fallback to checking for buildType if the flavor-less apk is not found #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions packages/platform-android/src/lib/commands/runAndroid/findOutputFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import { logger, spawn } from '@rock-js/tools';
import { getAdbPath } from './adb.js';
import type { AndroidProject } from './runAndroid.js';

/**
* Gradle produces following output binaries:
* - build/outputs/apk/debug/app-debug.apk - for buildTypes.debug in install* and assemble* tasks
* - build/outputs/bundle/release/app-release.aab - for buildTypes.release in bundle* tasks
* - build/outputs/bundle/production/debug/app-production-debug.aab - for buildTypes.debug and flavors.production in bundle* tasks
* - build/outputs/apk/customBuildType/app-customBuildType.apk - for buildTypes.customBuildType in install* and assemble* tasks
*/
export async function findOutputFile(
androidProject: AndroidProject,
tasks: string[],
Expand All @@ -19,21 +26,30 @@ export async function findOutputFile(
return false;
}
// handle if selected task includes build flavour as well, eg. installProductionDebug should create ['production','debug'] array
const variantFromSelectedTask = selectedTask
const variantFromBuildTypeAndFlavor = selectedTask
?.replace('install', '')
?.replace('assemble', '')
?.replace('bundle', '')
.split(/(?=[A-Z])/);

const apkOrBundle = selectedTask?.includes('bundle') ? 'bundle' : 'apk';
// create path to output file, eg. `production/debug`
const variantPath = variantFromSelectedTask?.join('/')?.toLowerCase();
const variantPath = variantFromBuildTypeAndFlavor?.join('/')?.toLowerCase();
// create output file name, eg. `production-debug`
const variantAppName = variantFromSelectedTask?.join('-')?.toLowerCase();
const apkOrBundle = selectedTask?.includes('bundle') ? 'bundle' : 'apk';
const buildDirectory = `${sourceDir}/${appName}/build/outputs/${apkOrBundle}/${variantPath}`;
let variant = variantFromBuildTypeAndFlavor?.join('-')?.toLowerCase();
let buildDirectory = `${sourceDir}/${appName}/build/outputs/${apkOrBundle}/${variantPath}`;

if (!existsSync(buildDirectory)) {
// default "debug" nor "release" build type or flavor is not found. fallback to searching for buildTypes that might be named with pascalCase
const buildTypeVariant = variantFromBuildTypeAndFlavor;
buildTypeVariant[0] = buildTypeVariant[0]?.toLowerCase();
const variantPath = buildTypeVariant?.join('');
variant = buildTypeVariant?.join('');
buildDirectory = `${sourceDir}/${appName}/build/outputs/${apkOrBundle}/${variantPath}`;
}
const outputFile = await getInstallOutputFileName(
appName,
variantAppName,
variant,
buildDirectory,
apkOrBundle === 'apk' ? 'apk' : 'aab',
device,
Expand Down
Loading