Skip to content

Commit ed3cd28

Browse files
Code styling fixes
1 parent ef0dd6f commit ed3cd28

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

lib/android-tools-info.ts

+11-9
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
1414
private showWarningsAsErrors: boolean;
1515
private toolsInfo: IAndroidToolsInfoData;
1616
private selectedCompileSdk: number;
17-
private androidHome = process.env["ANDROID_HOME"];
17+
private get androidHome(): string {
18+
return process.env["ANDROID_HOME"];
19+
}
1820

1921
constructor(private $childProcess: IChildProcess,
2022
private $errors: IErrors,
@@ -29,7 +31,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
2931
if (!this.toolsInfo) {
3032
let infoData: IAndroidToolsInfoData = Object.create(null);
3133
infoData.androidHomeEnvVar = this.androidHome;
32-
infoData.compileSdkVersion = this.getCompileSdk();
34+
infoData.compileSdkVersion = this.getCompileSdkVersion();
3335
infoData.buildToolsVersion = this.getBuildToolsVersion();
3436
infoData.targetSdkVersion = this.getTargetSdk();
3537
infoData.supportRepositoryVersion = this.getAndroidSupportRepositoryVersion();
@@ -163,17 +165,17 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
163165

164166
@cache()
165167
private getPathToSdkManagementTool(): string {
166-
const sdkmanagerName = "sdkmanager";
167-
let sdkManagementToolPath = sdkmanagerName;
168+
const sdkManagerName = "sdkmanager";
169+
let sdkManagementToolPath = sdkManagerName;
168170

169171
const isAndroidHomeValid = this.validateAndroidHomeEnvVariable();
170172

171173
if (isAndroidHomeValid) {
172174
// In case ANDROID_HOME is correct, check if sdkmanager exists and if not it means the SDK has not been updated.
173175
// In this case user shoud use `android` from the command-line instead of sdkmanager.
174-
const pathToSdkmanager = path.join(this.androidHome, "tools", "bin", sdkmanagerName);
176+
const pathToSdkManager = path.join(this.androidHome, "tools", "bin", sdkManagerName);
175177
const pathToAndroidExecutable = path.join(this.androidHome, "tools", "android");
176-
const pathToExecutable = this.$fs.exists(pathToSdkmanager) ? pathToSdkmanager : pathToAndroidExecutable;
178+
const pathToExecutable = this.$fs.exists(pathToSdkManager) ? pathToSdkManager : pathToAndroidExecutable;
177179

178180
this.$logger.trace(`Path to Android SDK Management tool is: ${pathToExecutable}`);
179181

@@ -208,7 +210,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
208210
}
209211
}
210212

211-
private getCompileSdk(): number {
213+
private getCompileSdkVersion(): number {
212214
if (!this.selectedCompileSdk) {
213215
let userSpecifiedCompileSdk = this.$options.compileSdk;
214216
if (userSpecifiedCompileSdk) {
@@ -235,7 +237,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
235237
}
236238

237239
private getTargetSdk(): number {
238-
let targetSdk = this.$options.sdk ? parseInt(this.$options.sdk) : this.getCompileSdk();
240+
let targetSdk = this.$options.sdk ? parseInt(this.$options.sdk) : this.getCompileSdkVersion();
239241
this.$logger.trace(`Selected targetSdk is: ${targetSdk}`);
240242
return targetSdk;
241243
}
@@ -282,7 +284,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
282284
}
283285

284286
private getAppCompatRange(): string {
285-
let compileSdkVersion = this.getCompileSdk();
287+
let compileSdkVersion = this.getCompileSdkVersion();
286288
let requiredAppCompatRange: string;
287289
if (compileSdkVersion) {
288290
requiredAppCompatRange = `>=${compileSdkVersion} <${compileSdkVersion + 1}`;

lib/services/android-project-service.ts

-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
203203
}
204204
}
205205

206-
// TODO: Check if we can make this method sync.
207206
public interpolateConfigurationFile(projectData: IProjectData, platformSpecificData: IPlatformSpecificData): void {
208207
let manifestPath = this.getPlatformData(projectData).configurationFilePath;
209208
shell.sed('-i', /__PACKAGE__/, projectData.projectId, manifestPath);

0 commit comments

Comments
 (0)