Merge remote-tracking branch 'origin/release' into HEAD

Author: IceBuildUser

lib/android-tools-info.ts

@@ -128,11 +128,11 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			}
 
 			if(!toolsInfoData.supportRepositoryVersion) {
-				let invalidSupportLibAdditionalMsg = 'Run `$ android`  to manage the Android Support Repository.';
+				let invalidSupportLibAdditionalMsg = 'Run `$ android`  to manage the Local Maven repository for Support Libraries.';
 				if(!isAndroidHomeValid) {
 					invalidSupportLibAdditionalMsg += ' In case you already have it installed, make sure `ANDROID_HOME` environment variable is set correctly.';
 				}
-				this.printMessage(`You need to have Android SDK ${AndroidToolsInfo.MIN_REQUIRED_COMPILE_TARGET} or later and the latest Android Support Repository installed on your system.`, invalidSupportLibAdditionalMsg);
+				this.printMessage(`You need to have Android SDK ${AndroidToolsInfo.MIN_REQUIRED_COMPILE_TARGET} or later and the latest Local Maven repository for Support Libraries installed on your system.`, invalidSupportLibAdditionalMsg);
 				detectedErrors = true;
 			}
 

lib/constants.ts

@@ -15,6 +15,7 @@ export var LIVESYNC_EXCLUDED_DIRECTORIES = ["app_resources"];
 export var TESTING_FRAMEWORKS = ['jasmine', 'mocha', 'qunit'];
 export let TEST_RUNNER_NAME = "nativescript-unit-test-runner";
 export let LIVESYNC_EXCLUDED_FILE_PATTERNS = ["**/*.js.map", "**/*.ts"];
+export let XML_FILE_EXTENSION = ".xml";
 
 export class ReleaseType {
 	static MAJOR = "major";

lib/services/android-project-service.ts

@@ -327,10 +327,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				this.$fs.ensureDirectoryExists(resourcesDestinationDirectoryPath).wait();
 				shell.cp("-Rf", path.join(pluginPlatformsFolderPath, "*"), resourcesDestinationDirectoryPath);
 
-				let pluginConfigurationFilePath = path.join(resourcesDestinationDirectoryPath, this.platformData.configurationFileName);
-				if (this.$fs.exists(pluginConfigurationFilePath).wait()) {
-					this.$pluginVariablesService.interpolate(pluginData, pluginConfigurationFilePath).wait();
-				}
+				(this.$fs.enumerateFilesInDirectorySync(resourcesDestinationDirectoryPath, file => this.$fs.getFsStats(file).wait().isDirectory() || path.extname(file) === constants.XML_FILE_EXTENSION) || [])
+					.forEach(file => {
+						this.$logger.trace(`Interpolate data for plugin file: ${file}`);
+						this.$pluginVariablesService.interpolate(pluginData, file).wait();
+					});
 			}
 
 			// Copy include.gradle file

lib/xml-validator.ts

@@ -2,6 +2,7 @@
 "use strict";
 
 import { EOL } from "os";
+import * as constants from "./constants";
 
 export class XmlValidator implements IXmlValidator {
 	constructor(private $fs: IFileSystem,
@@ -11,7 +12,7 @@ export class XmlValidator implements IXmlValidator {
 		return (() => {
 			let xmlHasErrors = false;
 			sourceFiles
-				.filter(file => _.endsWith(file, ".xml"))
+				.filter(file => _.endsWith(file, constants.XML_FILE_EXTENSION))
 				.forEach(file => {
 					let errorOutput = this.getXmlFileErrors(file).wait();
 					let hasErrors = !!errorOutput;