Skip to content

Commit a3721b1

Browse files
committed
feat: added gradleArgs in config.android
1 parent 681765c commit a3721b1

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

lib/commands/plugin/build-plugin.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { ICommand, ICommandParameter } from "../../common/definitions/commands";
1010
import { IErrors, IFileSystem } from "../../common/declarations";
1111
import { injector } from "../../common/yok";
1212
import { ITempService } from "../../definitions/temp-service";
13+
import { IProjectData } from "../../definitions/project";
1314

1415
export class BuildPluginCommand implements ICommand {
1516
public allowedParameters: ICommandParameter[] = [];
@@ -21,7 +22,8 @@ export class BuildPluginCommand implements ICommand {
2122
private $logger: ILogger,
2223
private $fs: IFileSystem,
2324
private $options: IOptions,
24-
private $tempService: ITempService
25+
private $tempService: ITempService,
26+
private $projectData: IProjectData
2527
) {
2628
this.pluginProjectPath = path.resolve(this.$options.path || ".");
2729
}
@@ -50,10 +52,10 @@ export class BuildPluginCommand implements ICommand {
5052
const tempAndroidProject = await this.$tempService.mkdirSync(
5153
"android-project"
5254
);
53-
55+
const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || [].concat(this.$options.gradleArgs || []));
5456
const options: IPluginBuildOptions = {
5557
gradlePath: this.$options.gradlePath,
56-
gradleArgs: this.$options.gradleArgs,
58+
gradleArgs,
5759
aarOutputDir: platformsAndroidPath,
5860
platformsAndroidDirPath: platformsAndroidPath,
5961
pluginName: pluginName,

lib/definitions/project.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ interface INsConfigAndroid extends INsConfigPlaform {
145145

146146
gradleVersion?: string;
147147

148+
gradleArgs?: string[];
149+
148150
runtimePackageName?: string
149151
}
150152

lib/services/android-plugin-build-service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,10 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
228228
options.projectDir,
229229
options.pluginName
230230
);
231+
const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || [].concat(options.gradleArgs || []));
231232
await this.buildPlugin({
232233
gradlePath: options.gradlePath,
233-
gradleArgs: options.gradleArgs,
234+
gradleArgs,
234235
pluginDir: pluginTempDir,
235236
pluginName: options.pluginName,
236237
projectDir: options.projectDir,

lib/services/android-project-service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,9 +758,10 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
758758
AndroidProjectService.ANDROID_PLATFORM_NAME
759759
);
760760
if (this.$fs.exists(pluginPlatformsFolderPath)) {
761+
const gradleArgs = (projectData.nsConfig.android.gradleArgs || [].concat(this.$options.gradleArgs || []));
761762
const options: IPluginBuildOptions = {
762763
gradlePath: this.$options.gradlePath,
763-
gradleArgs: this.$options.gradleArgs,
764+
gradleArgs,
764765
projectDir: projectData.projectDir,
765766
pluginName: pluginData.name,
766767
platformsAndroidDirPath: pluginPlatformsFolderPath,

0 commit comments

Comments
 (0)