feat: --gradleArgs option to pass gradle parameters (#5630)

farfromrefug · web-flow · commit 02d179a35829 · 2022-02-15T14:06:00.000+01:00
diff --git a/lib/commands/plugin/build-plugin.ts b/lib/commands/plugin/build-plugin.ts
@@ -53,6 +53,7 @@ export class BuildPluginCommand implements ICommand {
 
 		const options: IPluginBuildOptions = {
 			gradlePath: this.$options.gradlePath,
+			gradleArgs: this.$options.gradleArgs,
 			aarOutputDir: platformsAndroidPath,
 			platformsAndroidDirPath: platformsAndroidPath,
 			pluginName: pluginName,
diff --git a/lib/data/build-data.ts b/lib/data/build-data.ts
@@ -48,6 +48,7 @@ export class AndroidBuildData extends BuildData {
 	public keyStorePassword: string;
 	public androidBundle: boolean;
 	public gradlePath: string;
+	public gradleArgs: string;
 
 	constructor(projectDir: string, platform: string, data: any) {
 		super(projectDir, platform, data);
@@ -58,5 +59,6 @@ export class AndroidBuildData extends BuildData {
 		this.keyStorePassword = data.keyStorePassword;
 		this.androidBundle = data.androidBundle || data.aab;
 		this.gradlePath = data.gradlePath;
+		this.gradleArgs = data.gradleArgs;
 	}
 }
diff --git a/lib/declarations.d.ts b/lib/declarations.d.ts
@@ -581,6 +581,7 @@ interface IAndroidBundleOptions {
 
 interface IAndroidOptions {
 	gradlePath: string;
+	gradleArgs: string;
 }
 
 interface ITypingsOptions {
diff --git a/lib/definitions/android-plugin-migrator.d.ts b/lib/definitions/android-plugin-migrator.d.ts
@@ -11,6 +11,7 @@ interface IAndroidBuildOptions {
 	aarOutputDir: string;
 	tempPluginDirPath: string;
 	gradlePath?: string;
+	gradleArgs?: string;
 }
 
 interface IAndroidPluginBuildService {
@@ -43,4 +44,9 @@ interface IBuildAndroidPluginData extends Partial<IProjectDir> {
 	 * Optional custom Gradle path.
 	 */
 	gradlePath?: string;
+	
+	/** 
+	 * Optional custom Gradle arguments.
+	 */
+	 gradleArgs?: string,
 }
diff --git a/lib/definitions/build.d.ts b/lib/definitions/build.d.ts
@@ -31,6 +31,7 @@ interface IAndroidBuildData
 		IAndroidSigningData,
 		IHasAndroidBundle {
 	gradlePath?: string;
+	gradleArgs?: string;
 }
 
 interface IAndroidSigningData {
diff --git a/lib/options.ts b/lib/options.ts
@@ -216,6 +216,7 @@ export class Options {
 				hasSensitiveValue: false,
 			},
 			gradlePath: { type: OptionType.String, hasSensitiveValue: false },
+			gradleArgs: { type: OptionType.String, hasSensitiveValue: false },
 			aab: { type: OptionType.Boolean, hasSensitiveValue: false },
 			performance: { type: OptionType.Object, hasSensitiveValue: true },
 			appleApplicationSpecificPassword: {
diff --git a/lib/services/android-plugin-build-service.ts b/lib/services/android-plugin-build-service.ts
@@ -261,6 +261,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			);
 			await this.buildPlugin({
 				gradlePath: options.gradlePath,
+				gradleArgs: options.gradleArgs,
 				pluginDir: pluginTempDir,
 				pluginName: options.pluginName,
 				projectDir: options.projectDir,
@@ -727,6 +728,9 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			`-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
 			`-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
 		];
+		if (pluginBuildSettings.gradleArgs) {
+			localArgs.push(pluginBuildSettings.gradleArgs);
+		}
 
 		if (this.$logger.getLevel() === "INFO") {
 			localArgs.push("--quiet");
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -605,6 +605,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		if (this.$fs.exists(pluginPlatformsFolderPath)) {
 			const options: IPluginBuildOptions = {
 				gradlePath: this.$options.gradlePath,
+				gradleArgs: this.$options.gradleArgs,
 				projectDir: projectData.projectDir,
 				pluginName: pluginData.name,
 				platformsAndroidDirPath: pluginPlatformsFolderPath,
diff --git a/lib/services/android/gradle-build-args-service.ts b/lib/services/android/gradle-build-args-service.ts
@@ -64,6 +64,9 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 			`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
 			`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`
 		);
+		if (buildData.gradleArgs) {
+			args.push(buildData.gradleArgs);
+		}
 
 		if (buildData.release) {
 			args.push(

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ export class AndroidBuildData extends BuildData {`
`48`	`48`	`public keyStorePassword: string;`
`49`	`49`	`public androidBundle: boolean;`
`50`	`50`	`public gradlePath: string;`
	`51`	`+ public gradleArgs: string;`
`51`	`52`
`52`	`53`	`constructor(projectDir: string, platform: string, data: any) {`
`53`	`54`	`super(projectDir, platform, data);`
`@@ -58,5 +59,6 @@ export class AndroidBuildData extends BuildData {`
`58`	`59`	`this.keyStorePassword = data.keyStorePassword;`
`59`	`60`	`this.androidBundle = data.androidBundle \|\| data.aab;`
`60`	`61`	`this.gradlePath = data.gradlePath;`
	`62`	`+ this.gradleArgs = data.gradleArgs;`
`61`	`63`	`}`
`62`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,7 @@ interface IAndroidBundleOptions {`
`581`	`581`
`582`	`582`	`interface IAndroidOptions {`
`583`	`583`	`gradlePath: string;`
	`584`	`+ gradleArgs: string;`
`584`	`585`	`}`
`585`	`586`
`586`	`587`	`interface ITypingsOptions {`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ interface IAndroidBuildData`
`31`	`31`	`IAndroidSigningData,`
`32`	`32`	`IHasAndroidBundle {`
`33`	`33`	`gradlePath?: string;`
	`34`	`+ gradleArgs?: string;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`interface IAndroidSigningData {`