Merge pull request #1878 from NativeScript/milanov/update-lodash

Update lodash to 4.13.1

Author: TsvetanMilanov

lib/android-tools-info.ts

@@ -137,7 +137,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			if (options && options.validateTargetSdk) {
 				let targetSdk = toolsInfoData.targetSdkVersion;
 				let newTarget = `${AndroidToolsInfo.ANDROID_TARGET_PREFIX}-${targetSdk}`;
-				if (!_.contains(AndroidToolsInfo.SUPPORTED_TARGETS, newTarget)) {
+				if (!_.includes(AndroidToolsInfo.SUPPORTED_TARGETS, newTarget)) {
 					let supportedVersions = AndroidToolsInfo.SUPPORTED_TARGETS.sort();
 					let minSupportedVersion = this.parseAndroidSdkString(_.first(supportedVersions));
 
@@ -224,7 +224,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 				if (userSpecifiedCompileSdk) {
 					let installedTargets = this.getInstalledTargets().wait();
 					let androidCompileSdk = `${AndroidToolsInfo.ANDROID_TARGET_PREFIX}-${userSpecifiedCompileSdk}`;
-					if (!_.contains(installedTargets, androidCompileSdk)) {
+					if (!_.includes(installedTargets, androidCompileSdk)) {
 						this.$errors.failWithoutHelp(`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`);
 					}
 
@@ -327,7 +327,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 	private getLatestValidAndroidTarget(): IFuture<string> {
 		return (() => {
 			let installedTargets = this.getInstalledTargets().wait();
-			return _.findLast(AndroidToolsInfo.SUPPORTED_TARGETS.sort(), supportedTarget => _.contains(installedTargets, supportedTarget));
+			return _.findLast(AndroidToolsInfo.SUPPORTED_TARGETS.sort(), supportedTarget => _.includes(installedTargets, supportedTarget));
 		}).future<string>()();
 	}
 
@@ -370,7 +370,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 					this.printMessage("The ANDROID_HOME environment variable is not set or it points to a non-existent directory. You will not be able to perform any build-related operations for Android.",
 						"To be able to perform Android build-related operations, set the `ANDROID_HOME` variable to point to the root of your Android SDK installation directory.");
 					this._cachedAndroidHomeValidationResult = false;
-				} else if (!_.any(expectedDirectoriesInAndroidHome.map(dir => this.$fs.exists(path.join(androidHomeEnvVar, dir)).wait()))) {
+				} else if (!_.some(expectedDirectoriesInAndroidHome.map(dir => this.$fs.exists(path.join(androidHomeEnvVar, dir)).wait()))) {
 					this.printMessage("The ANDROID_HOME environment variable points to incorrect directory. You will not be able to perform any build-related operations for Android.",
 						"To be able to perform Android build-related operations, set the `ANDROID_HOME` variable to point to the root of your Android SDK installation directory, " +
 						"where you will find `tools` and `platform-tools` directories.");

lib/commands/livesync.ts

@@ -17,7 +17,7 @@ export class LivesyncCommand implements ICommand {
 
 			let platform = args[0];
 			if(platform) {
-				 return _.contains(this.$mobileHelper.platformNames, this.$mobileHelper.normalizePlatformName(platform));
+				 return _.includes(this.$mobileHelper.platformNames, this.$mobileHelper.normalizePlatformName(platform));
 			}
 
 			return true;

lib/commands/plugin/add-plugin.ts

@@ -14,7 +14,7 @@ export class AddPluginCommand implements ICommand {
 
 			let installedPlugins = this.$pluginsService.getAllInstalledPlugins().wait();
 			let pluginName = args[0].toLowerCase();
-			if(_.any(installedPlugins, (plugin: IPluginData) => plugin.name.toLowerCase() === pluginName)) {
+			if(_.some(installedPlugins, (plugin: IPluginData) => plugin.name.toLowerCase() === pluginName)) {
 				this.$errors.failWithoutHelp(`Plugin "${pluginName}" is already installed.`);
 			}
 

lib/commands/plugin/remove-plugin.ts

@@ -25,7 +25,7 @@ export class RemovePluginCommand implements ICommand {
 			}
 
 			let pluginName = args[0].toLowerCase();
-			if(!_.any(pluginNames, name => name.toLowerCase() === pluginName)) {
+			if(!_.some(pluginNames, name => name.toLowerCase() === pluginName)) {
 				this.$errors.failWithoutHelp(`Plugin "${pluginName}" is not installed.`);
 			}
 

lib/common

@@ -54,7 +54,7 @@ export class LiveSyncProvider implements ILiveSyncProvider {
 	public canExecuteFastSync(filePath: string, platform: string): boolean {
 		let platformData = this.$platformsData.getPlatformData(platform);
 		let fastSyncFileExtensions = LiveSyncProvider.FAST_SYNC_FILE_EXTENSIONS.concat(platformData.fastLivesyncFileExtensions);
-		return _.contains(fastSyncFileExtensions, path.extname(filePath));
+		return _.includes(fastSyncFileExtensions, path.extname(filePath));
 	}
 
 	public transferFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string, isFullSync: boolean): IFuture<void> {

lib/providers/livesync-provider.ts

@@ -31,7 +31,7 @@ export class AndroidProjectPropertiesManager implements IAndroidProjectPropertie
 	public addProjectReference(referencePath: string): IFuture<void> {
 		return (() => {
 			let references = this.getProjectReferences().wait();
-			let libRefExists = _.any(references, r => path.normalize(r.path) === path.normalize(referencePath));
+			let libRefExists = _.some(references, r => path.normalize(r.path) === path.normalize(referencePath));
 			if(!libRefExists) {
 				this.addToPropertyList("android.library.reference", referencePath).wait();
 			}
@@ -41,7 +41,7 @@ export class AndroidProjectPropertiesManager implements IAndroidProjectPropertie
 	public removeProjectReference(referencePath: string): IFuture<void> {
 		return (() => {
 			let references = this.getProjectReferences().wait();
-			let libRefExists = _.any(references, r => path.normalize(r.path) === path.normalize(referencePath));
+			let libRefExists = _.some(references, r => path.normalize(r.path) === path.normalize(referencePath));
 			if(libRefExists) {
 				this.removeFromPropertyList("android.library.reference", referencePath).wait();
 			} else {

lib/services/android-project-properties-manager.ts

@@ -8,7 +8,7 @@ export class EmulatorSettingsService implements Mobile.IEmulatorSettingsService
 			let platformService = this.$injector.resolve("platformService"); // this should be resolved here due to cyclic dependency
 
 			let installedPlatforms = platformService.getInstalledPlatforms().wait();
-			return _.contains(installedPlatforms, platform.toLowerCase());
+			return _.includes(installedPlatforms, platform.toLowerCase());
 		}).future<boolean>()();
 	}
 

lib/services/emulator-settings-service.ts

@@ -51,7 +51,7 @@ export class InitService implements IInitService {
 					let $platformsData = this.$injector.resolve("platformsData");
 					_.each($platformsData.platformsNames, platform => {
 						let platformData: IPlatformData = $platformsData.getPlatformData(platform);
-						if (!platformData.targetedOS || (platformData.targetedOS && _.contains(platformData.targetedOS, process.platform))) {
+						if (!platformData.targetedOS || (platformData.targetedOS && _.includes(platformData.targetedOS, process.platform))) {
 							let currentPlatformData = projectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE][platformData.frameworkPackageName] || {};
 
 							projectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE][platformData.frameworkPackageName] = _.extend(currentPlatformData, this.getVersionData(platformData.frameworkPackageName).wait());