Fix broken platform add android command

Author: Fatme Havaluova

lib/definitions/project.d.ts

@@ -33,7 +33,7 @@ interface IBuildConfig {
 interface IPlatformProjectService {
 	platformData: IPlatformData;
 	validate(): IFuture<void>;
-	createProject(projectRoot: string, frameworkDir: string): IFuture<void>;
+	createProject(frameworkDir: string, frameworkVersion: string): IFuture<void>;
 	interpolateData(projectRoot: string): IFuture<void>;
 	afterCreateProject(projectRoot: string): IFuture<void>;
 	buildProject(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void>;

lib/services/android-project-service.ts

@@ -61,9 +61,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		return this._platformData;
 	}
 
-	public getAppResourcesDestinationDirectoryPath(): IFuture<string> {
+	public getAppResourcesDestinationDirectoryPath(frameworkVersion?: string): IFuture<string> {
 		return (() => {
-			if(this.canUseGradle().wait()) {
+			if(this.canUseGradle(frameworkVersion).wait()) {
 				return path.join(this.platformData.projectRoot, "src", "main", "res");
 			}
 
@@ -81,7 +81,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		}).future<void>()();
 	}
 
-	public createProject(projectRoot: string, frameworkDir: string): IFuture<void> {
+	public createProject(frameworkDir: string, frameworkVersion: string): IFuture<void> {
 		return (() => {
 			let frameworkVersion = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait().version;
 			if(semver.lt(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE)) {
@@ -91,30 +91,30 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 			// TODO: Move these check to validate method once we do not support ant.
 			this.checkGradle().wait();
 
-			this.$fs.ensureDirectoryExists(projectRoot).wait();
+			this.$fs.ensureDirectoryExists(this.platformData.projectRoot).wait();
 			let androidToolsInfo = this.$androidToolsInfo.getToolsInfo().wait();
-			let newTarget = androidToolsInfo.targetSdkVersion;
-			this.$logger.trace(`Using Android SDK '${newTarget}'.`);
+			let targetSdkVersion = androidToolsInfo.targetSdkVersion;
+			this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
 			if(this.$options.symlink) {
-				this.symlinkDirectory("build-tools", projectRoot, frameworkDir).wait();
-				this.symlinkDirectory("libs", projectRoot, frameworkDir).wait();
-				this.symlinkDirectory("src", projectRoot, frameworkDir).wait();
+				this.symlinkDirectory("build-tools", this.platformData.projectRoot, frameworkDir).wait();
+				this.symlinkDirectory("libs", this.platformData.projectRoot, frameworkDir).wait();
+				this.symlinkDirectory("src", this.platformData.projectRoot, frameworkDir).wait();
 
-				this.$fs.symlink(path.join(frameworkDir, "build.gradle"), path.join(projectRoot, "build.gradle")).wait();
-				this.$fs.symlink(path.join(frameworkDir, "settings.gradle"), path.join(projectRoot, "settings.gradle")).wait();
+				this.$fs.symlink(path.join(frameworkDir, "build.gradle"), path.join(this.platformData.projectRoot, "build.gradle")).wait();
+				this.$fs.symlink(path.join(frameworkDir, "settings.gradle"), path.join(this.platformData.projectRoot, "settings.gradle")).wait();
 			} else {
-				this.copy(projectRoot, frameworkDir, "build-tools libs src", "-R");
-				this.copy(projectRoot, frameworkDir, "build.gradle settings.gradle", "-f");
+				this.copy(this.platformData.projectRoot, frameworkDir, "build-tools libs src", "-R");
+				this.copy(this.platformData.projectRoot, frameworkDir, "build.gradle settings.gradle", "-f");
 			}
 
-			this.cleanResValues(newTarget).wait();
+			this.cleanResValues(targetSdkVersion, frameworkVersion).wait();
 
 		}).future<any>()();
 	}
 
-	private cleanResValues(versionNumber: number): IFuture<void> {
+	private cleanResValues(targetSdkVersion: number, frameworkVersion: string): IFuture<void> {
 		return (() => {
-			let resDestinationDir = this.getAppResourcesDestinationDirectoryPath().wait();
+			let resDestinationDir = this.getAppResourcesDestinationDirectoryPath(frameworkVersion).wait();
 			let directoriesInResFolder = this.$fs.readDirectory(resDestinationDir).wait();
 			let directoriesToClean = directoriesInResFolder
 				.map(dir => { return {
@@ -124,7 +124,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 				})
 				.filter(dir => dir.dirName.match(AndroidProjectService.VALUES_VERSION_DIRNAME_PREFIX)
 								&& dir.sdkNum
-								&& (!versionNumber || (versionNumber < dir.sdkNum)))
+								&& (!targetSdkVersion || (targetSdkVersion < dir.sdkNum)))
 				.map(dir => path.join(resDestinationDir, dir.dirName));
 			this.$logger.trace("Directories to clean:");
 			this.$logger.trace(directoriesToClean);
@@ -270,11 +270,19 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		return Future.fromResult();
 	}
 
-	private canUseGradle(): IFuture<boolean> {
+	private _canUseGradle: boolean;
+	private canUseGradle(frameworkVersion?: string): IFuture<boolean> {
 		return (() => {
-			this.$projectDataService.initialize(this.$projectData.projectDir);
-			let frameworkVersion = this.$projectDataService.getValue(this.platformData.frameworkPackageName).wait().version;
-			return semver.gte(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE);
+			if(!this._canUseGradle) {
+				if(!frameworkVersion) {
+					this.$projectDataService.initialize(this.$projectData.projectDir);
+					frameworkVersion = this.$projectDataService.getValue(this.platformData.frameworkPackageName).wait().version;
+				}
+
+				this._canUseGradle = semver.gte(frameworkVersion, AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE);
+			}
+
+			return this._canUseGradle;
 		}).future<boolean>()();
 	}
 

lib/services/platform-service.ts

@@ -93,8 +93,8 @@ export class PlatformService implements IPlatformService {
 
 	private addPlatformCore(platformData: IPlatformData, frameworkDir: string): IFuture<void> {
 		return (() => {
-			platformData.platformProjectService.createProject(platformData.projectRoot, frameworkDir).wait();
 			let installedVersion = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait().version;
+			platformData.platformProjectService.createProject(frameworkDir, installedVersion).wait();
 
 			if(this.$options.frameworkPath && this.$fs.getFsStats(this.$options.frameworkPath).wait().isFile() && !this.$options.symlink) {
 				// Need to remove unneeded node_modules folder