Skip to content

Commit ded3485

Browse files
committed
feat(android): flavor support
1 parent e548004 commit ded3485

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

lib/data/build-data.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export class AndroidBuildData extends BuildData {
4848
public keyStoreAliasPassword: string;
4949
public keyStorePassword: string;
5050
public androidBundle: boolean;
51+
public gradleFlavor: string;
5152
public gradlePath: string;
5253
public gradleArgs: string;
5354

@@ -60,6 +61,7 @@ export class AndroidBuildData extends BuildData {
6061
this.keyStorePassword = data.keyStorePassword;
6162
this.androidBundle = data.androidBundle || data.aab;
6263
this.buildFilterDevicesArch = !this.androidBundle && data.filterDevicesArch !== false ;
64+
this.gradleFlavor = data.flavor;
6365
this.gradlePath = data.gradlePath;
6466
this.gradleArgs = data.gradleArgs;
6567
}

lib/declarations.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -580,6 +580,7 @@ interface IAndroidBundleOptions {
580580
}
581581

582582
interface IAndroidOptions {
583+
gradleFlavor: string;
583584
gradlePath: string;
584585
gradleArgs: string[];
585586
}

lib/definitions/build.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ interface IAndroidBuildData
3232
IHasAndroidBundle {
3333
buildFilterDevicesArch?: boolean;
3434
gradlePath?: string;
35+
gradleFlavor?: string;
3536
gradleArgs?: string[];
3637
}
3738

lib/options.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ export class Options {
216216
default: false,
217217
hasSensitiveValue: false,
218218
},
219+
flavor: { type: OptionType.String, hasSensitiveValue: false },
219220
gradlePath: { type: OptionType.String, hasSensitiveValue: false },
220221
gradleArgs: { type: OptionType.String, hasSensitiveValue: false, array: true },
221222
aab: { type: OptionType.Boolean, hasSensitiveValue: false },

lib/services/android/gradle-build-args-service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
9898
}
9999

100100
private getBuildTaskName(buildData: IAndroidBuildData): string {
101-
const baseTaskName = buildData.androidBundle ? "bundle" : "assemble";
101+
let baseTaskName = buildData.androidBundle ? "bundle" : "assemble";
102+
if (buildData.gradleFlavor) {
103+
baseTaskName += buildData.gradleFlavor[0].toUpperCase() + buildData.gradleFlavor.slice(1);
104+
}
102105
const buildTaskName = buildData.release
103106
? `${baseTaskName}${Configurations.Release}`
104107
: `${baseTaskName}${Configurations.Debug}`;

0 commit comments

Comments
 (0)