From 42ffc1396ef858a60b5214713d91444ed5726c8a Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 27 Nov 2017 21:26:41 +1000 Subject: [PATCH 1/2] Temp fix for Google Play issue --- app/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 351085671..b353f7cdc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,6 +147,8 @@ android { //FIXME: Temporary fix for https://github.com/commons-app/apps-android-commons/issues/709 configurations.all { resolutionStrategy.force 'com.android.support:support-annotations:25.2.0' + exclude module: 'httpclient' + exclude module: 'commons-logging' } buildToolsVersion buildToolsVersion } From 86b9bddab064060556be50c2114daeef9eec911e Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 27 Nov 2017 21:27:29 +1000 Subject: [PATCH 2/2] Increment version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b353f7cdc..7a9ed6ba7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,8 +78,8 @@ android { defaultConfig { applicationId 'fr.free.nrw.commons' - versionCode 75 - versionName '2.6.0' + versionCode 76 + versionName '2.6.1' setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName()) minSdkVersion project.minSdkVersion