Skip to content

Add an extra version number to be in sync with upstream versions #22

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

Open
dontub wants to merge 1 commit into
base: synodim
Choose a base branch
from
Open

Add an extra version number to be in sync with upstream versions #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions vector/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ kapt {
ext.versionMajor = 1
ext.versionMinor = 0
ext.versionPatch = 15
ext.versionSynod = 1

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand All @@ -30,7 +31,7 @@ static def generateVersionCodeFromTimestamp() {
def generateVersionCodeFromVersionName() {
// plus 4_000_000 for compatibility reason with the previous way the Version Code was computed
// Note that the result will be multiplied by 10 when adding the digit for the arch
return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000
return (versionMajor * 1_00_00_00 + versionMinor * 1_00_00 + versionPatch * 1_00 + versionSynod) + 4_000_000
}

def getVersionCode() {
Expand Down Expand Up @@ -120,7 +121,7 @@ android {
versionCode project.getVersionCode()

// Required for sonar analysis
versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
versionName "${versionMajor}.${versionMinor}.${versionPatch}-${versionSynod}-sonar"

buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
resValue "string", "git_revision", "\"${gitRevision()}\""
Expand Down Expand Up @@ -234,7 +235,7 @@ android {
gplay {
dimension "store"

versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
versionName "${versionMajor}.${versionMinor}.${versionPatch}-${versionSynod}${getGplayVersionSuffix()}"

resValue "bool", "isGplay", "true"
buildConfigField "boolean", "ALLOW_FCM_USE", "true"
Expand All @@ -245,7 +246,7 @@ android {
fdroid {
dimension "store"

versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
versionName "${versionMajor}.${versionMinor}.${versionPatch}-${versionSynod}${getFdroidVersionSuffix()}"

resValue "bool", "isGplay", "false"
buildConfigField "boolean", "ALLOW_FCM_USE", "false"
Expand Down