Merge remote-tracking branch 'upstream/master' into upstream-release

2023-01-21 02:20:20 +01:00 · 2023-01-17 02:23:25 +01:00 · 2022-12-22 01:32:45 +01:00 · 2022-12-17 21:50:33 +01:00 · 2022-12-09 14:23:40 +01:00 · 2022-12-09 03:16:47 +01:00
1 changed files with 14 additions and 4 deletions
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@ -4,21 +4,31 @@ plugins {
 }

 android {
+	def getGitHash = { ->
+		def stdout = new ByteArrayOutputStream()
+		exec {
+			commandLine 'git', 'rev-parse', '--short', 'upstream/master'
+			standardOutput = stdout
+		}
+		return stdout.toString().trim()
+	}
+
 	compileSdk 33
 	defaultConfig {
-		applicationId "org.joinmastodon.android"
+		archivesBaseName = "upstream-${getGitHash()}"
+		applicationId "org.joinmastodon.android.git"
 		minSdk 23
 		targetSdk 33
 		versionCode 47
-		versionName "1.1.5"
+		versionName "1.1.5+${getGitHash()}"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

 	buildTypes {
 		release {
-			minifyEnabled true
-			shrinkResources true
+//			minifyEnabled true
+//			shrinkResources true
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 		}
 		debug{
Author	SHA1	Message	Date
sk	28f6d00530	Merge remote-tracking branch 'upstream/master' into upstream-release	2023-01-21 02:20:20 +01:00
sk	a3b6decb72	Merge remote-tracking branch 'upstream/master' into upstream-release	2023-01-17 02:23:25 +01:00
sk	aafb08d7b3	Merge remote-tracking branch 'upstream/master' into upstream-release	2022-12-22 01:32:45 +01:00
sk	2433d457b6	Merge remote-tracking branch 'upstream/master' into upstream-release	2022-12-17 21:50:33 +01:00
sk	9ad0bc2454	fix upstream branch	2022-12-09 14:23:40 +01:00
sk	b79c769001	Merge remote-tracking branch 'upstream/master' into upstream-release	2022-12-09 03:16:47 +01:00
sk	b7dd376066	Revert "update changelog" This reverts commit `46081bed3e`.	2022-12-01 16:37:39 +01:00
sk	46081bed3e	update changelog	2022-12-01 16:21:19 +01:00
sk	7053f4acb6	add custom ID and version name	2022-11-28 18:56:28 +01:00
sk	64e85f6992	Merge remote-tracking branch 'upstream/master' into upstream-release	2022-11-28 18:46:43 +01:00
sk	aee27d36d5	remove unused script	2022-11-25 23:30:16 +01:00
sk	165255235b	automatically append git hash to filename	2022-11-25 23:30:00 +01:00
sk	144fdd562f	add script to get latest upstream commit	2022-11-24 20:49:44 +01:00
sk	5d6201d415	Merge remote-tracking branch 'upstream/master' into upstream-release	2022-11-24 20:47:33 +01:00
sk	efe41f407e	Merge remote-tracking branch 'upstream/master' into upstream-release	2022-11-21 23:19:25 +01:00
sk	e5e36f4b10	Disable minification and shrinking resources To allow for easier debugging of issues in my fork, I intend to release an unmodified upstream variant alongside my fork's releases. Disabling minification and shrinking resources so the crash logs make more sense and are easier to debug.	2022-11-21 17:11:48 +01:00