wzray/tt9
1
0
Fork 0
Code Activity

removed the git hash from 'versionName' and also made the git version tag stricter, not to fail with random tags

Browse source
This commit is contained in:
Dimo Karaivanov 2022-11-30 13:41:27 +02:00
parent bd73918f6a
commit 6a2e1806d1
2 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

44
build.gradle
View file

@ -39,32 +39,43 @@ def execThing ( String cmdStr ) {
return stdout.toString().trim() return stdout.toString().trim()
} }
def computeVersionCode = { -> def getCurrentGitHash = { ->
String commitsCount = execThing("git rev-list --count HEAD") return execThing('git log -1 --format=%h')
}
def getVersionCode = { ->
String commitsCount = execThing("git rev-list --count HEAD")
return Integer.valueOf(commitsCount) return Integer.valueOf(commitsCount)
} }
def computeVersionName = { -> def getVersionName = { ->
// major version // major version
String versionTagsCount = execThing('git tag --list v*').split('\n').size() String versionTagsCount = execThing('git tag --list v[0-9]*').split('\n').size()
// minor version // minor version
String lastVersionTag = execThing('git describe --match v* --tags --abbrev=0') String lastVersionTag = execThing('git describe --match v[0-9]* --tags --abbrev=0')
String gitLogResult = execThing("git log $lastVersionTag..HEAD --oneline") String gitLogResult = execThing("git log $lastVersionTag..HEAD --oneline")
String commitsSinceLastTag = gitLogResult == '' ? "0" : gitLogResult.split('\n').size() String commitsSinceLastTag = gitLogResult == '' ? "0" : gitLogResult.split('\n').size()
// the commit we are building from // the commit we are building from
String currentHash = execThing('git log -1 --format=%h')
// beta string, if this is a beta // beta string, if this is a beta
String lastTagName = execThing('git describe --tags --abbrev=0') String lastTagName = execThing('git describe --tags --abbrev=0')
String lastTagHash = execThing("git log -1 --format=%h $lastTagName") String lastTagHash = execThing("git log -1 --format=%h $lastTagName")
String betaString = lastTagHash == currentHash && lastTagName.contains("beta") ? '-beta' : '' String betaString = lastTagHash == getCurrentGitHash() && lastTagName.contains("-beta") ? '-beta' : ''
return "$versionTagsCount.$commitsSinceLastTag$betaString ($currentHash)" return "$versionTagsCount.$commitsSinceLastTag$betaString"
} }
def getDebugVersion = { ->
return "git-${getCurrentGitHash()} (debug)"
}
def getReleaseVersion = { ->
return "${getVersionName()} (${getCurrentGitHash()})"
}
android { android {
compileSdkVersion 30 compileSdkVersion 30
buildToolsVersion "32.0.0" buildToolsVersion "32.0.0"
@ -93,8 +104,8 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 19 minSdkVersion 19
targetSdk 30 targetSdk 30
versionCode computeVersionCode() versionCode getVersionCode()
versionName computeVersionName() versionName getVersionName()
} }
// http://stackoverflow.com/a/19130098 // http://stackoverflow.com/a/19130098
@ -107,11 +118,16 @@ android {
// } // }
// } // }
// //
// buildTypes { buildTypes {
// release { debug { data ->
data.buildConfigField 'String', 'VERSION_FULL', "\"${getDebugVersion()}\""
}
release { data ->
data.buildConfigField 'String', 'VERSION_FULL', "\"${getReleaseVersion()}\""
// signingConfig android.signingConfigs.release // signingConfig android.signingConfigs.release
// } }
// } }
} }
task validateDictionaries { task validateDictionaries {

2
src/io/github/sspanak/tt9/preferences/PreferencesFragment.java
View file

@ -102,7 +102,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
private void createAboutSection() { private void createAboutSection() {
Preference vi = findPreference("version_info"); Preference vi = findPreference("version_info");
if (vi != null) { if (vi != null) {
vi.setSummary(BuildConfig.VERSION_NAME); vi.setSummary(BuildConfig.VERSION_FULL);
} }
} }
} }