Merge pull request #3745 from NativeScript/tachev/fix-aar-livesync

fix: start tracking the AAR and include.gradle changes during livesync

Author: rosen-vladimirov

lib/common

@@ -127,14 +127,14 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 
 	private getScope(scopeName: string, content: string): string {
 		const indexOfScopeName = content.indexOf(scopeName);
-		let result = "";
 		const openingBracket = "{";
 		const closingBracket = "}";
-		let openBrackets = 0;
 		let foundFirstBracket = false;
+		let openBrackets = 0;
+		let result = "";
 
 		let i = indexOfScopeName;
-		while (i < content.length) {
+		while (i !== -1 && i < content.length) {
 			const currCharacter = content[i];
 			if (currCharacter === openingBracket) {
 				if (openBrackets === 0) {
@@ -337,15 +337,16 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			}
 
 			const productFlavorsScope = this.getScope("productFlavors", includeGradleFileContent);
-
-			try {
-				const newIncludeGradleFileContent = includeGradleFileContent.replace(productFlavorsScope, "");
-				this.$fs.writeFile(includeGradleFilePath, newIncludeGradleFileContent);
-
-				return true;
-			} catch (e) {
-				this.$errors.failWithoutHelp(`Failed to write the updated include.gradle ` +
-					`in - ${includeGradleFilePath}. Error is: ${e.toString()}`);
+			if (productFlavorsScope) {
+				try {
+					const newIncludeGradleFileContent = includeGradleFileContent.replace(productFlavorsScope, "");
+					this.$fs.writeFile(includeGradleFilePath, newIncludeGradleFileContent);
+
+					return true;
+				} catch (e) {
+					this.$errors.failWithoutHelp(`Failed to write the updated include.gradle ` +
+						`in - ${includeGradleFilePath}. Error is: ${e.toString()}`);
+				}
 			}
 		}
 

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

@@ -2,7 +2,7 @@ import * as path from "path";
 import * as choki from "chokidar";
 import { EOL } from "os";
 import { EventEmitter } from "events";
-import { hook, isAllowedFinalFile } from "../../common/helpers";
+import { hook } from "../../common/helpers";
 import { PACKAGE_JSON_FILE_NAME, LiveSyncTrackActionNames, USER_INTERACTION_NEEDED_EVENT_NAME, DEBUGGER_ATTACHED_EVENT_NAME, DEBUGGER_DETACHED_EVENT_NAME, TrackActionNames } from "../../constants";
 import { DeviceTypes, DeviceDiscoveryEventNames } from "../../common/constants";
 import { cache } from "../../common/decorators";
@@ -671,12 +671,10 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 
 					this.$logger.trace(`Chokidar raised event ${event} for ${filePath}.`);
 
-					if (!isAllowedFinalFile(filePath)) {
-						if (event === "add" || event === "addDir" || event === "change" /* <--- what to do when change event is raised ? */) {
-							filesToSync.push(filePath);
-						} else if (event === "unlink" || event === "unlinkDir") {
-							filesToRemove.push(filePath);
-						}
+					if (event === "add" || event === "addDir" || event === "change" /* <--- what to do when change event is raised ? */) {
+						filesToSync.push(filePath);
+					} else if (event === "unlink" || event === "unlinkDir") {
+						filesToRemove.push(filePath);
 					}
 
 					startSyncFilesTimeout();

lib/services/livesync/livesync-service.ts

@@ -22,6 +22,7 @@ describe('androidPluginBuildService', () => {
 		addManifest?: boolean,
 		addResFolder?: boolean,
 		addAssetsFolder?: boolean,
+		addIncludeGradle?: boolean,
 		addLegacyIncludeGradle?: boolean,
 		addProjectDir?: boolean,
 		addProjectRuntime?: boolean,
@@ -111,6 +112,7 @@ describe('androidPluginBuildService', () => {
 		addManifest?: boolean,
 		addResFolder?: boolean,
 		addAssetsFolder?: boolean,
+		addIncludeGradle?: boolean,
 		addLegacyIncludeGradle?: boolean
 	}) {
 		const validAndroidManifestContent = `<?xml version="1.0" encoding="UTF-8"?>
@@ -122,21 +124,23 @@ describe('androidPluginBuildService', () => {
 		name="string_name"
 		>text_string</string>
 </resources>`;
-		const validIncludeGradleContent = `android {
-			productFlavors {
-				"nativescript-pro-ui" {
-					dimension "nativescript-pro-ui"
-				}
-			}
+		const validIncludeGradleContent =
+`android {` +
+	(options.addLegacyIncludeGradle ? `
+	productFlavors {
+		"nativescript-pro-ui" {
+			dimension "nativescript-pro-ui"
 		}
+	}` : ``) + `
+}
 
-		def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "23.3.0"
+def supportVersion = project.hasProperty("supportVersion") ? project.supportVersion : "23.3.0"
 
-		dependencies {
-			compile "com.android.support:appcompat-v7:$supportVersion"
-			compile "com.android.support:recyclerview-v7:$supportVersion"
-			compile "com.android.support:design:$supportVersion"
-		}`;
+dependencies {
+	compile "com.android.support:appcompat-v7:$supportVersion"
+	compile "com.android.support:recyclerview-v7:$supportVersion"
+	compile "com.android.support:design:$supportVersion"
+}`;
 
 		if (options.addManifest) {
 			fs.writeFile(path.join(pluginFolder, "AndroidManifest.xml"), validAndroidManifestContent);
@@ -154,7 +158,7 @@ describe('androidPluginBuildService', () => {
 			fs.writeFile(path.join(imagesFolder, "myicon.png"), "123");
 		}
 
-		if (options.addLegacyIncludeGradle) {
+		if (options.addLegacyIncludeGradle || options.addIncludeGradle) {
 			fs.writeFile(path.join(pluginFolder, INCLUDE_GRADLE_NAME), validIncludeGradleContent);
 		}
 	}
@@ -291,12 +295,23 @@ describe('androidPluginBuildService', () => {
 				addLegacyIncludeGradle: true
 			});
 
-			await androidBuildPluginService.migrateIncludeGradle(config);
-
+			const isMigrated = await androidBuildPluginService.migrateIncludeGradle(config);
 			const includeGradleContent = fs.readText(path.join(pluginFolder, INCLUDE_GRADLE_NAME).toString());
 			const areProductFlavorsRemoved = includeGradleContent.indexOf("productFlavors") === -1;
+
+			assert.isTrue(isMigrated);
 			assert.isTrue(areProductFlavorsRemoved);
 		});
+
+		it('if there is an already migrated include.gradle file', async () => {
+			const config: IBuildOptions = setup({
+				addIncludeGradle: true
+			});
+
+			const isMigrated = await androidBuildPluginService.migrateIncludeGradle(config);
+
+			assert.isFalse(isMigrated);
+		});
 	});
 
 	function getGradleAndroidPluginVersion() {