-
Notifications
You must be signed in to change notification settings - Fork 61
feat: Add version code and version name as a config #507
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.
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
Open
farhaanbukhsh
wants to merge
1
commit into
openedx:main
Choose a base branch
from
open-craft:farhaan/change-version-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| def config = configHelper.fetchConfig() | ||
| def appId = config.getOrDefault("APPLICATION_ID", "org.openedx.app") | ||
| def appVersionCode = config.getOrDefault("VERSION_CODE", 1)?.toString() | ||
| def appVersionName = config.getOrDefault("VERSION_NAME", "1.0.0") | ||
|
|
||
| if (!(appVersionCode ==~ /[0-9]+/) || !appVersionCode.isInteger() || | ||
| appVersionCode.toInteger() < 1 || appVersionCode.toInteger() > 2100000000) { | ||
| throw new GradleException("VERSION_CODE must be an integer between 1 and 2100000000 in the YAML config.") | ||
| } | ||
|
|
||
| def themeDirectory = config.getOrDefault("THEME_DIRECTORY", "openedx") | ||
| def firebaseConfig = config.get('FIREBASE') | ||
| def firebaseEnabled = firebaseConfig?.getOrDefault('ENABLED', false) | ||
|
|
@@ -35,8 +43,8 @@ android { | |
| applicationId appId | ||
| minSdk min_sdk_version | ||
| targetSdk target_sdk_version | ||
| versionCode 1 | ||
| versionName "1.0.0" | ||
| versionCode appVersionCode.toInteger() | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Related to above comment, why do we need to keep it as a string and cast to int every time we need this value? |
||
| versionName appVersionName | ||
|
|
||
| resourceConfigurations += ["en", "uk"] | ||
|
|
||
|
|
||
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@farhaanbukhsh I am very confused here. Why are we converting
VERSION_CODEto string, compare against a regex, check!isInt, to cast toInt and then validate the range?Why can't we simply do?
Is it something with the way Gradle parses the YAML? Does it not preserve integers?