Skip to content

Commit e7fef2e

Browse files
committed
adds version to artifact filename
1 parent a61978b commit e7fef2e

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ deploy:
3636
- provider: releases
3737
api_key:
3838
secure: "uAYry0oy46Tye7xoS6dvlCX8EoI/i7o3vKYAV5XvFlqSN6JUH6aryXVEs9+rQeEMMchyDyNyIG2LbVocVHpt3y2eqElCNToVj6zx/MuG9IbElhfjroVOSc703iFfE3zbSYrVM9whncBwSF18e1aZdAmNDouAYNaUXf5h6uU9KB7aZwIOIgxxha3NK9/vXKjweYFAfUaQajrKsQq9HvZXPGCWpkPsiNaD90BH2IjKd7NTwzXBFnU/6g7zM4UDyUaFb2+l7+rFFOVo4jsxYDeAVc2bfQudKQCszFO0/wucX7Mi2dTXtEMNAAWaqLXzhvnFIY98xdeNSknamv8fioZ9xA38ANWPv26XN2ijUBrbjo69MZZ3uDL77piUjgqINI3haS7UEXkBtm3p2qS2PCbT20Py6F5J5psLK6cmiEdVitvAFPoWF5IHHNw0BuhPuZZN/23LzDr2N86rxH5qObfix0+6K50MU8AokX0Z0EI5us65l4F1Q0U+xtsjl6h0ZUx7qs//tosyXUReHMYHwuMb79RJ9aetj2gBJLorFiYN9Sp+H4HNzTyQxiTiwyALkQBf8fimK4Eywb78OxU2wxZetVMkv2I/G2Wg+aErU74peMTnj0ZYcnZglGmmo1V/wBO3n+LPH28NAuzlGAQjHz/S5uyvgjxk6O3DFfHmYW91Eu4="
39+
file_glob: true
3940
file:
40-
- 'BlurBenchmark/build/outputs/apk/BlurBenchmark-release.apk'
41+
- 'BlurBenchmark/build/outputs/apk/BlurBenchmark-release*.apk'
4142
skip_cleanup: true
4243
on:
4344
branch: master

BlurBenchmark/build.gradle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ android {
2727
buildConfigField "String", "GIT_BRANCH", "\"" + getGitBranch() + "\""
2828
buildConfigField "String", "GIT_DATE", "\"" + getGitCommitDate() + "\""
2929
buildConfigField "String", "BUILD_NUMBER", "\"" + getCiBuildNumber() + "\""
30+
buildConfigField "String", "BUILD_DATE", "\"" + getBuildTime() + "\""
3031
buildConfigField "boolean", "IS_CI_BUILD", "${isCiBuild()}"
3132
// ndk {
3233
// moduleName "libblur"
@@ -59,6 +60,14 @@ android {
5960
lintOptions {
6061
abortOnError false
6162
}
63+
64+
applicationVariants.all { variant ->
65+
variant.outputs.each { output ->
66+
output.outputFile = new File(
67+
output.outputFile.parent,
68+
output.outputFile.name.replace(".apk", "-${variant.versionName}.apk"))
69+
}
70+
}
6271
}
6372

6473
dependencies {

BlurBenchmark/src/main/java/at/favre/app/blurbenchmark/activities/DebugActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class DebugActivity extends PopHoodActivity {
1515
@Override
1616
public Pages getPageData(@NonNull Pages pages) {
1717
Page page = pages.addNewPage();
18-
page.add(DefaultProperties.createSectionSourceControlAndCI(BuildConfig.GIT_REV, BuildConfig.GIT_BRANCH, BuildConfig.GIT_DATE, BuildConfig.BUILD_NUMBER, null, null));
18+
page.add(DefaultProperties.createSectionSourceControlAndCI(BuildConfig.GIT_REV, BuildConfig.GIT_BRANCH, BuildConfig.GIT_DATE, BuildConfig.BUILD_NUMBER, null, BuildConfig.BUILD_DATE));
1919
page.add(DefaultProperties.createSectionBasicDeviceInfo());
2020
page.add(DefaultProperties.createDetailedDeviceInfo(this));
2121
page.add(DefaultProperties.createSectionAppVersionInfoFromBuildConfig(BuildConfig.class));

gradle/common-build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ ext {
55
getSigningProperties = this.&getSigningProperties
66
isCiBuild = this.&isCiBuild
77
getCiBuildNumber = this.&getCiBuildNumber
8+
getBuildTime = this.&getBuildTime
89
}
910

1011
def String getGitRev() {
@@ -47,6 +48,11 @@ def getSigningProperties() {
4748
return props
4849
}
4950

51+
def String getBuildTime() {
52+
return new Date().toString();
53+
}
54+
55+
5056
static def boolean isCiBuild() {
5157
def ciBuild = false;
5258
if (System.getenv().CI != null) {

0 commit comments

Comments
 (0)