mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 17:05:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Small versioning rework

Browse source 
- Remove the second dot in upstream_version.sc.scVersion
    - Reason: some programs linkify upstream_version.sc
- Always increment scVersion
    - Reason: Easier to identify unique SchildiChat versions
- Increment versionCode independently from versionName
    - Reason: version codes are limitted, don't waste them!
        - ok, it's unlikely that we'll reach the limit either way...
- Unique versionName for test versions (as long as used correctly)!

Change-Id: I7464d27255d55c4b5d51c08fb51e7692d3a24d1f
This commit is contained in:
SpiritCroc 2021-01-16 11:43:42 +01:00
parent 4564c36fac
commit 6652ed9a1f
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
increment_version.sh
View file

@ -47,9 +47,10 @@ set_prop() {
sed -i "$not_equals""s|\($prop $equals\).*|\1$value|g" "$build_gradle" sed -i "$not_equals""s|\($prop $equals\).*|\1$value|g" "$build_gradle"
} }
calculate_version_code() { # Legacy versioning, based on Element's version codes
echo "(($versionMajor * 10000 + $versionMinor * 100 + $versionPatch + $scVersion) + 4000000) * 10" | bc #calculate_version_code() {
} # echo "(($versionMajor * 10000 + $versionMinor * 100 + $versionPatch + $scVersion) + 4000000) * 10" | bc
#}
# #
@ -62,24 +63,39 @@ versionPatch=`get_prop ext.versionPatch`
scVersion=`get_prop ext.scVersion` scVersion=`get_prop ext.scVersion`
previousVersionCode=`grep '^ versionCode ' "$build_gradle" | sed 's|^ versionCode ||'` previousVersionCode=`grep '^ versionCode ' "$build_gradle" | sed 's|^ versionCode ||'`
versionCode=`calculate_version_code` # Legacy versioning, based on Element's version codes
#versionCode=`calculate_version_code`
#if [ "$release_type" = "test" ]; then
# if [ ! -z "$previousTestVersionCode" ]; then
# previousVersionCode=$((previousVersionCode > previousTestVersionCode ? previousVersionCode : previousTestVersionCode))
# fi
# versionCode=$((previousVersionCode + 1))
#elif [ "$versionCode" = "$previousVersionCode" ]; then
# ((scVersion++))
# echo "Increase downstream version to $scVersion"
# versionCode=`calculate_version_code`
#else
# echo "Upstream version upgrade, no need to change downstream version"
#fi
# New versioning: versionCode incremented independently of versionName, and always increment scVersion
((scVersion++))
if [ "$release_type" = "test" ]; then if [ "$release_type" = "test" ]; then
if [ ! -z "$previousTestVersionCode" ]; then if [ ! -z "$previousTestVersionCode" ]; then
testVersionCount=$((previousVersionCode > previousTestVersionCode ? 1 : (previousTestVersionCode - previousVersionCode + 1)))
previousVersionCode=$((previousVersionCode > previousTestVersionCode ? previousVersionCode : previousTestVersionCode)) previousVersionCode=$((previousVersionCode > previousTestVersionCode ? previousVersionCode : previousTestVersionCode))
else
testVersionCount=1
fi fi
versionCode=$((previousVersionCode + 1)) versionCode=$((previousVersionCode + 1))
elif [ "$versionCode" = "$previousVersionCode" ]; then
((scVersion++))
echo "Increase downstream version to $scVersion"
versionCode=`calculate_version_code`
else else
echo "Upstream version upgrade, no need to change downstream version" versionCode=$((previousVersionCode + 10))
fi fi
version="$versionMajor.$versionMinor.$versionPatch.sc.$scVersion"
version="$versionMajor.$versionMinor.$versionPatch.sc$scVersion"
if [ "$release_type" = "test" ]; then if [ "$release_type" = "test" ]; then
version="$version-test" version="$version-test$testVersionCount"
fi fi
new_tag="sc_v$version" new_tag="sc_v$version"