forked from upstream-mirrors/OpenTracks
Reproducible build: for naming the APK use the actual versionCode.
Fixes #2252.
This commit is contained in:
+5
-5
@@ -21,7 +21,7 @@ def getVersionName = { ->
|
|||||||
return 'git describe --tags'.execute().text.trim()
|
return 'git describe --tags'.execute().text.trim()
|
||||||
}
|
}
|
||||||
|
|
||||||
def getVersionCode = { ->
|
def getVersionCodeNightly = { ->
|
||||||
return Integer.valueOf('git rev-list HEAD --count'.execute().text.trim())
|
return Integer.valueOf('git rev-list HEAD --count'.execute().text.trim())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,12 +108,12 @@ android {
|
|||||||
dimension 'version'
|
dimension 'version'
|
||||||
applicationId 'de.dennisguse.opentracks.nightly'
|
applicationId 'de.dennisguse.opentracks.nightly'
|
||||||
resValue 'string', 'applicationId', 'de.dennisguse.opentracks.nightly'
|
resValue 'string', 'applicationId', 'de.dennisguse.opentracks.nightly'
|
||||||
signingConfig = signingConfigs.nightly
|
|
||||||
|
|
||||||
versionCode getVersionCode()
|
versionCode getVersionCodeNightly()
|
||||||
versionName getVersionName()
|
versionName getVersionName()
|
||||||
base.archivesName = "de.dennisguse.opentracks.nightly_${getVersionCode()}"
|
base.archivesName = "de.dennisguse.opentracks.nightly_${getVersionCodeNightly()}"
|
||||||
|
|
||||||
|
signingConfig = signingConfigs.nightly
|
||||||
}
|
}
|
||||||
irreproducible {
|
irreproducible {
|
||||||
// Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
|
// Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
|
||||||
@@ -130,7 +130,7 @@ android {
|
|||||||
applicationId 'de.dennisguse.opentracks.playstore'
|
applicationId 'de.dennisguse.opentracks.playstore'
|
||||||
resValue 'string', 'applicationId', 'de.dennisguse.opentracks.playstore'
|
resValue 'string', 'applicationId', 'de.dennisguse.opentracks.playstore'
|
||||||
|
|
||||||
base.archivesName = "de.dennisguse.opentracks.playstore_${getVersionName()}_${getVersionCode()}"
|
base.archivesName = "de.dennisguse.opentracks.playstore_${getVersionName()}_${android.defaultConfig.versionCode}"
|
||||||
|
|
||||||
signingConfig = signingConfigs.release
|
signingConfig = signingConfigs.release
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user