From 6fabadd6c57afcf9dae62b307285e6369cf2bb27 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Tue, 15 May 2018 15:35:30 +0200 Subject: [PATCH] Fixes #81 --- app/build.gradle.kts | 1 + .../de/kuschku/quasseldroid/service/QuasselService.kt | 2 +- buildSrc/src/main/kotlin/FancyVersionName.kt | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 buildSrc/src/main/kotlin/FancyVersionName.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f304e41bc..41b469fd6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -58,6 +58,7 @@ android { versionName = cmd("git", "describe", "--always", "--tags", "HEAD") ?: "1.0.0" buildConfigField("String", "GIT_HEAD", "\"${cmd("git", "rev-parse", "HEAD") ?: ""}\"") + buildConfigField("String", "FANCY_VERSION_NAME", "\"${fancyVersionName() ?: ""}\"") buildConfigField("long", "GIT_COMMIT_DATE", "${cmd("git", "show", "-s", "--format=%ct") ?: 0}L") signingConfig = signingConfigs.findByName("default") diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt index a75cd9b4b..2223998f1 100644 --- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt +++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt @@ -340,7 +340,7 @@ class QuasselService : DaggerLifecycleService(), ) clientData = ClientData( - identifier = "${resources.getString(R.string.app_name)} ${BuildConfig.VERSION_NAME}", + identifier = "${resources.getString(R.string.app_name)} ${BuildConfig.FANCY_VERSION_NAME}", buildDate = Instant.ofEpochSecond(BuildConfig.GIT_COMMIT_DATE), clientFeatures = QuasselFeatures.all(), protocolFeatures = Protocol_Features.of( diff --git a/buildSrc/src/main/kotlin/FancyVersionName.kt b/buildSrc/src/main/kotlin/FancyVersionName.kt new file mode 100644 index 000000000..58ac89794 --- /dev/null +++ b/buildSrc/src/main/kotlin/FancyVersionName.kt @@ -0,0 +1,9 @@ +import org.gradle.api.Project + +fun Project.fancyVersionName(): String? { + val commit = cmd("git", "rev-parse", "HEAD") + val name = cmd("git", "describe", "--always", "--tags", "HEAD") + + return if (commit != null && name != null) "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>" + else name +} -- GitLab