Merge pull request #4537 from NativeScript/fatme/gradle

refactor: refactor the logic for building android projects

Author: Fatme

lib/bootstrap.ts

@@ -11,6 +11,9 @@ $injector.require("performanceService", "./services/performance-service");
 $injector.requirePublic("projectService", "./services/project-service");
 $injector.require("androidProjectService", "./services/android-project-service");
 $injector.require("androidPluginBuildService", "./services/android-plugin-build-service");
+$injector.require("gradleCommandService", "./services/android/gradle-command-service");
+$injector.require("gradleBuildService", "./services/android/gradle-build-service");
+$injector.require("gradleBuildArgsService", "./services/android/gradle-build-args-service");
 $injector.require("iOSEntitlementsService", "./services/ios-entitlements-service");
 $injector.require("iOSExtensionsService", "./services/ios-extensions-service");
 $injector.require("iOSProjectService", "./services/ios-project-service");

lib/definitions/gradle.d.ts

@@ -0,0 +1,24 @@
+interface IGradleCommandService {
+	executeCommand(gradleArgs: string[], options: IGradleCommandOptions): Promise<ISpawnResult>;
+}
+
+interface IGradleCommandOptions { 
+	cwd: string;
+	message?: string;
+	stdio?: string;
+	spawnOptions?: ISpawnFromEventOptions;
+}
+
+interface IAndroidBuildConfig extends IRelease, IAndroidReleaseOptions, IHasAndroidBundle {
+	buildOutputStdio?: string;
+}
+
+interface IGradleBuildService {
+	buildProject(projectRoot: string, buildConfig: IAndroidBuildConfig): Promise<void>;
+	cleanProject(projectRoot: string, buildConfig: IAndroidBuildConfig): Promise<void>;
+}
+
+interface IGradleBuildArgsService {
+	getBuildTaskArgs(buildConfig: IAndroidBuildConfig): string[];
+	getCleanTaskArgs(buildConfig: IAndroidBuildConfig): string[];
+}

lib/definitions/project.d.ts

@@ -439,10 +439,10 @@ interface IPlatformProjectService extends NodeJS.EventEmitter, IPlatformProjectS
 	/**
 	 * Stops all running processes that might hold a lock on the filesystem.
 	 * Android: Gradle daemon processes are terminated.
-	 * @param {string} projectRoot The root directory of the native project.
+	 * @param {IPlatformData} platformData The data for the specified platform.
 	 * @returns {void}
 	 */
-	stopServices(projectRoot: string): Promise<ISpawnResult>;
+	stopServices(platformData: IPlatformData): Promise<ISpawnResult>;
 
 	/**
 	 * Removes build artifacts specific to the platform

lib/services/android-project-service.ts

@@ -4,9 +4,7 @@ import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
 import { DeviceAndroidDebugBridge } from "../common/mobile/android/device-android-debug-bridge";
-import { attachAwaitDetach } from "../common/helpers";
 import { Configurations, LiveSyncPaths } from "../common/constants";
-import { SpawnOptions } from "child_process";
 import { performanceLog } from ".././common/decorators";
 
 export class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
@@ -15,23 +13,20 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	private static ANDROID_PLATFORM_NAME = "android";
 	private static MIN_RUNTIME_VERSION_WITH_GRADLE = "1.5.0";
 
-	private isAndroidStudioTemplate: boolean;
-
 	constructor(private $androidToolsInfo: IAndroidToolsInfo,
-		private $childProcess: IChildProcess,
 		private $errors: IErrors,
 		$fs: IFileSystem,
-		private $hostInfo: IHostInfo,
 		private $logger: ILogger,
 		$projectDataService: IProjectDataService,
 		private $injector: IInjector,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $androidPluginBuildService: IAndroidPluginBuildService,
 		private $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
 		private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
-		private $filesHashService: IFilesHashService) {
+		private $filesHashService: IFilesHashService,
+		private $gradleCommandService: IGradleCommandService,
+		private $gradleBuildService: IGradleBuildService) {
 		super($fs, $projectDataService);
-		this.isAndroidStudioTemplate = false;
 	}
 
 	private _platformData: IPlatformData = null;
@@ -41,27 +36,10 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 		if (projectData && projectData.platformsDir) {
 			const projectRoot = path.join(projectData.platformsDir, AndroidProjectService.ANDROID_PLATFORM_NAME);
-			if (this.isAndroidStudioCompatibleTemplate(projectData)) {
-				this.isAndroidStudioTemplate = true;
-			}
-
-			const appDestinationDirectoryArr = [projectRoot];
-			if (this.isAndroidStudioTemplate) {
-				appDestinationDirectoryArr.push(constants.APP_FOLDER_NAME);
-			}
-			appDestinationDirectoryArr.push(constants.SRC_DIR, constants.MAIN_DIR, constants.ASSETS_DIR);
 
-			const configurationsDirectoryArr = [projectRoot];
-			if (this.isAndroidStudioTemplate) {
-				configurationsDirectoryArr.push(constants.APP_FOLDER_NAME);
-			}
-			configurationsDirectoryArr.push(constants.SRC_DIR, constants.MAIN_DIR, constants.MANIFEST_FILE_NAME);
-
-			const deviceBuildOutputArr = [projectRoot];
-			if (this.isAndroidStudioTemplate) {
-				deviceBuildOutputArr.push(constants.APP_FOLDER_NAME);
-			}
-			deviceBuildOutputArr.push(constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.APK_DIR);
+			const appDestinationDirectoryArr = [projectRoot, constants.APP_FOLDER_NAME, constants.SRC_DIR, constants.MAIN_DIR, constants.ASSETS_DIR];
+			const configurationsDirectoryArr = [projectRoot, constants.APP_FOLDER_NAME, constants.SRC_DIR, constants.MAIN_DIR, constants.MANIFEST_FILE_NAME];
+			const deviceBuildOutputArr = [projectRoot, constants.APP_FOLDER_NAME, constants.BUILD_DIR, constants.OUTPUTS_DIR, constants.APK_DIR];
 
 			const packageName = this.getProjectNameFromId(projectData);
 
@@ -155,30 +133,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		const targetSdkVersion = androidToolsInfo && androidToolsInfo.targetSdkVersion;
 		this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
 
-		this.isAndroidStudioTemplate = this.isAndroidStudioCompatibleTemplate(projectData, frameworkVersion);
-		if (this.isAndroidStudioTemplate) {
-			this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "*", "-R");
-		} else {
-			this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "libs", "-R");
-
-			if (config.pathToTemplate) {
-				const mainPath = path.join(this.getPlatformData(projectData).projectRoot, constants.SRC_DIR, constants.MAIN_DIR);
-				this.$fs.createDirectory(mainPath);
-				shell.cp("-R", path.join(path.resolve(config.pathToTemplate), "*"), mainPath);
-			} else {
-				this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, constants.SRC_DIR, "-R");
-			}
-			this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "build.gradle settings.gradle build-tools", "-Rf");
-
-			try {
-				this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "gradle.properties", "-Rf");
-			} catch (e) {
-				this.$logger.warn(`\n${e}\nIt's possible, the final .apk file will contain all architectures instead of the ones described in the abiFilters!\nYou can fix this by using the latest android platform.`);
-			}
-
-			this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "gradle", "-R");
-			this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "gradlew gradlew.bat", "-f");
-		}
+		this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "*", "-R");
 
 		this.cleanResValues(targetSdkVersion, projectData);
 	}
@@ -277,76 +232,13 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 	@performanceLog()
 	public async buildProject(projectRoot: string, projectData: IProjectData, buildConfig: IBuildConfig): Promise<void> {
-		let task;
-		const gradleArgs = this.getGradleBuildOptions(buildConfig, projectData);
-		const baseTask = buildConfig.androidBundle ? "bundle" : "assemble";
 		const platformData = this.getPlatformData(projectData);
-		const outputPath = buildConfig.androidBundle ? platformData.bundleBuildOutputPath : platformData.getBuildOutputPath(buildConfig);
-		if (this.$logger.getLevel() === "TRACE") {
-			gradleArgs.unshift("--stacktrace");
-			gradleArgs.unshift("--debug");
-		}
-		if (buildConfig.release) {
-			task = `${baseTask}Release`;
-		} else {
-			task = `${baseTask}Debug`;
-		}
-
-		gradleArgs.unshift(task);
-
-		const handler = (data: any) => {
-			this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
-		};
-
-		await attachAwaitDetach(constants.BUILD_OUTPUT_EVENT_NAME,
-			this.$childProcess,
-			handler,
-			this.executeCommand({
-				projectRoot: this.getPlatformData(projectData).projectRoot,
-				gradleArgs,
-				childProcessOpts: { stdio: buildConfig.buildOutputStdio || "inherit" },
-				spawnFromEventOptions: { emitOptions: { eventName: constants.BUILD_OUTPUT_EVENT_NAME }, throwError: true },
-				message: "Gradle build..."
-			})
-		);
+		await this.$gradleBuildService.buildProject(platformData.projectRoot, buildConfig);
 
+		const outputPath = buildConfig.androidBundle ? platformData.bundleBuildOutputPath : platformData.getBuildOutputPath(buildConfig);
 		await this.$filesHashService.saveHashesForProject(this._platformData, outputPath);
 	}
 
-	private getGradleBuildOptions(settings: IAndroidBuildOptionsSettings, projectData: IProjectData): Array<string> {
-		const configurationFilePath = this.getPlatformData(projectData).configurationFilePath;
-
-		const buildOptions: Array<string> = this.getBuildOptions(configurationFilePath);
-
-		if (settings.release) {
-			buildOptions.push("-Prelease");
-			buildOptions.push(`-PksPath=${path.resolve(settings.keyStorePath)}`);
-			buildOptions.push(`-Palias=${settings.keyStoreAlias}`);
-			buildOptions.push(`-Ppassword=${settings.keyStoreAliasPassword}`);
-			buildOptions.push(`-PksPassword=${settings.keyStorePassword}`);
-		}
-
-		return buildOptions;
-	}
-
-	private getBuildOptions(configurationFilePath?: string): Array<string> {
-		this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true });
-
-		const androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
-		const compileSdk = androidToolsInfo.compileSdkVersion;
-		const targetSdk = this.getTargetFromAndroidManifest(configurationFilePath) || compileSdk;
-		const buildToolsVersion = androidToolsInfo.buildToolsVersion;
-		const generateTypings = androidToolsInfo.generateTypings;
-		const buildOptions = [
-			`-PcompileSdk=android-${compileSdk}`,
-			`-PtargetSdk=${targetSdk}`,
-			`-PbuildToolsVersion=${buildToolsVersion}`,
-			`-PgenerateTypings=${generateTypings}`
-		];
-
-		return buildOptions;
-	}
-
 	public async buildForDeploy(projectRoot: string, projectData: IProjectData, buildConfig?: IBuildConfig): Promise<void> {
 		return this.buildProject(projectRoot, projectData, buildConfig);
 	}
@@ -456,25 +348,18 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return nativescript && (nativescript.android || (nativescript.platforms && nativescript.platforms.android));
 	}
 
-	public stopServices(projectRoot: string): Promise<ISpawnResult> {
-		return this.executeCommand({
-			projectRoot,
-			gradleArgs: ["--stop", "--quiet"],
-			childProcessOpts: { stdio: "pipe" },
-			message: "Gradle stop services..."
+	public async stopServices(platformData: IPlatformData): Promise<ISpawnResult> {
+		const result = await this.$gradleCommandService.executeCommand(["--stop", "--quiet"], {
+			cwd: platformData.projectRoot,
+			message: "Gradle stop services...",
+			stdio: "pipe"
 		});
+
+		return result;
 	}
 
 	public async cleanProject(projectRoot: string, projectData: IProjectData): Promise<void> {
-		if (this.$androidToolsInfo.getToolsInfo().androidHomeEnvVar) {
-			const gradleArgs = this.getGradleBuildOptions({ release: false }, projectData);
-			gradleArgs.unshift("clean");
-			await this.executeCommand({
-				projectRoot,
-				gradleArgs,
-				message: "Gradle clean..."
-			});
-		}
+		await this.$gradleBuildService.cleanProject(projectRoot, { release: false });
 	}
 
 	public async cleanDeviceTempFolder(deviceIdentifier: string, projectData: IProjectData): Promise<void> {
@@ -494,10 +379,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		shell.cp(cpArg, paths, projectRoot);
 	}
 
-	private async spawn(command: string, args: string[], opts?: any, spawnOpts?: ISpawnFromEventOptions): Promise<ISpawnResult> {
-		return this.$childProcess.spawnFromEvent(command, args, "close", opts || { stdio: "inherit" }, spawnOpts);
-	}
-
 	private validatePackageName(packageName: string): void {
 		//Make the package conform to Java package types
 		//Enforce underscore limitation
@@ -522,81 +403,14 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 	}
 
-	private getTargetFromAndroidManifest(configurationFilePath: string): string {
-		let versionInManifest: string;
-		if (this.$fs.exists(configurationFilePath)) {
-			const targetFromAndroidManifest: string = this.$fs.readText(configurationFilePath);
-			if (targetFromAndroidManifest) {
-				const match = targetFromAndroidManifest.match(/.*?android:targetSdkVersion=\"(.*?)\"/);
-				if (match && match[1]) {
-					versionInManifest = match[1];
-				}
-			}
-		}
-
-		return versionInManifest;
-	}
-
-	private async executeCommand(opts: { projectRoot: string, gradleArgs: any, childProcessOpts?: SpawnOptions, spawnFromEventOptions?: ISpawnFromEventOptions, message: string }): Promise<ISpawnResult> {
-		if (this.$androidToolsInfo.getToolsInfo().androidHomeEnvVar) {
-			const { projectRoot, gradleArgs, message, spawnFromEventOptions } = opts;
-			const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew";
-
-			if (this.$logger.getLevel() === "INFO") {
-				gradleArgs.push("--quiet");
-			}
-
-			this.$logger.info(message);
-
-			const childProcessOpts = opts.childProcessOpts || {};
-			childProcessOpts.cwd = childProcessOpts.cwd || projectRoot;
-			childProcessOpts.stdio = childProcessOpts.stdio || "inherit";
-			let commandResult;
-			try {
-				commandResult = await this.spawn(gradlew,
-					gradleArgs,
-					childProcessOpts,
-					spawnFromEventOptions);
-			} catch (err) {
-				this.$errors.failWithoutHelp(err.message);
-			}
-
-			return commandResult;
-		}
-	}
-
-	private isAndroidStudioCompatibleTemplate(projectData: IProjectData, frameworkVersion?: string): boolean {
-		const currentPlatformData: IDictionary<any> = this.$projectDataService.getNSValue(projectData.projectDir, constants.TNS_ANDROID_RUNTIME_NAME);
-		const platformVersion = (currentPlatformData && currentPlatformData[constants.VERSION_STRING]) || frameworkVersion;
-
-		if (!platformVersion) {
-			return true;
-		}
-
-		if (platformVersion === constants.PackageVersion.NEXT || platformVersion === constants.PackageVersion.LATEST || platformVersion === constants.PackageVersion.RC) {
-			return true;
-		}
-
-		const androidStudioCompatibleTemplate = "3.4.0";
-		const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`;
-
-		return semver.gte(normalizedPlatformVersion, androidStudioCompatibleTemplate);
-	}
-
 	private getLegacyAppResourcesDestinationDirPath(projectData: IProjectData): string {
-		const resourcePath: string[] = [constants.SRC_DIR, constants.MAIN_DIR, constants.RESOURCES_DIR];
-		if (this.isAndroidStudioTemplate) {
-			resourcePath.unshift(constants.APP_FOLDER_NAME);
-		}
+		const resourcePath: string[] = [constants.APP_FOLDER_NAME, constants.SRC_DIR, constants.MAIN_DIR, constants.RESOURCES_DIR];
 
 		return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);
 	}
 
 	private getUpdatedAppResourcesDestinationDirPath(projectData: IProjectData): string {
-		const resourcePath: string[] = [constants.SRC_DIR];
-		if (this.isAndroidStudioTemplate) {
-			resourcePath.unshift(constants.APP_FOLDER_NAME);
-		}
+		const resourcePath: string[] = [constants.APP_FOLDER_NAME, constants.SRC_DIR];
 
 		return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);
 	}