fix: build projects with SDK28 if runtime below 6.1.0

Author: KristianDD

lib/android-tools-info.ts

@@ -10,8 +10,8 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 	}
 
 	@cache()
-	public getToolsInfo(): IAndroidToolsInfoData {
-		const infoData: IAndroidToolsInfoData = <IAndroidToolsInfoData>(androidToolsInfo.getToolsInfo());
+	public getToolsInfo(config: IProjectDir): IAndroidToolsInfoData {
+		const infoData: IAndroidToolsInfoData = <IAndroidToolsInfoData>(androidToolsInfo.getToolsInfo({projectDir: config.projectDir}));
 
 		infoData.androidHomeEnvVar = androidToolsInfo.androidHome;
 		infoData.compileSdkVersion = this.getCompileSdkVersion(infoData.installedTargets, infoData.compileSdkVersion);
@@ -29,7 +29,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		const showWarningsAsErrors = options && options.showWarningsAsErrors;
 		const isAndroidHomeValid = this.validateAndroidHomeEnvVariable(options);
 
-		detectedErrors = androidToolsInfo.validateInfo().map(warning => this.printMessage(warning.warning, showWarningsAsErrors)).length > 0;
+		detectedErrors = androidToolsInfo.validateInfo({projectDir: options.projectDir}).map(warning => this.printMessage(warning.warning, showWarningsAsErrors)).length > 0;
 
 		if (options && options.validateTargetSdk) {
 			detectedErrors = this.validateTargetSdk(options);
@@ -38,17 +38,16 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		return detectedErrors || !isAndroidHomeValid;
 	}
 
-	public validateTargetSdk(options?: IAndroidToolsInfoOptions): boolean {
+	public validateTargetSdk(options: IAndroidToolsInfoOptions): boolean {
 		let detectedErrors = false;
-		const showWarningsAsErrors = options && options.showWarningsAsErrors;
 
-		const toolsInfoData = this.getToolsInfo();
+		const toolsInfoData = this.getToolsInfo({ projectDir: options.projectDir});
 		const targetSdk = toolsInfoData.targetSdkVersion;
 
-		detectedErrors = androidToolsInfo.validateMinSupportedTargetSdk(targetSdk).map(warning => this.printMessage(warning.warning, showWarningsAsErrors)).length > 0;
+		detectedErrors = androidToolsInfo.validateMinSupportedTargetSdk({targetSdk, projectDir: options.projectDir}).map(warning => this.printMessage(warning.warning, options.showWarningsAsErrors)).length > 0;
 
 		if (!detectedErrors) {
-			androidToolsInfo.validataMaxSupportedTargetSdk(targetSdk).map(warning => this.$logger.warn(warning.warning));
+			androidToolsInfo.validataMaxSupportedTargetSdk({targetSdk, projectDir: options.projectDir}).map(warning => this.$logger.warn(warning.warning));
 		}
 
 		return detectedErrors;

lib/declarations.d.ts

@@ -646,9 +646,10 @@ interface IAndroidToolsInfo {
 	/**
 	 * Provides information about installed Android SDKs, Build Tools, Support Library
 	 * and ANDROID_HOME environement variable.
+	 * @param {IProjectDir} config Object with a single property - projectDir. This is the root directory where NativeScript project is located.
 	 * @return {IAndroidToolsInfoData} Information about installed Android Tools and SDKs.
 	 */
-	getToolsInfo(): IAndroidToolsInfoData;
+	getToolsInfo(config?: IProjectDir): IAndroidToolsInfoData;
 
 	/**
 	 * Validates the information about required Android tools and SDK versions.
@@ -720,11 +721,11 @@ interface IAndroidToolsInfoData extends NativeScriptDoctor.IAndroidToolsInfoData
 /**
  * Describes options that can be passed to methods from IAndroidToolsInfo interface
  */
-interface IAndroidToolsInfoOptions {
+interface IAndroidToolsInfoOptions extends Partial<IProjectDir> {
 	/**
 	 * Defines if the warning messages should treated as error.
 	 */
-	showWarningsAsErrors: boolean;
+	showWarningsAsErrors?: boolean;
 }
 
 interface IAndroidToolsInfoValidateInput extends IAndroidToolsInfoOptions {

lib/definitions/android-plugin-migrator.d.ts

@@ -19,7 +19,7 @@ interface IAndroidPluginBuildService {
  * Describes data required for building plugin for Android.
  * The data can be consumed in the buildAndroidPlugin hook.
  */
-interface IBuildAndroidPluginData {
+interface IBuildAndroidPluginData extends Partial<IProjectDir> {
 	/**
 	 * Directory where the plugin will be build.
 	 * Usually this is the `<project dir>/platforms/tempPlugin/<plugin name>` dir.

lib/services/android-plugin-build-service.ts

@@ -189,7 +189,7 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 			await this.updateManifest(manifestFilePath, pluginTempMainSrcDir, shortPluginName);
 			this.copySourceSetDirectories(androidSourceDirectories, pluginTempMainSrcDir);
 			await this.setupGradle(pluginTempDir, options.platformsAndroidDirPath, options.projectDir);
-			await this.buildPlugin({ pluginDir: pluginTempDir, pluginName: options.pluginName });
+			await this.buildPlugin({ pluginDir: pluginTempDir, pluginName: options.pluginName, projectDir: options.projectDir });
 			this.$watchIgnoreListService.addFileToIgnoreList(path.join(options.aarOutputDir, `${shortPluginName}.aar`));
 			this.copyAar(shortPluginName, pluginTempDir, options.aarOutputDir);
 			this.writePluginHashInfo(pluginSourceFileHashesInfo, pluginTempDir);
@@ -440,8 +440,8 @@ export class AndroidPluginBuildService implements IAndroidPluginBuildService {
 	@hook("buildAndroidPlugin")
 	private async buildPlugin(pluginBuildSettings: IBuildAndroidPluginData): Promise<void> {
 		if (!pluginBuildSettings.androidToolsInfo) {
-			this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true });
-			pluginBuildSettings.androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
+			this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true, projectDir: pluginBuildSettings.projectDir });
+			pluginBuildSettings.androidToolsInfo = this.$androidToolsInfo.getToolsInfo({ projectDir: pluginBuildSettings.projectDir });
 		}
 
 		const gradlew = this.$hostInfo.isWindows ? "gradlew.bat" : "./gradlew";

lib/services/android-project-service.ts

@@ -122,7 +122,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			notConfiguredEnvOptions
 		});
 
-		this.$androidToolsInfo.validateTargetSdk({ showWarningsAsErrors: true });
+		this.$androidToolsInfo.validateTargetSdk({ showWarningsAsErrors: true, projectDir: projectData.projectDir });
 
 		return {
 			checkEnvironmentRequirementsOutput
@@ -135,7 +135,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}
 
 		this.$fs.ensureDirectoryExists(this.getPlatformData(projectData).projectRoot);
-		const androidToolsInfo = this.$androidToolsInfo.getToolsInfo();
+		const androidToolsInfo = this.$androidToolsInfo.getToolsInfo({ projectDir: projectData.projectDir});
 		const targetSdkVersion = androidToolsInfo && androidToolsInfo.targetSdkVersion;
 		this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
 

lib/services/android/gradle-build-args-service.ts

@@ -22,7 +22,7 @@ export class GradleBuildArgsService implements IGradleBuildArgsService {
 	private getBaseTaskArgs(buildData: IAndroidBuildData): string[] {
 		const args = this.getBuildLoggingArgs();
 
-		const toolsInfo = this.$androidToolsInfo.getToolsInfo();
+		const toolsInfo = this.$androidToolsInfo.getToolsInfo({projectDir: buildData.projectDir});
 		args.push(
 			`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`,
 			`-PtargetSdk=${toolsInfo.targetSdkVersion}`,

npm-shrinkwrap.json

@@ -59,7 +59,7 @@
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
     "nativescript-dev-xcode": "0.2.0",
-    "nativescript-doctor": "1.11.0-rc.0",
+    "nativescript-doctor": "1.11.0-rc.1",
     "nativescript-preview-sdk": "0.3.4",
     "open": "0.0.5",
     "ora": "2.0.0",