Merge pull request #554 from NativeScript/vladimirov/support-android-22

Add support for different Android SDKs

Author: rosen-vladimirov

docs/man_pages/project/configuration/platform-add.md

@@ -3,8 +3,8 @@ platform add
 
 Usage | Synopsis
 ------|-------
-Android latest runtime | `$ tns platform add android [--frameworkPath <File Path>] [--symlink]`
-Android selected runtime | `$ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink]`
+Android latest runtime | `$ tns platform add android [--frameworkPath <File Path>] [--symlink] [--sdk <target sdk>]`
+Android selected runtime | `$ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink] [--sdk <target sdk>]`
 <% if (isMacOS) { %>iOS latest runtime | `$ tns platform add ios [--frameworkPath <File Path>] [--symlink]`
 iOS selected runtime | `$ tns platform add ios[@<Version>] [--frameworkPath <File Path>] [--symlink]`<% } %>
 
@@ -13,6 +13,7 @@ Configures the current project to target the selected platform. <% if(isHtml) {
 ### Options
 * `--frameworkPath` - Sets the path to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--symlink` is specified, `<File Path>` must point to directory in which the runtime is already extracted. If `--symlink` is not specified, `<File Path>` must point to a valid npm package. 
 * `--symlink` - Creates a symlink to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--frameworkPath` is specified, creates a symlink to the specified directory. If `--frameworkPath` is not specified, creates a symlink to platform runtime installed with your current version of NativeScript.
+* `--sdk` - Sets the Android target SDK. The value should be a valid Android API Level, for example 17, 19, MNC.
 
 ### Attributes
 * `<File Path>` is the complete path to a valid npm package or a directory that contains a NativeScript runtime for the selected platform.

lib/declarations.ts

@@ -62,4 +62,5 @@ interface IOptions extends ICommonOptions {
 	keyStorePassword: string;
 	keyStoreAlias: string;
 	keyStoreAliasPassword: string;
+	sdk: string;
 }

lib/options.ts

@@ -24,7 +24,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			keyStorePath: { type: OptionType.String },
 			keyStorePassword: { type: OptionType.String,},
 			keyStoreAlias: { type: OptionType.String },
-			keyStoreAliasPassword: { type: OptionType.String }
+			keyStoreAliasPassword: { type: OptionType.String },
+			sdk: { type: OptionType.String }
 		},
 		path.join($hostInfo.isWindows ? process.env.LocalAppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);

lib/services/android-project-service.ts

@@ -10,7 +10,9 @@ import fs = require("fs");
 import os = require("os");
 
 class AndroidProjectService implements IPlatformProjectService {
-	private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21"]; // forbidden for now: "android-MNC"
+	private static MIN_SUPPORTED_VERSION = 17;
+	private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22"]; // forbidden for now: "android-MNC"
+	private static ANDROID_TARGET_PREFIX = "android";
 	private static RES_DIRNAME = "res";
 	private static VALUES_DIRNAME = "values";
 	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
@@ -67,7 +69,9 @@ class AndroidProjectService implements IPlatformProjectService {
 	public createProject(projectRoot: string, frameworkDir: string): IFuture<void> {
 		return (() => {
 			this.$fs.ensureDirectoryExists(projectRoot).wait();
-			let newTarget = this.getLatestValidAndroidTarget(frameworkDir).wait();
+			
+			let newTarget = this.getAndroidTarget(frameworkDir).wait();
+			this.$logger.trace(`Using Android SDK '${newTarget}'.`);
 			let versionNumber = _.last(newTarget.split("-"));
 			if(this.$options.symlink) {
 				this.copyResValues(projectRoot, frameworkDir, versionNumber).wait();
@@ -331,17 +335,37 @@ class AndroidProjectService implements IPlatformProjectService {
 		}
 	}
 
+	private getAndroidTarget(frameworkDir: string): IFuture<string> {
+		return ((): string => { 
+			let newTarget = this.$options.sdk ? `${AndroidProjectService.ANDROID_TARGET_PREFIX}-${this.$options.sdk}` : this.getLatestValidAndroidTarget(frameworkDir).wait();
+			if(!_.contains(this.SUPPORTED_TARGETS, newTarget)) {
+				let versionNumber = parseInt(_.last(newTarget.split("-")));
+				if(versionNumber && (versionNumber < AndroidProjectService.MIN_SUPPORTED_VERSION)) {
+					this.$errors.failWithoutHelp(`The selected target SDK ${newTarget} is not supported. You should target at least ${AndroidProjectService.MIN_SUPPORTED_VERSION}.`);
+				}
+
+				if(!_.contains(this.getInstalledTargets().wait(), newTarget)) {
+					this.$errors.failWithoutHelp(`You have selected to use ${newTarget}, but it is not currently installed.`+
+						' Run \"android\" from your command-line to install/update any missing SDKs or tools.');
+				}
+				this.$logger.warn(`The selected Android target '${newTarget}' is not verified as supported. Some functionality may not work as expected.`);
+			}
+
+			return newTarget;
+		}).future<string>()();
+	}
+
 	private getLatestValidAndroidTarget(frameworkDir: string): IFuture<string> {
 		return (() => {
 			let validTarget = this.getTarget(frameworkDir).wait();
 			let installedTargets = this.getInstalledTargets().wait();
 
 			// adjust to the latest available version
-			var	newTarget = _(this.SUPPORTED_TARGETS).sort().findLast(supportedTarget => _.contains(installedTargets, supportedTarget));
+			var newTarget = _(this.SUPPORTED_TARGETS).sort().findLast(supportedTarget => _.contains(installedTargets, supportedTarget));
 			if (!newTarget) {
-				this.$errors.fail("Please install Android target %s. Make sure you have the latest Android tools installed as well." +
-					" Run \"android\" from your command-line to install/update any missing SDKs or tools.",
-					validTarget.split('-')[1]);
+				this.$errors.failWithoutHelp(`Could not find supported Android target. Please install one of the following: ${this.SUPPORTED_TARGETS.join(", ")}.` + 
+					" Make sure you have the latest Android tools installed as well." + 
+					' Run "android" from your command-line to install/update any missing SDKs or tools.')
 			}
 
 			return newTarget;