Merge pull request NativeScript#1055 from NativeScript/fatme/merge-release-1.4.1

Fatme · Fatme · commit 859bacc78433 · 2015-10-13T11:21:53.000+03:00
Merge release 1.4.1
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 7f0774504c7660c1444ae204c00cf3b7c908292c
+Subproject commit 86efa1c5d30c28de195c120d480f1984af8c6617
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -572,7 +572,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	private removeCocoapods(pluginPlatformsFolderPath: string): IFuture<void> {
 		return (() => {
 			let pluginPodFilePath = path.join(pluginPlatformsFolderPath, "Podfile");
-			if(this.$fs.exists(pluginPodFilePath).wait()) {
+			if(this.$fs.exists(pluginPodFilePath).wait() && this.$fs.exists(this.projectPodFilePath).wait()) {
 				let pluginPodFileContent = this.$fs.readText(pluginPodFilePath).wait();
 				let projectPodFileContent = this.$fs.readText(this.projectPodFilePath).wait();
 				let contentToRemove= this.buildPodfileContent(pluginPodFilePath, pluginPodFileContent);
diff --git a/lib/services/plugin-variables-service.ts b/lib/services/plugin-variables-service.ts
@@ -26,8 +26,10 @@ export class PluginVariablesService implements IPluginVariablesService {
 					values[pluginVariableData.name] = pluginVariableValue;
 				}).future<void>()()).wait();
 
-			this.$projectDataService.initialize(this.$projectData.projectDir);
-			this.$projectDataService.setValue(this.getPluginVariablePropertyName(pluginData), values).wait();
+			if(!_.isEmpty(values)) {
+				this.$projectDataService.initialize(this.$projectData.projectDir);
+				this.$projectDataService.setValue(this.getPluginVariablePropertyName(pluginData), values).wait();
+			}
 		}).future<void>()();
 	}
 
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -385,9 +385,7 @@ export class PluginsService implements IPluginsService {
 				if(!pluginVersion) {
 					this.$logger.warn(`${pluginData.name} is not supported for ${platform}.`);
 					isValid = false;
-				}
-
-				if(semver.gt(pluginVersion, installedFrameworkVersion)) {
+				} else if(semver.gt(pluginVersion, installedFrameworkVersion)) {
 					this.$logger.warn(`${pluginData.name} ${pluginVersion} for ${platform} is not compatible with the currently installed framework version ${installedFrameworkVersion}.`);
 					isValid = false;
 				}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "1.4.0",
+  "version": "1.4.2",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript",`
`3`	`3`	`"preferGlobal": true,`
`4`		`- "version": "1.4.0",`
	`4`	`+ "version": "1.4.2",`
`5`	`5`	`"author": "Telerik <support@telerik.com>",`
`6`	`6`	`"description": "Command-line interface for building NativeScript projects",`
`7`	`7`	`"bin": {`