fix: support tags for platform versions

Author: KristianDD

lib/common/definitions/mobile.d.ts

@@ -993,7 +993,6 @@ declare module Mobile {
 		platformNames: string[];
 		isAndroidPlatform(platform: string): boolean;
 		isiOSPlatform(platform: string): boolean;
-		isWP8Platform(platform: string): boolean;
 		normalizePlatformName(platform: string): string;
 		validatePlatformName(platform: string): string;
 		buildDevicePath(...args: string[]): string;
@@ -1016,7 +1015,6 @@ declare module Mobile {
 	interface IDevicePlatformsConstants {
 		iOS: string;
 		Android: string;
-		WP8: string;
 	}
 
 	interface IDeviceApplication {

lib/common/mobile/device-platforms-constants.ts

@@ -1,6 +1,5 @@
 export class DevicePlatformsConstants implements Mobile.IDevicePlatformsConstants {
 	public iOS = "iOS";
 	public Android = "Android";
-	public WP8 = "WP8";
 }
 $injector.register("devicePlatformsConstants", DevicePlatformsConstants);

lib/common/mobile/mobile-helper.ts

@@ -21,17 +21,11 @@ export class MobileHelper implements Mobile.IMobileHelper {
 		return !!(platform && (this.$devicePlatformsConstants.iOS.toLowerCase() === platform.toLowerCase()));
 	}
 
-	public isWP8Platform(platform: string): boolean {
-		return !!(platform && (this.$devicePlatformsConstants.WP8.toLowerCase() === platform.toLowerCase()));
-	}
-
 	public normalizePlatformName(platform: string): string {
 		if (this.isAndroidPlatform(platform)) {
 			return "Android";
 		} else if (this.isiOSPlatform(platform)) {
 			return "iOS";
-		} else if (this.isWP8Platform(platform)) {
-			return "WP8";
 		}
 
 		return undefined;

lib/constants.ts

@@ -265,11 +265,6 @@ export class PluginNativeDirNames {
 	public static Android = "android";
 }
 
-export const DEVICE_PLATFORMS: IDictionary<string> = {
-	iOS: "iOS",
-	Android: "Android"
-};
-
 export const PODFILE_NAME = "Podfile";
 
 export class IosProjectConstants {

lib/controllers/base-update-controller.ts

@@ -44,7 +44,7 @@ export class BaseUpdateController {
 		const currentPlatformVersion = this.$platformCommandHelper.getCurrentPlatformVersion(lowercasePlatform, projectData);
 		const platformData = this.$platformsDataService.getPlatformData(lowercasePlatform, projectData);
 		if (currentPlatformVersion) {
-			const maxPlatformSatisfyingVersion = await this.$packageInstallationManager.maxSatisfyingVersion(platformData.frameworkPackageName, currentPlatformVersion) || currentPlatformVersion;
+			const maxPlatformSatisfyingVersion = await this.getMaxDependencyVersion(platformData.frameworkPackageName, currentPlatformVersion) || currentPlatformVersion;
 			if (semver.gte(maxPlatformSatisfyingVersion, targetVersion)) {
 				return false;
 			}

lib/controllers/migrate-controller.ts

@@ -10,6 +10,7 @@ export class MigrateController extends BaseUpdateController implements IMigrateC
 		protected $platformsDataService: IPlatformsDataService,
 		protected $packageInstallationManager: IPackageInstallationManager,
 		protected $packageManager: IPackageManager,
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $logger: ILogger,
 		private $addPlatformService: IAddPlatformService,
 		private $pluginsService: IPluginsService,
@@ -58,15 +59,17 @@ export class MigrateController extends BaseUpdateController implements IMigrateC
 		{ packageName: "nativescript-cardview", verifiedVersion: "3.2.0"}
 	];
 
-	static readonly verifiedPlatformVersions: IDictionary<string> = {
-		[constants.DEVICE_PLATFORMS.Android.toLowerCase()]: "6.0.0-2019-06-11-172137-01",
-		[constants.DEVICE_PLATFORMS.iOS.toLowerCase()]: "6.0.0-2019-06-10-154118-03"
-	};
-
 	static readonly tempFolder: string = ".migration_backup";
-	static readonly updateFailMessage: string = "Could not migrate the project!";
+	static readonly migrateFailMessage: string = "Could not migrate the project!";
 	static readonly backupFailMessage: string = "Could not backup project folders!";
 
+	get verifiedPlatformVersions(): IDictionary<string> {
+		return {
+			[this.$devicePlatformsConstants.Android.toLowerCase()]: "6.0.0-2019-06-11-172137-01",
+			[this.$devicePlatformsConstants.iOS.toLowerCase()]: "6.0.0-2019-06-10-154118-03"
+		};
+	}
+
 	public async migrate({projectDir}: {projectDir: string}): Promise<void> {
 		const projectData = this.$projectDataService.getProjectData(projectDir);
 		const tmpDir = path.join(projectDir, MigrateController.tempFolder);
@@ -86,7 +89,7 @@ export class MigrateController extends BaseUpdateController implements IMigrateC
 			await this.migrateDependencies(projectData);
 		} catch (error) {
 			this.restoreBackup(MigrateController.folders, tmpDir, projectData);
-			this.$logger.error(MigrateController.updateFailMessage);
+			this.$logger.error(MigrateController.migrateFailMessage);
 		}
 	}
 
@@ -103,8 +106,8 @@ export class MigrateController extends BaseUpdateController implements IMigrateC
 				return true;
 			}
 		}
-		for (const platform in constants.DEVICE_PLATFORMS) {
-			if (await this.shouldUpdateRuntimeVersion({ targetVersion: MigrateController.verifiedPlatformVersions[platform.toLowerCase()], platform, projectData, shouldAdd: true})) {
+		for (const platform in this.$devicePlatformsConstants) {
+			if (await this.shouldUpdateRuntimeVersion({ targetVersion: this.verifiedPlatformVersions[platform.toLowerCase()], platform, projectData, shouldAdd: true})) {
 				return true;
 			}
 		}
@@ -140,10 +143,10 @@ export class MigrateController extends BaseUpdateController implements IMigrateC
 			}
 		}
 
-		for (const platform in constants.DEVICE_PLATFORMS) {
+		for (const platform in this.$devicePlatformsConstants) {
 			const lowercasePlatform = platform.toLowerCase();
-			if (await this.shouldUpdateRuntimeVersion({targetVersion: MigrateController.verifiedPlatformVersions[lowercasePlatform], platform, projectData, shouldAdd: true})) {
-				const verifiedPlatformVersion = MigrateController.verifiedPlatformVersions[lowercasePlatform];
+			if (await this.shouldUpdateRuntimeVersion({targetVersion: this.verifiedPlatformVersions[lowercasePlatform], platform, projectData, shouldAdd: true})) {
+				const verifiedPlatformVersion = this.verifiedPlatformVersions[lowercasePlatform];
 				const platformData = this.$platformsDataService.getPlatformData(lowercasePlatform, projectData);
 				this.$logger.info(`Updating ${platform} platform to version '${verifiedPlatformVersion}'.`);
 				await this.$addPlatformService.setPlatformVersion(platformData, projectData, verifiedPlatformVersion);