@@ -22,9 +22,8 @@ def getVersionCode() {
2222 return major + commitCount
2323}
2424
25- def getGitHash = { ->
26- def process = " git rev-parse HEAD" . execute()
27- process. in . text. trim()
25+ static def getGitHash () {
26+ return " git rev-parse --short HEAD" . execute(). text. trim()
2827}
2928
3029android {
@@ -86,6 +85,7 @@ android {
8685 }
8786 def keyStoreFile = getString(' storeFile' , ' STORE_FILE' , ' Store file' )?. with(rootProject. &file)
8887 def gitCode = getVersionCode()
88+ def gitHash = getGitHash()
8989
9090 signingConfigs {
9191 hyperceiler {
@@ -106,7 +106,7 @@ android {
106106 shrinkResources true
107107 proguardFiles getDefaultProguardFile(' proguard-android-optimize.txt' ), ' proguard-rules.pro' , ' proguard-log.pro'
108108 versionNameSuffix " _" + DateTimeFormatter . ofPattern(" yyyyMMdd" ). format(LocalDateTime . now()) + " _r" + gitCode
109- buildConfigField " String" , " GIT_HASH" , " \" ${ getGitHash() } \" "
109+ buildConfigField " String" , " GIT_HASH" , " \" ${ gitHash } \" "
110110 if (keyStoreFile != null ) {
111111 signingConfig signingConfigs. hyperceiler
112112 }
@@ -116,7 +116,7 @@ android {
116116 shrinkResources true
117117 proguardFiles getDefaultProguardFile(' proguard-android-optimize.txt' ), ' proguard-rules.pro'
118118 versionNameSuffix " _" + DateTimeFormatter . ofPattern(" yyyyMMdd" ). format(LocalDateTime . now()) + " _b" + gitCode
119- buildConfigField " String" , " GIT_HASH" , " \" ${ getGitHash() } \" "
119+ buildConfigField " String" , " GIT_HASH" , " \" ${ gitHash } \" "
120120 if (keyStoreFile != null ) {
121121 signingConfig signingConfigs. hyperceiler
122122 }
@@ -126,14 +126,14 @@ android {
126126 shrinkResources true
127127 proguardFiles getDefaultProguardFile(' proguard-android-optimize.txt' ), ' proguard-rules.pro'
128128 versionNameSuffix " _" + DateTimeFormatter . ofPattern(" yyyyMMdd" ). format(LocalDateTime . now()) + " _c" + gitCode
129- buildConfigField " String" , " GIT_HASH" , " \" ${ getGitHash() } \" "
129+ buildConfigField " String" , " GIT_HASH" , " \" ${ gitHash } \" "
130130 if (keyStoreFile != null ) {
131131 signingConfig signingConfigs. hyperceiler
132132 }
133133 }
134134 debug {
135135 versionNameSuffix " _" + DateTimeFormatter . ofPattern(" yyyyMMdd" ). format(LocalDateTime . now()) + " _d" + gitCode
136- buildConfigField " String" , " GIT_HASH" , " \" ${ getGitHash() } \" "
136+ buildConfigField " String" , " GIT_HASH" , " \" ${ gitHash } \" "
137137 if (keyStoreFile != null ) {
138138 signingConfig signingConfigs. hyperceiler
139139 }
0 commit comments