Merge release branch to master (#1932)

* Bugfix/upload via share (#1920)

* Bug Fix #1878
* Added a java library to fetch the MIME type from input stream
* Fetch MIME type using this and use the contribution tag only when this fails:

* formatting changes, removed unused commented out line

* Versioning and changelog for v2.8.5 (#1923)

* Versioning for v2.8.5

* Update changelog.md
This commit is contained in:
Vivek Maskara 2018-10-13 14:15:00 +05:30 committed by Josephine Lim
parent e36a71a584
commit 02fe0044a6
5 changed files with 40 additions and 10 deletions

View file

@ -64,7 +64,6 @@ dependencies {
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
debugImplementation "com.squareup.leakcanary:leakcanary-android:$LEAK_CANARY"
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$LEAK_CANARY"
@ -72,6 +71,7 @@ dependencies {
//For handling runtime permissions
implementation 'com.karumi:dexter:5.0.0'
implementation files('libs/simplemagic-1.9.jar')
}
android {
@ -80,8 +80,8 @@ android {
defaultConfig {
applicationId 'fr.free.nrw.commons'
versionCode 90
versionName '2.8.3'
versionCode 92
versionName '2.8.5'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion 15