Skip to content

refactor: add logic for finding apk name #3367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 14, 2018
Merged

refactor: add logic for finding apk name #3367

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a9c49d
refactor: add logic for finding apk name
Plamen5kov Feb 14, 2018
ce3a823
refactor: update after review
Plamen5kov Feb 14, 2018
427683e
chore: update after review
Plamen5kov Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions lib/services/android-project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,15 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
platformProjectService: this,
emulatorServices: this.$androidEmulatorServices,
projectRoot: projectRoot,
deviceBuildOutputPath: path.join(...deviceBuildOutputArr),
deviceBuildOutputPath: this.getDeviceBuildOutputPath(path.join(...deviceBuildOutputArr), projectData),
getValidPackageNames: (buildOptions: { isReleaseBuild?: boolean, isForDevice?: boolean }): string[] => {
const buildMode = buildOptions.isReleaseBuild ? Configurations.Release.toLowerCase() : Configurations.Debug.toLowerCase();

return [
`${packageName}-${buildMode}.apk`,
`${projectData.projectName}-${buildMode}.apk`,
`${projectData.projectName}.apk`
`${projectData.projectName}.apk`,
`app-${buildMode}.apk`
];
},
frameworkFilesExtensions: [".jar", ".dat", ".so"],
Expand All @@ -104,6 +105,22 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
return this._platformData;
}

private getDeviceBuildOutputPath(currentPath: string, projectData: IProjectData): string {
const currentPlatformData: IDictionary<any> = this.$projectDataService.getNSValue(projectData.projectDir, constants.TNS_ANDROID_RUNTIME_NAME);
const platformVersion = currentPlatformData && currentPlatformData[constants.VERSION_STRING];
const normalizedPath = path.join(currentPath, "debug");

if (semver.valid(platformVersion)) {
const gradleAndroidPluginVersion3xx = "4.0.0";
const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`;
if (semver.lt(normalizedPlatformVersion, gradleAndroidPluginVersion3xx)) {
return currentPath;
}
}

return normalizedPath;
}

// TODO: Remove prior to the 4.0 CLI release @Pip3r4o @PanayotCankov
// Similar to the private method of the same name in platform-service.
private getCurrentPlatformVersion(platformData: IPlatformData, projectData: IProjectData): string {
Expand Down