Merge pull request #659 from NativeScript/fatme/fix-platform-remove

Fix platform remove

Author: Fatme

lib/definitions/project.d.ts

@@ -14,6 +14,7 @@ interface IProjectDataService {
 	initialize(projectDir: string): void;
 	getValue(propertyName: string): IFuture<any>;
 	setValue(key: string, value: any): IFuture<void>;
+	removeProperty(propertyName: string): IFuture<void>;
 }
 
 interface IProjectTemplatesService {

lib/services/platform-service.ts

@@ -214,11 +214,16 @@ export class PlatformService implements IPlatformService {
 
 	public removePlatforms(platforms: string[]): IFuture<void> {
 		return (() => {
+			this.$projectDataService.initialize(this.$projectData.projectDir);
+			
 			_.each(platforms, platform => {
 				this.validatePlatformInstalled(platform);
+				let platformData = this.$platformsData.getPlatformData(platform);				
 
 				var platformDir = path.join(this.$projectData.platformsDir, platform);
 				this.$fs.deleteDirectory(platformDir).wait();
+				this.$projectDataService.removeProperty(platformData.frameworkPackageName).wait();
+				
 				this.$logger.out(`Platform ${platform} successfully removed.`);
 			});
 

lib/services/project-data-service.ts

@@ -38,6 +38,14 @@ export class ProjectDataService implements IProjectDataService {
 			this.$fs.writeJson(this.projectFilePath, this.projectData, "\t").wait();
 		}).future<void>()();
 	}
+	
+	public removeProperty(propertyName: string): IFuture<void> {
+		return (() => {
+			this.loadProjectFile().wait();
+			delete  this.projectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE][propertyName];
+			this.$fs.writeJson(this.projectFilePath, this.projectData, "\t").wait();
+		}).future<void>()();
+	}
 
 	private loadProjectFile(): IFuture<void> {
 		return (() => {

test/stubs.ts

@@ -320,6 +320,10 @@ export class ProjectDataService implements IProjectDataService {
 	setValue(key: string, value: any): IFuture<void> {
 		return Future.fromResult();
 	}
+	
+	removeProperty(propertyName: string): IFuture<void> {
+		return Future.fromResult();
+	}
 }
 
 export class ProjectHelperStub implements IProjectHelper {