Merge pull request #3626 from NativeScript/vladimirov/fix-platform-commands

fix: platform update/clean commands may fail with Java 10

Author: rosen-vladimirov

lib/commands/platform-clean.ts

@@ -5,7 +5,7 @@ export class CleanCommand implements ICommand {
 		private $projectData: IProjectData,
 		private $platformService: IPlatformService,
 		private $errors: IErrors,
-		private $platformsData: IPlatformsData) {
+		private $platformEnvironmentRequirements: IPlatformEnvironmentRequirements) {
 		this.$projectData.initializeProjectData();
 	}
 
@@ -18,12 +18,15 @@ export class CleanCommand implements ICommand {
 			this.$errors.fail("No platform specified. Please specify a platform to clean");
 		}
 
+		_.each(args, platform => {
+			this.$platformService.validatePlatform(platform, this.$projectData);
+		});
+
 		for (const platform of args) {
 			this.$platformService.validatePlatformInstalled(platform, this.$projectData);
 
-			const platformData = this.$platformsData.getPlatformData(platform, this.$projectData);
-			const platformProjectService = platformData.platformProjectService;
-			await platformProjectService.validate(this.$projectData);
+			const currentRuntimeVersion = this.$platformService.getCurrentPlatformVersion(platform, this.$projectData);
+			await this.$platformEnvironmentRequirements.checkEnvironmentRequirements(platform, this.$projectData.projectDir, currentRuntimeVersion);
 		}
 
 		return true;

lib/commands/update-platform.ts

@@ -4,8 +4,8 @@ export class UpdatePlatformCommand implements ICommand {
 	constructor(private $options: IOptions,
 		private $projectData: IProjectData,
 		private $platformService: IPlatformService,
-		private $errors: IErrors,
-		private $platformsData: IPlatformsData) {
+		private $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
+		private $errors: IErrors) {
 		this.$projectData.initializeProjectData();
 	}
 
@@ -18,12 +18,24 @@ export class UpdatePlatformCommand implements ICommand {
 			this.$errors.fail("No platform specified. Please specify platforms to update.");
 		}
 
-		for (const arg of args) {
+		_.each(args, arg => {
 			const platform = arg.split("@")[0];
 			this.$platformService.validatePlatform(platform, this.$projectData);
-			const platformData = this.$platformsData.getPlatformData(platform, this.$projectData);
-			const platformProjectService = platformData.platformProjectService;
-			await platformProjectService.validate(this.$projectData);
+		});
+
+		for (const arg of args) {
+			const [ platform, versionToBeInstalled ] = arg.split("@");
+			this.$platformService.validatePlatformInstalled(platform, this.$projectData);
+			const argsToCheckEnvironmentRequirements: string[] = [ platform ];
+			// If version is not specified, we know the command will install the latest compatible Android runtime.
+			// The latest compatible Android runtime supports Java version, so we do not need to pass it here.
+			// Passing projectDir to the nativescript-doctor validation will cause it to check the runtime from the current package.json
+			// So in this case, where we do not want to validate the runtime, just do not pass both projectDir and runtimeVersion.
+			if (versionToBeInstalled) {
+				argsToCheckEnvironmentRequirements.push(this.$projectData.projectDir, versionToBeInstalled);
+			}
+
+			await this.$platformEnvironmentRequirements.checkEnvironmentRequirements(...argsToCheckEnvironmentRequirements);
 		}
 
 		return true;

lib/common

@@ -214,6 +214,14 @@ interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	 * @returns {void}
 	 */
 	saveBuildInfoFile(platform: string, projectDir: string, buildInfoFileDirname: string): void;
+
+	/**
+	 * Gives information for the current version of the runtime.
+	 * @param {string} platform The platform to be checked.
+	 * @param {IProjectData} projectData The data describing the project
+	 * @returns {string} Runtime version
+	 */
+	getCurrentPlatformVersion(platform: string, projectData: IProjectData): string;
 }
 
 interface IPlatformOptions extends IPlatformSpecificData, ICreateProjectOptions { }
@@ -381,5 +389,5 @@ interface IUpdateAppOptions extends IOptionalFilesToSync, IOptionalFilesToRemove
 }
 
 interface IPlatformEnvironmentRequirements {
-	checkEnvironmentRequirements(platform?: string, projectDir?: string): Promise<boolean>;
-}
+	checkEnvironmentRequirements(platform?: string, projectDir?: string, runtimeVersion?: string): Promise<boolean>;
+}

lib/definitions/platform.d.ts

@@ -17,10 +17,10 @@ class DoctorService implements IDoctorService {
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $versionsService: IVersionsService) { }
 
-	public async printWarnings(configOptions?: { trackResult: boolean , projectDir?: string }): Promise<void> {
+	public async printWarnings(configOptions?: { trackResult: boolean , projectDir?: string, runtimeVersion?: string }): Promise<void> {
 		const infos = await this.$terminalSpinnerService.execute<NativeScriptDoctor.IInfo[]>({
 			text: `Getting environment information ${EOL}`
-		}, () => doctor.getInfos({ projectDir: configOptions && configOptions.projectDir }));
+		}, () => doctor.getInfos({ projectDir: configOptions && configOptions.projectDir, androidRuntimeVersion: configOptions && configOptions.runtimeVersion }));
 
 		const warnings = infos.filter(info => info.type === constants.WARNING_TYPE_NAME);
 		const hasWarnings = warnings.length > 0;
@@ -80,12 +80,12 @@ class DoctorService implements IDoctorService {
 		});
 	}
 
-	public async canExecuteLocalBuild(platform?: string, projectDir?: string): Promise<boolean> {
+	public async canExecuteLocalBuild(platform?: string, projectDir?: string, runtimeVersion?: string): Promise<boolean> {
 		await this.$analyticsService.trackEventActionInGoogleAnalytics({
 			action: TrackActionNames.CheckLocalBuildSetup,
 			additionalData: "Starting",
 		});
-		const infos = await doctor.getInfos({ platform, projectDir });
+		const infos = await doctor.getInfos({ platform, projectDir, androidRuntimeVersion: runtimeVersion });
 
 		const warnings = this.filterInfosByType(infos, constants.WARNING_TYPE_NAME);
 		const hasWarnings = warnings.length > 0;

lib/services/doctor-service.ts

@@ -30,7 +30,7 @@ export class PlatformEnvironmentRequirements implements IPlatformEnvironmentRequ
 		"deploy": "tns cloud deploy"
 	};
 
-	public async checkEnvironmentRequirements(platform?: string, projectDir?: string): Promise<boolean> {
+	public async checkEnvironmentRequirements(platform?: string, projectDir?: string, runtimeVersion?: string): Promise<boolean> {
 		if (process.env.NS_SKIP_ENV_CHECK) {
 			await this.$analyticsService.trackEventActionInGoogleAnalytics({
 				action: TrackActionNames.CheckEnvironmentRequirements,
@@ -39,7 +39,7 @@ export class PlatformEnvironmentRequirements implements IPlatformEnvironmentRequ
 			return true;
 		}
 
-		const canExecute = await this.$doctorService.canExecuteLocalBuild(platform, projectDir);
+		const canExecute = await this.$doctorService.canExecuteLocalBuild(platform, projectDir, runtimeVersion);
 		if (!canExecute) {
 			if (!isInteractive()) {
 				await this.$analyticsService.trackEventActionInGoogleAnalytics({
@@ -71,7 +71,7 @@ export class PlatformEnvironmentRequirements implements IPlatformEnvironmentRequ
 			if (selectedOption === PlatformEnvironmentRequirements.LOCAL_SETUP_OPTION_NAME) {
 				await this.$doctorService.runSetupScript();
 
-				if (await this.$doctorService.canExecuteLocalBuild(platform, projectDir)) {
+				if (await this.$doctorService.canExecuteLocalBuild(platform, projectDir, runtimeVersion)) {
 					return true;
 				}
 
@@ -102,7 +102,7 @@ export class PlatformEnvironmentRequirements implements IPlatformEnvironmentRequ
 
 			if (selectedOption === PlatformEnvironmentRequirements.BOTH_CLOUD_SETUP_AND_LOCAL_SETUP_OPTION_NAME) {
 				await this.processBothCloudBuildsAndSetupScript();
-				if (await this.$doctorService.canExecuteLocalBuild(platform, projectDir)) {
+				if (await this.$doctorService.canExecuteLocalBuild(platform, projectDir, runtimeVersion)) {
 					return true;
 				}
 

lib/services/platform-environment-requirements.ts

@@ -74,7 +74,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 	}
 
-	private getCurrentPlatformVersion(platform: string, projectData: IProjectData): string {
+	public getCurrentPlatformVersion(platform: string, projectData: IProjectData): string {
 		const platformData = this.$platformsData.getPlatformData(platform, projectData);
 		const currentPlatformData: any = this.$projectDataService.getNSValue(projectData.projectDir, platformData.frameworkPackageName);
 		let version: string;

lib/services/platform-service.ts

@@ -53,7 +53,7 @@
     "minimatch": "3.0.2",
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
-    "nativescript-doctor": "1.1.0",
+    "nativescript-doctor": "1.2.0",
     "open": "0.0.5",
     "ora": "2.0.0",
     "osenv": "0.1.3",

npm-shrinkwrap.json

@@ -165,6 +165,9 @@ function createTestInjector() {
 		getPlaygroundInfo: () => Promise.resolve(null)
 	});
 	testInjector.register("filesHashService", {});
+	testInjector.register("platformEnvironmentRequirements", {
+		checkEnvironmentRequirements: async (platform?: string, projectDir?: string, runtimeVersion?: string): Promise<boolean> => true
+	});
 
 	return testInjector;
 }