From f9424dc7e7bb38fd9335d9cf008b45d32b878b92 Mon Sep 17 00:00:00 2001
From: rosen-vladimirov <rosen.vladimirov@progress.com>
Date: Thu, 9 May 2019 17:37:49 +0300
Subject: [PATCH 1/2] chore: set version to 5.4.1

---
 npm-shrinkwrap.json | 2 +-
 package.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 46a9da7799..d97b5c17ad 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4ea1444a73..f4d61d2b64 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "5.4.0",
+  "version": "5.4.1",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {

From 6ddcc2f7d4289d6276b640a12fc21a8125de3bf9 Mon Sep 17 00:00:00 2001
From: Todor Petrov <Todor.Petrov@Telerik.com>
Date: Fri, 10 May 2019 11:19:23 +0300
Subject: [PATCH 2/2] style: misleading warning message

---
 lib/services/plugins-service.ts | 8 ++++----
 test/plugins-service.ts         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
index 64dc3c38cf..857e05dbbc 100644
--- a/lib/services/plugins-service.ts
+++ b/lib/services/plugins-service.ts
@@ -318,12 +318,12 @@ export class PluginsService implements IPluginsService {
 		const installedFrameworkVersion = this.getInstalledFrameworkVersion(platform, projectData);
 		const pluginPlatformsData = pluginData.platformsData;
 		if (pluginPlatformsData) {
-			const pluginVersion = (<any>pluginPlatformsData)[platform];
-			if (!pluginVersion) {
+			const versionRequiredByPlugin = (<any>pluginPlatformsData)[platform];
+			if (!versionRequiredByPlugin) {
 				this.$logger.warn(`${pluginData.name} is not supported for ${platform}.`);
 				isValid = false;
-			} else if (semver.gt(pluginVersion, installedFrameworkVersion)) {
-				this.$logger.warn(`${pluginData.name} ${pluginVersion} for ${platform} is not compatible with the currently installed framework version ${installedFrameworkVersion}.`);
+			} else if (semver.gt(versionRequiredByPlugin, installedFrameworkVersion)) {
+				this.$logger.warn(`${pluginData.name} requires at least version ${versionRequiredByPlugin} of platform ${platform}. Currently installed version is ${installedFrameworkVersion}.`);
 				isValid = false;
 			}
 		}
diff --git a/test/plugins-service.ts b/test/plugins-service.ts
index 630a577b5f..e36966e1aa 100644
--- a/test/plugins-service.ts
+++ b/test/plugins-service.ts
@@ -272,7 +272,7 @@ describe("Plugins service", () => {
 			});
 			it("fails when the plugin does not support the installed framework", async () => {
 				let isWarningMessageShown = false;
-				const expectedWarningMessage = "mySamplePlugin 1.5.0 for android is not compatible with the currently installed framework version 1.4.0.";
+				const expectedWarningMessage = "mySamplePlugin requires at least version 1.5.0 of platform android. Currently installed version is 1.4.0.";
 
 				// Creates plugin in temp folder
 				const pluginName = "mySamplePlugin";