Merge pull request #1681 from NativeScript/vladimirov/add-android-dev-deps

Add devDependencies when adding Android platform

Author: rosen-vladimirov

lib/commands/build.ts

@@ -40,8 +40,7 @@ export class BuildAndroidCommand extends BuildCommandBase implements  ICommand {
 	}
 
 	public execute(args: string[]): IFuture<void> {
-		let config = this.$options.staticBindings ? { runSbGenerator: true } : undefined;
-		return this.executeCore([this.$platformsData.availablePlatforms.Android], config);
+		return this.executeCore([this.$platformsData.availablePlatforms.Android]);
 	}
 
 	public allowedParameters: ICommandParameter[] = [];

lib/commands/deploy.ts

@@ -9,8 +9,7 @@ export class DeployOnDeviceCommand implements ICommand {
 				private $mobileHelper: Mobile.IMobileHelper) { }
 
 	execute(args: string[]): IFuture<void> {
-		let config = this.$options.staticBindings ? { runSbGenerator: true } : undefined;
-		return this.$platformService.deployOnDevice(args[0], config);
+		return this.$platformService.deployOnDevice(args[0]);
 	}
 
 	public canExecute(args: string[]): IFuture<boolean> {

lib/commands/run.ts

@@ -34,8 +34,7 @@ export class RunAndroidCommand extends RunCommandBase implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	public execute(args: string[]): IFuture<void> {
-		let config = this.$options.staticBindings ? { runSbGenerator: true } : undefined;
-		return this.executeCore([this.$platformsData.availablePlatforms.Android], config);
+		return this.executeCore([this.$platformsData.availablePlatforms.Android]);
 	}
 
 	public canExecute(args: string[]): IFuture<boolean> {

lib/common

@@ -85,7 +85,6 @@ interface IOptions extends ICommonOptions {
 	port: Number;
 	production: boolean;
 	sdk: string;
-	staticBindings: boolean;
 	symlink: boolean;
 	tnsModulesVersion: string;
 }

lib/declarations.ts

@@ -47,7 +47,6 @@ interface IPlatformProjectServiceBase {
 }
 
 interface IBuildConfig {
-	runSbGenerator?: boolean;
 	buildForDevice?: boolean;
 	architectures?: string[];
 }

lib/definitions/project.d.ts

@@ -30,7 +30,6 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			keyStoreAliasPassword: { type: OptionType.String },
 			ignoreScripts: {type: OptionType.Boolean },
 			tnsModulesVersion: { type: OptionType.String },
-			staticBindings: {type: OptionType.Boolean},
 			compileSdk: {type: OptionType.Number },
 			port: { type: OptionType.Number },
 			copyTo: { type: OptionType.String },

lib/options.ts

@@ -16,6 +16,18 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
 	private static ANDROID_PLATFORM_NAME = "android";
 	private static MIN_RUNTIME_VERSION_WITH_GRADLE = "1.3.0";
+	private static MIN_REQUIRED_NODEJS_VERSION_FOR_STATIC_BINDINGS = "4.2.1";
+	private static REQUIRED_DEV_DEPENDENCIES = [
+		{ name: "babel-traverse", version: "^6.4.5"},
+		{ name: "babel-types", version: "^6.4.5"},
+		{ name: "babylon", version: "^6.4.5"},
+		{ name: "filewalker", version: "^0.1.2"},
+		{ name: "lazy", version: "^1.0.11"}
+	];
+
+	private get sysInfoData(): ISysInfoData {
+		return this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait();
+	}
 
 	private _androidProjectPropertiesManagers: IDictionary<IAndroidProjectPropertiesManager>;
 
@@ -36,7 +48,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		private $deviceAppDataFactory: Mobile.IDeviceAppDataFactory,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $projectTemplatesService: IProjectTemplatesService,
-		private $xmlValidator: IXmlValidator) {
+		private $xmlValidator: IXmlValidator,
+		private $npm: INodePackageManager) {
 			super($fs, $projectData, $projectDataService);
 			this._androidProjectPropertiesManagers = Object.create(null);
 	}
@@ -88,7 +101,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 			// this call will fail in case `android` is not set correctly.
 			this.$androidToolsInfo.getPathToAndroidExecutable({showWarningsAsErrors: true}).wait();
-			this.$androidToolsInfo.validateJavacVersion(this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait().javacVersion, {showWarningsAsErrors: true}).wait();
+			this.$androidToolsInfo.validateJavacVersion(this.sysInfoData.javacVersion, {showWarningsAsErrors: true}).wait();
 		}).future<void>()();
 	}
 
@@ -126,10 +139,28 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			}
 
 			this.cleanResValues(targetSdkVersion, frameworkVersion).wait();
-
+			if(this.canUseStaticBindingGenerator()) {
+				let npmConfig = {
+					"save": true,
+					"save-dev": true,
+					"save-exact": true,
+					"silent": true
+				};
+
+				_.each(AndroidProjectService.REQUIRED_DEV_DEPENDENCIES, (dependency: any) =>
+					this.$npm.install(`${dependency.name}@${dependency.version}`, this.$projectData.projectDir, npmConfig).wait()
+				);
+			} else {
+				this.$logger.printMarkdown(` As you are using Node.js \`${this.sysInfoData.nodeVer}\` Static Binding Generator will be turned off.` +
+					`Upgrade your Node.js to ${AndroidProjectService.MIN_REQUIRED_NODEJS_VERSION_FOR_STATIC_BINDINGS} or later, so you can use this feature.`);
+			}
 		}).future<any>()();
 	}
 
+	private canUseStaticBindingGenerator(): boolean {
+		return semver.gte(this.sysInfoData.nodeVer, AndroidProjectService.MIN_REQUIRED_NODEJS_VERSION_FOR_STATIC_BINDINGS);
+	}
+
 	private useGradleWrapper(frameworkDir: string): boolean {
 		let gradlew = path.join(frameworkDir, "gradlew");
 		return this.$fs.exists(gradlew).wait();
@@ -231,8 +262,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 					buildOptions.push(`-PksPassword=${this.$options.keyStorePassword}`);
 				}
 
-				if (buildConfig && buildConfig.runSbGenerator) {
-					buildOptions.push("-PrunSBGenerator");
+				if(!this.canUseStaticBindingGenerator()) {
+					buildOptions.push("-PdontRunSbg");
 				}
 
 				let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";

lib/services/android-project-service.ts

@@ -60,13 +60,11 @@ export class ProjectDataService implements IProjectDataService {
 		return (() => {
 			assert.ok(this.projectFilePath, "Initialize method of projectDataService is not called.");
 
-			if(!this.projectData) {
-				if(!this.$fs.exists(this.projectFilePath).wait()) {
-					this.$fs.writeFile(this.projectFilePath, null).wait();
-				}
-
-				this.projectData = this.$fs.readJson(this.projectFilePath).wait() || Object.create(null);
+			if(!this.$fs.exists(this.projectFilePath).wait()) {
+				this.$fs.writeFile(this.projectFilePath, null).wait();
 			}
+
+			this.projectData = this.$fs.readJson(this.projectFilePath).wait() || Object.create(null);
 		}).future<void>()();
 	}
 }