From 89e3292ced79c04fa75cea7e20c9a26731d2f3aa Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Fri, 13 Mar 2020 20:10:37 -0300 Subject: [PATCH 1/2] Move code with lower priority to the bottom of the file --- app/build.gradle | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b4df55d4e..c76553165 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,24 +3,6 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' - -static String getGitWorkingBranch() { - try { - def gitProcess = "git rev-parse --abbrev-ref HEAD".execute() - gitProcess.waitFor() - if (gitProcess.exitValue() == 0) { - return gitProcess.text.trim() - } else { - // not a git repository - return "" - } - } catch (IOException ignored) { - // git was not found - return "" - } -} - - android { compileSdkVersion 28 buildToolsVersion '28.0.3' @@ -143,3 +125,19 @@ dependencies { implementation "io.noties.markwon:core:${markwonVersion}" implementation "io.noties.markwon:linkify:${markwonVersion}" } + +static String getGitWorkingBranch() { + try { + def gitProcess = "git rev-parse --abbrev-ref HEAD".execute() + gitProcess.waitFor() + if (gitProcess.exitValue() == 0) { + return gitProcess.text.trim() + } else { + // not a git repository + return "" + } + } catch (IOException ignored) { + // git was not found + return "" + } +} \ No newline at end of file From d247d322216b756429a550d9a205a585022c9288 Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Fri, 13 Mar 2020 20:11:24 -0300 Subject: [PATCH 2/2] Change share title as well to differentiate multiple builds --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2934769d0..48e8a4854 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -432,7 +432,7 @@ SoundCloud Something will appear here soon ;D - NewPipe + @string/app_name Preferred \'open\' action Default action when opening content — %s Video player