feat(android): custom buildPath from nativescript.config

It requires a PR on @nativescript/webpack too

Author: farfromrefug

lib/commands/clean.ts

@@ -6,6 +6,7 @@ import {
 	IProjectCleanupResult,
 	IProjectCleanupService,
 	IProjectConfigService,
+	IProjectData,
 	IProjectService,
 } from "../definitions/project";
 
@@ -85,6 +86,7 @@ export class CleanCommand implements ICommand {
 	constructor(
 		private $projectCleanupService: IProjectCleanupService,
 		private $projectConfigService: IProjectConfigService,
+		private $projectData: IProjectData,
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $projectService: IProjectService,
 		private $prompter: IPrompter,
@@ -109,7 +111,7 @@ export class CleanCommand implements ICommand {
 
 		let pathsToClean = [
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		];

lib/commands/typings.ts

@@ -66,7 +66,7 @@ export class TypingsCommand implements ICommand {
 
 		const dtsGeneratorPath = path.resolve(
 			this.$projectData.projectDir,
-			"platforms",
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			"android",
 			"build-tools",
 			"dts-generator.jar"

lib/constants.ts

@@ -58,6 +58,7 @@ export const BUNDLE_DIR = "bundle";
 export const RESOURCES_DIR = "res";
 export const CONFIG_NS_FILE_NAME = "nsconfig.json";
 export const CONFIG_NS_APP_RESOURCES_ENTRY = "appResourcesPath";
+export const CONFIG_NS_BUILD_ENTRY = "buildPath";
 export const CONFIG_NS_APP_ENTRY = "appPath";
 export const CONFIG_FILE_NAME_DISPLAY = "nativescript.config.(js|ts)";
 export const CONFIG_FILE_NAME_JS = "nativescript.config.js";

lib/controllers/migrate-controller.ts

@@ -66,6 +66,7 @@ export class MigrateController
 		private $pluginsService: IPluginsService,
 		private $projectDataService: IProjectDataService,
 		private $projectConfigService: IProjectConfigService,
+		private $projectData: IProjectData,
 		private $options: IOptions,
 		private $resources: IResourceLoader,
 		private $injector: IInjector,
@@ -719,7 +720,7 @@ export class MigrateController
 	private async cleanUpProject(projectData: IProjectData): Promise<void> {
 		await this.$projectCleanupService.clean([
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectData.getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		]);

lib/controllers/platform-controller.ts

@@ -68,7 +68,8 @@ export class PlatformController implements IPlatformController {
 			packageToInstall,
 			addPlatformData
 		);
-
+		const buildPath = projectData.platformsDir;
+		console.log('buildPath', buildPath, projectData.getBuildRelativeDirectoryPath())
 		this.$fs.ensureDirectoryExists(
 			path.join(projectData.platformsDir, platform)
 		);
@@ -96,6 +97,7 @@ export class PlatformController implements IPlatformController {
 					commentHeader,
 					`appPath = ${appPath}`,
 					`appResourcesPath = ${appResourcesPath}`,
+					`buildPath = ${buildPath}`,
 					"",
 				].join("\n");
 

lib/controllers/prepare-controller.ts

@@ -357,7 +357,7 @@ export class PrepareController extends EventEmitter {
 					this.$logger.info(`Chokidar raised event ${event} for ${filePath}.`);
 					await this.writeRuntimePackageJson(projectData, platformData);
 					this.emitPrepareEvent({
-						files: [],
+						files: [filePath],
 						staleFiles: [],
 						hasOnlyHotUpdateFiles: false,
 						hmrData: null,

lib/controllers/update-controller.ts

@@ -296,7 +296,7 @@ export class UpdateController
 	private async cleanUpProject(): Promise<void> {
 		await this.$projectCleanupService.clean([
 			constants.HOOKS_DIR_NAME,
-			constants.PLATFORMS_DIR_NAME,
+			this.$projectDataService.getProjectData().getBuildRelativeDirectoryPath(),
 			constants.NODE_MODULES_FOLDER_NAME,
 			constants.PACKAGE_LOCK_JSON_FILE_NAME,
 		]);

lib/definitions/project.d.ts

@@ -153,6 +153,7 @@ interface INsConfig {
 	main?: string;
 	appPath?: string;
 	appResourcesPath?: string;
+	buildPath?: string;
 	shared?: boolean;
 	overridePods?: string;
 	webpackConfigPath?: string;
@@ -209,6 +210,7 @@ interface IProjectData extends ICreateProjectData {
 	getAppDirectoryRelativePath(): string;
 	getAppResourcesDirectoryPath(projectDir?: string): string;
 	getAppResourcesRelativeDirectoryPath(): string;
+	getBuildRelativeDirectoryPath(): string;
 }
 
 interface IProjectDataService {

lib/project-data.ts

@@ -164,14 +164,14 @@ export class ProjectData implements IProjectData {
 			this.projectName = this.$projectHelper.sanitizeName(
 				path.basename(projectDir)
 			);
-			this.platformsDir = path.join(projectDir, constants.PLATFORMS_DIR_NAME);
+			this.nsConfig = nsConfig;
+			this.platformsDir = path.join(projectDir, this.getBuildRelativeDirectoryPath());
 			this.projectFilePath = projectFilePath;
 			this.projectIdentifiers = this.initializeProjectIdentifiers(nsConfig);
 			this.packageJsonData = packageJsonData;
 			this.dependencies = packageJsonData.dependencies;
 			this.devDependencies = packageJsonData.devDependencies;
 			this.projectType = this.getProjectType();
-			this.nsConfig = nsConfig;
 			this.ignoredDependencies = nsConfig?.ignoredNativeDependencies;
 			this.appDirectoryPath = this.getAppDirectoryPath();
 			this.appResourcesDirectoryPath = this.getAppResourcesDirectoryPath();
@@ -270,6 +270,17 @@ export class ProjectData implements IProjectData {
 		return this.resolveToProjectDir(appRelativePath, projectDir);
 	}
 
+	public getBuildRelativeDirectoryPath(): string {
+		if (
+			this.nsConfig &&
+			this.nsConfig[constants.CONFIG_NS_BUILD_ENTRY]
+		) {
+			return this.nsConfig[constants.CONFIG_NS_BUILD_ENTRY];
+		}
+
+		return constants.PLATFORMS_DIR_NAME;
+	}
+
 	public getAppDirectoryRelativePath(): string {
 		if (this.nsConfig && this.nsConfig[constants.CONFIG_NS_APP_ENTRY]) {
 			return this.nsConfig[constants.CONFIG_NS_APP_ENTRY];

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

@@ -775,7 +775,11 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			`-PtempBuild=true`,
 			`-PcompileSdk=android-${pluginBuildSettings.androidToolsInfo.compileSdkVersion}`,
 			`-PbuildToolsVersion=${pluginBuildSettings.androidToolsInfo.buildToolsVersion}`,
+			`-PprojectRoot=${this.$projectData.projectDir}`,
+			`-DprojectRoot=${this.$projectData.projectDir}`, // we need it as a -D to be able to read it from settings.gradle
 			`-PappPath=${this.$projectData.getAppDirectoryPath()}`,
+			`-PappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`,
+			`-DappBuildPath=${this.$projectData.getBuildRelativeDirectoryPath()}`, // we need it as a -D to be able to read it from settings.gradle
 			`-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`,
 		];
 		if (pluginBuildSettings.gradleArgs) {