Merge pull request #397 from NativeScript/totev/improve-warnings2

teobugslayer · teobugslayer · commit 8d1f2c228b5c · 2015-03-30T17:37:53.000+03:00
Sync with latest common lib
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 4f61a11475f9bea8781a8a83eddbd2a7cde17961
+Subproject commit 91ad3d65a1a4e1f96b106d231d8ac2ce142824f5
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -415,7 +415,7 @@ export class PlatformService implements IPlatformService {
 				}
 
 				if(semver.gt(currentVersion, newVersion)) { // Downgrade
-					var isUpdateConfirmed = this.$prompter.confirm(util.format("You are going to downgrade to android runtime v.%s. Are you sure?", newVersion), () => "n").wait();
+					var isUpdateConfirmed = this.$prompter.confirm(util.format("You are going to downgrade to android runtime v.%s. Are you sure?", newVersion), () => false).wait();
 					if(isUpdateConfirmed) {
 						this.updatePlatformCore(platformData, currentVersion, newVersion).wait();
 					}
@@ -425,7 +425,7 @@ export class PlatformService implements IPlatformService {
 					this.updatePlatformCore(platformData, currentVersion, newVersion).wait();
 				}
 			} else {
-				var isUpdateConfirmed = this.$prompter.confirm(util.format("We need to override xcodeproj file. The old one will be saved at %s. Are you sure?", options.profileDir), () => "y").wait();
+				var isUpdateConfirmed = this.$prompter.confirm(util.format("We need to override xcodeproj file. The old one will be saved at %s. Are you sure?", options.profileDir), () => true).wait();
 				if(isUpdateConfirmed) {
 					platformData.platformProjectService.updatePlatform(currentVersion, newVersion).wait();
 					this.updatePlatformCore(platformData, currentVersion, newVersion).wait();

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ export class PlatformService implements IPlatformService {`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`if(semver.gt(currentVersion, newVersion)) { // Downgrade`
`418`		`- var isUpdateConfirmed = this.$prompter.confirm(util.format("You are going to downgrade to android runtime v.%s. Are you sure?", newVersion), () => "n").wait();`
	`418`	`+ var isUpdateConfirmed = this.$prompter.confirm(util.format("You are going to downgrade to android runtime v.%s. Are you sure?", newVersion), () => false).wait();`
`419`	`419`	`if(isUpdateConfirmed) {`
`420`	`420`	`this.updatePlatformCore(platformData, currentVersion, newVersion).wait();`
`421`	`421`	`}`
`@@ -425,7 +425,7 @@ export class PlatformService implements IPlatformService {`
`425`	`425`	`this.updatePlatformCore(platformData, currentVersion, newVersion).wait();`
`426`	`426`	`}`
`427`	`427`	`} else {`
`428`		`- var isUpdateConfirmed = this.$prompter.confirm(util.format("We need to override xcodeproj file. The old one will be saved at %s. Are you sure?", options.profileDir), () => "y").wait();`
	`428`	`+ var isUpdateConfirmed = this.$prompter.confirm(util.format("We need to override xcodeproj file. The old one will be saved at %s. Are you sure?", options.profileDir), () => true).wait();`
`429`	`429`	`if(isUpdateConfirmed) {`
`430`	`430`	`platformData.platformProjectService.updatePlatform(currentVersion, newVersion).wait();`
`431`	`431`	`this.updatePlatformCore(platformData, currentVersion, newVersion).wait();`