From f3a778db5cedfec6d495aca53c54e6ef0c778d63 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 00:40:08 +0900 Subject: [PATCH] Update github pre-release versionName --- app/build.gradle | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 92252e00..9960a1c7 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,15 @@ apply plugin: 'com.android.application' apply plugin: "androidx.navigation.safeargs" apply from: 'sentry.gradle' +def getGitHash = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'rev-parse', '--short', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() +} + android { compileSdkVersion 29 @@ -55,7 +64,7 @@ android { productFlavors { github { dimension "repo" - versionNameSuffix "-github" + // versionNameSuffix "-github" // appended in assemble task buildConfigField("String", "dsn", SENTRY_DSN) } @@ -71,9 +80,16 @@ android { def builtType = variant.buildType.name def versionName = variant.versionName // def versionCode = variant.versionCode - // def flavor = variant.flavorName - // flavor is already appended to versionName due to versionNameSuffix - outputFileName = "barinsta_${versionName}_${builtType}.apk" + def flavor = variant.flavorName + + def suffix = "${versionName}-${flavor}_${builtType}" // eg. 19.1.0-github_debug or release + if (builtType.toString() == 'release' && project.hasProperty("pre")) { + // append latest commit short hash for pre-release + suffix = "${versionName}.${getGitHash()}-${flavor}" // eg. 19.1.0.b123456-github + } + + output.versionNameOverride = suffix + outputFileName = "barinsta_${suffix}.apk" } } } @@ -144,6 +160,6 @@ dependencies { debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' githubImplementation 'io.sentry:sentry-android:4.3.0' - + testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1' }