From 7053f4acb65964a3a3f43993c0c20caa45d3024e Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 28 Nov 2022 18:56:28 +0100
Subject: [PATCH] add custom ID and version name

---
 mastodon/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 2736e9c59..e4d34da02 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -7,7 +7,7 @@ android {
 	def getGitHash = { ->
 		def stdout = new ByteArrayOutputStream()
 		exec {
-			commandLine 'git', 'rev-parse', '--short', 'HEAD'
+			commandLine 'git', 'rev-parse', '--short', 'main'
 			standardOutput = stdout
 		}
 		return stdout.toString().trim()
@@ -16,11 +16,11 @@ android {
 	compileSdk 33
 	defaultConfig {
 		archivesBaseName = "upstream-${getGitHash()}"
-		applicationId "org.joinmastodon.android"
+		applicationId "org.joinmastodon.android.git"
 		minSdk 23
 		targetSdk 33
 		versionCode 43
-		versionName "1.1.4"
+		versionName "1.1.4+${getGitHash()}"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
 				"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",