refactor: add logic for finding apk name #3367
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Plamen5kov
force-pushed
the
plamen5kov/update-find-apk-logic
branch
from
456c2dd to
4a9c49d
Compare
| @@ -104,6 +105,24 @@ 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), | |||
| platformVersion = currentPlatformData && currentPlatformData[constants.VERSION_STRING], | |||
There was a problem hiding this comment.
I'd prefer each const be on a separate line here - this way each variable declaration is a separate statement and debugging is easier and overall it seams neater to me
| if (semver.valid(platformVersion)) { | ||
| const gradleAndroidPluginVersion3xx = "4.0.0"; | ||
| const normalizedPlatformVersion = `${semver.major(platformVersion)}.${semver.minor(platformVersion)}.0`; | ||
| if (semver.gte(normalizedPlatformVersion, gradleAndroidPluginVersion3xx)) { |
There was a problem hiding this comment.
this logic can be simplified to
if (semver.lt(normalizedPlatformVersion, gradleAndroidPluginVersion3xx)) {
return currentPath;
}by inverting the logic you can skip the second return statement and just reuse the one on line 123
Mitko-Kerezov
approved these changes
Feb 14, 2018
Plamen5kov
added a commit
that referenced
this pull request
Feb 21, 2018
…-logic refactor: add logic for finding apk name
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With the update of the android plugin for gradle to
3.0.1there's a breaking change in the folder structure where the CLI searches for the application file:old search path:
<project_name>/platforms/android/app/build/outputs/apk/new search path:
<project_name>/platforms/android/app/build/outputs/apk/debug/Another change will also be introduced in the
tns-android@4.0.0project template which will stop renaming the final application file:old default name:
<project-name>-<build-version>[-abi].apknew default name:
app-<build-version>.apkThis PR handles both scenarios and is backward compatible.
related issue: NativeScript/android#950