Merge pull request #967 from NativeScript/vladimirov/update-min-compile-sdk

Allow specifying compileSdk

Author: rosen-vladimirov

docs/man_pages/project/testing/build-android.md

@@ -3,19 +3,23 @@ build android
 
 Usage | Synopsis
 ---|---
-General | `$ tns build android [--key-store-path <File Path> --key-store-password <Password> --key-store-alias <Name> --key-store-alias-password <Password>] [--release] [--static-bindings]`
+General | `$ tns build android [--compileSdk <API Level>] [--key-store-path <File Path> --key-store-password <Password> --key-store-alias <Name> --key-store-alias-password <Password>] [--release] [--static-bindings]`
 
 Builds the project for Android and produces an APK that you can manually deploy on device or in the native emulator.
 
 ### Options
+* `--compileSdk` - Sets the Android SDK that will be used to build the project.
 * `--release` - If set, produces a release build. Otherwise, produces a debug build. When set, you must also specify the `--key-store-*` options.
 * `--key-store-path` - Specifies the file path to the keystore file (P12) which you want to use to code sign your APK. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--key-store-password` - Provides the password for the keystore file specified with `--key-store-path`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--key-store-alias` - Provides the alias for the keystore file specified with `--key-store-path`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--key-store-alias-password` - Provides the password for the alias specified with `--key-store-alias-password`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--static-bindings` - If set, generates static bindings from your JavaScript code to corresponding native Android APIs during build. This static bindings speed up app loading.
 
-<% if(isHtml) { %> 
+### Attributes
+`<API Level>` is a valid Android API level. For example: 22, 23.<% if(isHtml) { %> For a complete list of the Android API levels and their corresponding Android versions, click [here](http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#platform).<% } %>
+
+<% if(isHtml) { %>
 ### Command Limitations
 
 * When the `--release` flag is set, you must also specify all `--key-store-*` options.

lib/android-tools-info.ts

@@ -7,7 +7,7 @@ import * as semver from "semver";
 export class AndroidToolsInfo implements IAndroidToolsInfo {
 	private static ANDROID_TARGET_PREFIX = "android";
 	private static SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22", "android-23"];
-	private static MIN_REQUIRED_COMPILE_TARGET = 21;
+	private static MIN_REQUIRED_COMPILE_TARGET = 22;
 	private static REQUIRED_BUILD_TOOLS_RANGE_PREFIX = ">=22";
 	private static VERSION_REGEX = /^(\d+\.){2}\d+$/;
 	private showWarningsAsErrors: boolean;
@@ -120,12 +120,23 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 	private getCompileSdk(): IFuture<number> {
 		return ((): number => {
 			if(!this.selectedCompileSdk) {
-				let latestValidAndroidTarget = this.getLatestValidAndroidTarget().wait();
-				if(latestValidAndroidTarget) {
-					let integerVersion = this.parseAndroidSdkString(latestValidAndroidTarget);
+				let userSpecifiedCompileSdk = this.$options.compileSdk;
+				if(userSpecifiedCompileSdk) {
+					let installedTargets = this.getInstalledTargets().wait();
+					let androidCompileSdk = `${AndroidToolsInfo.ANDROID_TARGET_PREFIX}-${userSpecifiedCompileSdk}`;
+					if(!_.contains(installedTargets, androidCompileSdk)) {
+						this.$errors.failWithoutHelp(`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`);
+					}
+
+					this.selectedCompileSdk = userSpecifiedCompileSdk;
+				} else {
+					let latestValidAndroidTarget = this.getLatestValidAndroidTarget().wait();
+					if(latestValidAndroidTarget) {
+						let integerVersion = this.parseAndroidSdkString(latestValidAndroidTarget);
 
-					if(integerVersion && integerVersion >= AndroidToolsInfo.MIN_REQUIRED_COMPILE_TARGET) {
-						this.selectedCompileSdk = integerVersion;
+						if(integerVersion && integerVersion >= AndroidToolsInfo.MIN_REQUIRED_COMPILE_TARGET) {
+							this.selectedCompileSdk = integerVersion;
+						}
 					}
 				}
 			}

lib/declarations.ts

@@ -81,6 +81,7 @@ interface IOptions extends ICommonOptions {
 	ignoreScripts: boolean;
 	tnsModulesVersion: string;
 	staticBindings: boolean;
+	compileSdk: number;
 }
 
 interface IProjectFilesManager {

lib/options.ts

@@ -29,7 +29,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			sdk: { type: OptionType.String },
 			ignoreScripts: {type: OptionType.Boolean },
 			tnsModulesVersion: { type: OptionType.String },
-			staticBindings: {type: OptionType.Boolean}
+			staticBindings: {type: OptionType.Boolean},
+			compileSdk: {type: OptionType.Number }
 		},
 		path.join($hostInfo.isWindows ? process.env.LocalAppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);