Fix local builds when CLI is required as lib

When CLI is required as library, the `$options` dependency is not populated. However the projectChangesService relies on it in order to determine if the project should be prepared/built.
When CLI is required as library and you change only the build configuration (debug/release), the project is not rebuilt. However when you use the CLI and try the same, a new full build is triggered.
Fix this by parsing required boolean flags to projectChangesService and exclude `$options` from its implementation. This way local builds will work in the same manner both from command line and when required as library.

Steps to reproduce the problem:
* use CLI as lib
* create local build for android in debug configuration
* create local build for android in release configuration - you'll notice gradle clean is not called at all and also in the `<project dir>/platforms/android/build/outputs/apks/` there are both debug and release apks. This should never happen when changing configurations.

Author: rosen-vladimirov

lib/definitions/project-changes.d.ts

@@ -19,8 +19,10 @@ interface IProjectChangesInfo {
 	changesRequireBuild: boolean;
 }
 
+interface IProjectChangesOptions extends IAppFilesUpdaterOptions, IProvision {}
+
 interface IProjectChangesService {
-	checkForChanges(platform: string, projectData: IProjectData): IProjectChangesInfo;
+	checkForChanges(platform: string, projectData: IProjectData, buildOptions: IProjectChangesOptions): IProjectChangesInfo;
 	getPrepareInfo(platform: string, projectData: IProjectData): IPrepareInfo;
 	savePrepareInfo(platform: string, projectData: IProjectData): void;
 	getPrepareInfoFilePath(platform: string, projectData: IProjectData): string;

lib/services/android-project-service.ts

@@ -433,6 +433,10 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	}
 
 	public async cleanProject(projectRoot: string, options: string[], projectData: IProjectData): Promise<void> {
+		// In case options are not passed, we'll use the default ones for cleaning the project.
+		// In case we do not do this, we'll required android-23 (default in build.gradle) for cleaning the project.
+		options = options.length === 0 ? this.getBuildOptions({ release: false }, projectData) : options;
+
 		options.unshift("clean");
 
 		let gradleBin = path.join(projectRoot, "gradlew");

lib/services/local-build-service.ts

@@ -9,7 +9,7 @@ export class LocalBuildService extends EventEmitter {
 
 	public async build(platform: string, platformBuildOptions: IPlatformBuildData, platformTemplate?: string): Promise<string> {
 		this.$projectData.initializeProjectData(platformBuildOptions.projectDir);
-		await this.$platformService.preparePlatform(platform, platformBuildOptions, platformTemplate, this.$projectData, undefined);
+		await this.$platformService.preparePlatform(platform, platformBuildOptions, platformTemplate, this.$projectData, { provision: platformBuildOptions.provision, sdk: null });
 		this.$platformService.on(BUILD_OUTPUT_EVENT_NAME, (data: any) => {
 			data.projectDir = platformBuildOptions.projectDir;
 			this.emit(BUILD_OUTPUT_EVENT_NAME, data);

lib/services/platform-service.ts

@@ -233,7 +233,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		await this.$pluginsService.validate(platformData, projectData);
 
 		await this.ensurePlatformInstalled(platform, platformTemplate, projectData, platformSpecificData);
-		let changesInfo = this.$projectChangesService.checkForChanges(platform, projectData);
+		let changesInfo = this.$projectChangesService.checkForChanges(platform, projectData, { bundle: appFilesUpdaterOptions.bundle, release: appFilesUpdaterOptions.release, provision: platformSpecificData.provision });
 
 		this.$logger.trace("Changes info in prepare platform:", changesInfo);
 

lib/services/project-changes-service.ts

@@ -38,18 +38,17 @@ export class ProjectChangesService implements IProjectChangesService {
 	constructor(
 		private $platformsData: IPlatformsData,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
-		private $options: IOptions,
 		private $fs: IFileSystem) {
 	}
 
 	public get currentChanges(): IProjectChangesInfo {
 		return this._changesInfo;
 	}
 
-	public checkForChanges(platform: string, projectData: IProjectData): IProjectChangesInfo {
+	public checkForChanges(platform: string, projectData: IProjectData, buildOptions: IProjectChangesOptions): IProjectChangesInfo {
 		let platformData = this.$platformsData.getPlatformData(platform, projectData);
 		this._changesInfo = new ProjectChangesInfo();
-		if (!this.ensurePrepareInfo(platform, projectData)) {
+		if (!this.ensurePrepareInfo(platform, projectData, buildOptions)) {
 			this._newFiles = 0;
 			this._changesInfo.appFilesChanged = this.containsNewerFiles(projectData.appDirectoryPath, projectData.appResourcesDirectoryPath, projectData);
 			this._changesInfo.packageChanged = this.filesChanged([path.join(projectData.projectDir, "package.json")]);
@@ -77,7 +76,7 @@ export class ProjectChangesService implements IProjectChangesService {
 			}
 		}
 		if (platform.toLowerCase() === this.$devicePlatformsConstants.iOS.toLowerCase()) {
-			const nextCommandProvisionUUID = this.$options.provision;
+			const nextCommandProvisionUUID = buildOptions.provision;
 			// We should consider reading here the provisioning profile UUID from the xcodeproj and xcconfig.
 			const prevProvisionUUID = this._prepareInfo.iOSProvisioningProfileUUID;
 			if (nextCommandProvisionUUID !== prevProvisionUUID) {
@@ -86,13 +85,13 @@ export class ProjectChangesService implements IProjectChangesService {
 				this._prepareInfo.iOSProvisioningProfileUUID = nextCommandProvisionUUID;
 			}
 		}
-		if (this.$options.bundle !== this._prepareInfo.bundle || this.$options.release !== this._prepareInfo.release) {
+		if (buildOptions.bundle !== this._prepareInfo.bundle || buildOptions.release !== this._prepareInfo.release) {
 			this._changesInfo.appFilesChanged = true;
 			this._changesInfo.appResourcesChanged = true;
 			this._changesInfo.modulesChanged = true;
 			this._changesInfo.configChanged = true;
-			this._prepareInfo.release = this.$options.release;
-			this._prepareInfo.bundle = this.$options.bundle;
+			this._prepareInfo.release = buildOptions.release;
+			this._prepareInfo.bundle = buildOptions.bundle;
 		}
 		if (this._changesInfo.packageChanged) {
 			this._changesInfo.modulesChanged = true;
@@ -134,7 +133,7 @@ export class ProjectChangesService implements IProjectChangesService {
 		this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
 	}
 
-	private ensurePrepareInfo(platform: string, projectData: IProjectData): boolean {
+	private ensurePrepareInfo(platform: string, projectData: IProjectData, buildOptions: { bundle: boolean, release: boolean, provision: string }): boolean {
 		this._prepareInfo = this.getPrepareInfo(platform, projectData);
 		if (this._prepareInfo) {
 			let platformData = this.$platformsData.getPlatformData(platform, projectData);
@@ -145,8 +144,8 @@ export class ProjectChangesService implements IProjectChangesService {
 		}
 		this._prepareInfo = {
 			time: "",
-			bundle: this.$options.bundle,
-			release: this.$options.release,
+			bundle: buildOptions.bundle,
+			release: buildOptions.release,
 			changesRequireBuild: true,
 			changesRequireBuildTime: null
 		};

test/nativescript-cli-lib.ts

@@ -15,8 +15,8 @@ describe("nativescript-cli-lib", () => {
 	const publicApi: any = {
 		deviceEmitter: null,
 		projectService: ["createProject", "isValidNativeScriptProject"],
-		localBuildService: ["build"]
-
+		localBuildService: ["build"],
+		deviceLogProvider: null
 	};
 
 	const pathToEntryPoint = path.join(__dirname, "..", "lib", "nativescript-cli-lib.js").replace(/\\/g, "\\\\");

test/npm-support.ts

@@ -187,11 +187,12 @@ async function addDependencies(testInjector: IInjector, projectFolder: string, d
 }
 
 async function preparePlatform(testInjector: IInjector): Promise<void> {
-	let platformService: IPlatformService = testInjector.resolve("platformService");
-	let projectData: IProjectData = testInjector.resolve("projectData");
+	const platformService: IPlatformService = testInjector.resolve("platformService");
+	const projectData: IProjectData = testInjector.resolve("projectData");
 	projectData.initializeProjectData();
+	const options: IOptions = testInjector.resolve("options");
 
-	await platformService.preparePlatform("android", { bundle: false, release: false }, "", projectData, undefined);
+	await platformService.preparePlatform("android", { bundle: options.bundle, release: options.release }, "", projectData, { provision: options.provision, sdk: options.sdk });
 }
 
 describe("Npm support tests", () => {

test/platform-service.ts

@@ -369,7 +369,7 @@ describe('Platform Service Tests', () => {
 
 			platformService = testInjector.resolve("platformService");
 			const appFilesUpdaterOptions: IAppFilesUpdaterOptions = { bundle: false, release: release };
-			await platformService.preparePlatform(platformToTest, appFilesUpdaterOptions, "", projectData, undefined);
+			await platformService.preparePlatform(platformToTest, appFilesUpdaterOptions, "", projectData, { provision: null, sdk: null });
 
 			let test1FileName = platformToTest.toLowerCase() === "ios" ? "test1.js" : "test2.js";
 			let test2FileName = platformToTest.toLowerCase() === "ios" ? "test2.js" : "test1.js";
@@ -446,7 +446,7 @@ describe('Platform Service Tests', () => {
 			try {
 				testInjector.resolve("$logger").warn = (text: string) => warnings += text;
 				const appFilesUpdaterOptions: IAppFilesUpdaterOptions = { bundle: false, release: false };
-				await platformService.preparePlatform("android", appFilesUpdaterOptions, "", projectData, undefined);
+				await platformService.preparePlatform("android", appFilesUpdaterOptions, "", projectData, { provision: null, sdk: null });
 			} finally {
 				testInjector.resolve("$logger").warn = oldLoggerWarner;
 			}