feat: aarIgnoreFilter, jarIgnoreFilter and nsConfig.android.plugins support (for now to add suffix to generated aar using aarSuffix on a per plugin bases)

Author: farfromrefug

lib/commands/plugin/build-plugin.ts

@@ -52,14 +52,16 @@ export class BuildPluginCommand implements ICommand {
 		const tempAndroidProject = await this.$tempService.mkdirSync(
 			"android-project"
 		);
-		const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || [].concat(this.$options.gradleArgs || []));
+		const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || []).concat(this.$options.gradleArgs || []);
+		const pluginOptions = (this.$projectData.nsConfig.android.plugins || {})[pluginName] || {};
 		const options: IPluginBuildOptions = {
 			gradlePath: this.$options.gradlePath,
 			gradleArgs,
 			aarOutputDir: platformsAndroidPath,
 			platformsAndroidDirPath: platformsAndroidPath,
 			pluginName: pluginName,
 			tempPluginDirPath: tempAndroidProject,
+			...pluginOptions
 		};
 
 		const androidPluginBuildResult = await this.$androidPluginBuildService.buildAar(

lib/definitions/android-plugin-migrator.d.ts

@@ -12,6 +12,7 @@ interface IAndroidBuildOptions {
 	tempPluginDirPath: string;
 	gradleArgs?: string[];
 	gradlePath?: string;
+	aarSuffix?: string;
 }
 
 interface IAndroidPluginBuildService {

lib/definitions/project.d.ts

@@ -147,6 +147,8 @@ interface INsConfigAndroid extends INsConfigPlaform {
 
 	gradleArgs?: string[];
 
+	plugins?:{ [k:string]: { aarSuffix?: string } }
+
 	runtimePackageName?: string
 }
 

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

@@ -193,7 +193,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 		const androidSourceDirectories = this.getAndroidSourceDirectories(
 			options.platformsAndroidDirPath
 		);
-		const shortPluginName = getShortPluginName(options.pluginName);
+		const shortPluginName = getShortPluginName(options.pluginName + (options.aarSuffix || ''));
 		const pluginTempDir = path.join(options.tempPluginDirPath, shortPluginName);
 		const pluginSourceFileHashesInfo = await this.getSourceFilesHashes(
 			options.platformsAndroidDirPath,
@@ -228,7 +228,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 				options.projectDir,
 				options.pluginName
 			);
-			const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || [].concat(options.gradleArgs || []));
+			const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || []).concat(options.gradleArgs || []);
 			await this.buildPlugin({
 				gradlePath: options.gradlePath,
 				gradleArgs,

lib/services/android-project-service.ts

@@ -758,7 +758,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			AndroidProjectService.ANDROID_PLATFORM_NAME
 		);
 		if (this.$fs.exists(pluginPlatformsFolderPath)) {
-			const gradleArgs = (projectData.nsConfig.android.gradleArgs || [].concat(this.$options.gradleArgs || []));
+			const gradleArgs = (projectData.nsConfig.android.gradleArgs || []).concat(this.$options.gradleArgs || []);
+			const pluginOptions = (projectData.nsConfig.android.plugins || {})[pluginData.name] || {};
 			const options: IPluginBuildOptions = {
 				gradlePath: this.$options.gradlePath,
 				gradleArgs,
@@ -767,6 +768,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				platformsAndroidDirPath: pluginPlatformsFolderPath,
 				aarOutputDir: pluginPlatformsFolderPath,
 				tempPluginDirPath: path.join(projectData.platformsDir, "tempPlugin"),
+				...pluginOptions
 			};
 
 			if (await this.$androidPluginBuildService.buildAar(options)) {

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

@@ -69,9 +69,10 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 			`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
 			`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`
 		);
-		if (buildData.gradleArgs) {
+		const gradleArgs = (this.$projectData.nsConfig.android.gradleArgs || []).concat(buildData.gradleArgs || []);
+		if (gradleArgs) {
 			const additionalArgs: string[] = [];
-			buildData.gradleArgs.forEach((arg) => {
+			gradleArgs.forEach((arg) => {
 				additionalArgs.push(...arg.split(" ").map((a) => a.trim()));
 			});
 			args.push(...additionalArgs);

lib/services/plugins-service.ts

@@ -255,7 +255,6 @@ export class PluginsService implements IPluginsService {
 			const currentPluginNativeHashes = await this.getPluginNativeHashes(
 				pluginPlatformsFolderPath
 			);
-
 			if (
 				!oldPluginNativeHashes ||
 				this.$filesHashService.hasChangesInShasums(

vendor/gradle-app/app/build.gradle

@@ -401,15 +401,23 @@ dependencies {
 
 task addDependenciesFromNativeScriptPlugins {
     nativescriptDependencies.each { dep ->
-        def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.aar"])
+        def aarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID")).matching {
+            include "**/*.aar"
+            exclude "cpp/**"
+            exclude project.hasProperty("aarIgnoreFilter") ? project.findProperty('aarIgnoreFilter').split(',').collect{it as String} : []
+        }
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
             def fileName = aarFile.name[0..<length]
             outLogger.withStyle(Style.SuccessHeader).println "\t + adding aar plugin dependency: " + aarFile.getAbsolutePath()
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }
 
-        def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID"), include: ["**/*.jar"])
+        def jarFiles = fileTree(dir: file("$rootDir/${dep.directory}/$PLATFORMS_ANDROID")).matching {
+            include "**/*.jar"
+            exclude "cpp/**"
+            exclude project.hasProperty("jarIgnoreFilter") ? project.findProperty('jarIgnoreFilter').split(',').collect{it as String} : []
+        }
         jarFiles.each { jarFile ->
             def jarFileAbsolutePath = jarFile.getAbsolutePath()
             outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"

vendor/gradle-plugin/build.gradle

@@ -317,7 +317,11 @@ android {
 
 task addDependenciesFromNativeScriptPlugins {
     nativescriptDependencies.each { dep ->
-        def aarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["**/*.aar"])
+        def aarFiles = fileTree(dir: getDepPlatformDir(dep)).matching {
+            include "**/*.aar"
+            exclude "cpp/**"
+            exclude project.hasProperty("aarIgnoreFilter") ? project.findProperty('aarIgnoreFilter').split(',').collect{it as String} : []
+        }
         def currentDirname = file(project.buildscript.sourceFile).getParentFile().getName()
         aarFiles.each { aarFile ->
             def length = aarFile.name.length() - 4
@@ -329,7 +333,11 @@ task addDependenciesFromNativeScriptPlugins {
             project.dependencies.add("implementation", [name: fileName, ext: "aar"])
         }
 
-        def jarFiles = fileTree(dir: getDepPlatformDir(dep), include: ["*.jar"])
+        def jarFiles = fileTree(dir: getDepPlatformDir(dep)).matching {
+            include "**/*.jar"
+            exclude "cpp/**"
+            exclude project.hasProperty("jarIgnoreFilter") ? project.findProperty('jarIgnoreFilter').split(',').collect{it as String} : []
+        }
         jarFiles.each { jarFile ->
             def jarFileAbsolutePath = jarFile.getAbsolutePath()
             outLogger.withStyle(Style.SuccessHeader).println "\t + adding jar plugin dependency: $jarFileAbsolutePath"