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.

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

Jump to bottom

fix: Build and Signing Android apps using Flavors #7082

Merged
merged 17 commits into from
Jan 18, 2024
Merged

fix: Build and Signing Android apps using Flavors #7082

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5210783
Update the flavor variable used when creating the unsignedReleaseName
bosh-code Nov 20, 2023
9cbb78f
Update the flavor variable used when creating the unsignedReleaseName
bosh-code Nov 20, 2023
0147980
Merge remote-tracking branch 'origin/bugfix/flavor-signing' into bugf…
bosh-code Nov 20, 2023
6a25ae4
add flavor to the build command
bosh-code Nov 20, 2023
f70b816
use correct build path
bosh-code Nov 20, 2023
ae33f65
Merge branch 'main' into bugfix/flavor-signing
markemer Nov 28, 2023
ffcae4e
Merge branch 'ionic-team:main' into bugfix/flavor-signing
bosh-code Nov 28, 2023
d658e9f
npm run fmt
bosh-code Nov 28, 2023
8234d72
Merge branch 'main' into bugfix/flavor-signing
bosh-code Nov 29, 2023
f8f91c6
Merge branch 'main' into bugfix/flavor-signing
jcesarmobile Nov 29, 2023
5818a0f
update release dir based on flavor and releaseType
bosh-code Nov 30, 2023
afacccb
Merge branch 'main' into bugfix/flavor-signing
markemer Dec 14, 2023
ca727c0
Merge branch 'main' into bugfix/flavor-signing
jcesarmobile Dec 21, 2023
2e48257
Merge branch 'main' into bugfix/flavor-signing
jcesarmobile Jan 16, 2024
a7cf90b
Merge branch 'main' into bugfix/flavor-signing
jcesarmobile Jan 16, 2024
10a3729
Merge branch 'main' into bugfix/flavor-signing
jcesarmobile Jan 17, 2024
15aaf5f
Merge branch 'main' into bugfix/flavor-signing
markemer Jan 18, 2024
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
8 changes: 4 additions & 4 deletions cli/src/android/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ export async function buildAndroid(
'build',
'outputs',
releaseTypeIsAAB ? 'bundle' : 'apk',
buildOptions.flavor ? `${flavor}Release` : 'release',
buildOptions.flavor ? `${flavor}/release` : 'release',
);

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
View file
Open in desktop
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