Merge pull request #3225 from mauriciocolli/improve-build-branch

Change share title to differentiate multiple builds
This commit is contained in:
Tobias Groza 2020-03-14 10:18:36 +01:00 committed by GitHub
commit a4babc10c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 19 deletions

View File

@ -3,24 +3,6 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt' 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 { android {
compileSdkVersion 28 compileSdkVersion 28
buildToolsVersion '28.0.3' buildToolsVersion '28.0.3'
@ -143,3 +125,19 @@ dependencies {
implementation "io.noties.markwon:core:${markwonVersion}" implementation "io.noties.markwon:core:${markwonVersion}"
implementation "io.noties.markwon:linkify:${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 ""
}
}

View File

@ -432,7 +432,7 @@
<string name="soundcloud" translatable="false">SoundCloud</string> <string name="soundcloud" translatable="false">SoundCloud</string>
<string name="drawer_header_action_paceholder_text">Something will appear here soon ;D</string> <string name="drawer_header_action_paceholder_text">Something will appear here soon ;D</string>
<!-- Preferred player --> <!-- Preferred player -->
<string name="preferred_open_action_share_menu_title" translatable="false">NewPipe</string> <string name="preferred_open_action_share_menu_title" translatable="false">@string/app_name</string>
<string name="preferred_open_action_settings_title">Preferred \'open\' action</string> <string name="preferred_open_action_settings_title">Preferred \'open\' action</string>
<string name="preferred_open_action_settings_summary">Default action when opening content — %s</string> <string name="preferred_open_action_settings_summary">Default action when opening content — %s</string>
<string name="video_player">Video player</string> <string name="video_player">Video player</string>