diff --git a/app/build.gradle b/app/build.gradle index c75afedc..1dd2c524 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,12 +23,12 @@ applicationProperties.load(new FileInputStream(rootProject.file("application.pro def SHA1 = System.getenv("CIRCLE_SHA1") def applicationVersionCode = applicationProperties["versionCode"].toInteger() def applicationVersionName = applicationProperties["versionName"] -def isPerVersion = applicationProperties["isPerVersion"] == "true" +def isPerVersion = applicationProperties["isPerRelease"] == "true" if (SHA1 != null) { - applicationVersionName = applicationVersionName + ".${SHA1.substring(0, 8)}" + applicationVersionName = applicationVersionName + ".${SHA1.substring(0, 7)}" } if (isPerVersion) { - applicationVersionName = applicationVersionName + "-${applicationProperties["perVersion"]}" + applicationVersionName = applicationVersionName + ".${applicationProperties["preReleaseName"]}-${applicationProperties["preReleaseVer"]}" } andResGuard { diff --git a/application.properties b/application.properties index 249f9a7d..3541d848 100644 --- a/application.properties +++ b/application.properties @@ -1,4 +1,5 @@ versionCode=38201 versionName=3.8.3 -isPerVersion=true -perVersion=beta1 \ No newline at end of file +isPerRelease=true +preReleaseName=beta +preReleaseVer=2 \ No newline at end of file