Skip to content
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.

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

fix: Build and Signing Android apps using Flavors #7082

Merged
merged 17 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions cli/src/android/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,25 @@ export async function buildAndroid(
}
}

const releaseDir = releaseTypeIsAAB
? flavor !== ''
? `${flavor}Release`
: 'Release'
: flavor !== ''
? join(flavor, 'release')
: 'release';

const releasePath = join(
config.android.appDirAbs,
'build',
'outputs',
releaseTypeIsAAB ? 'bundle' : 'apk',
buildOptions.flavor ? `${flavor}Release` : 'release',
releaseDir,
);

const unsignedReleaseName = `app${
config.android.flavor ? `-${config.android.flavor}` : ''
}-release${releaseTypeIsAAB ? '' : '-unsigned'}.${releaseType.toLowerCase()}`;
const unsignedReleaseName = `app${flavor !== '' ? `-${flavor}` : ''}-release${
releaseTypeIsAAB ? '' : '-unsigned'
}.${releaseType.toLowerCase()}`;

const signedReleaseName = unsignedReleaseName.replace(
`-release${
Expand Down
2 changes: 2 additions & 0 deletions cli/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ export function runProgram(config: Config): void {
platform,
{
scheme,
flavor,
keystorepath,
keystorepass,
keystorealias,
Expand All @@ -185,6 +186,7 @@ export function runProgram(config: Config): void {
const { buildCommand } = await import('./tasks/build');
await buildCommand(config, platform, {
scheme,
flavor,
keystorepath,
keystorepass,
keystorealias,
Expand Down