From 557d2842d5c671bfd963cd0c3af547d36c307de2 Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Wed, 20 Sep 2017 20:39:11 +0800
Subject: [PATCH] updated build config

---
 build.gradle                                  |  4 ++--
 twidere/build.gradle                          | 11 ++++++++---
 .../org.mariotaku.twidere.util.Analyzer       | 19 -------------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/build.gradle b/build.gradle
index 619e86cf8..4827d4610 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ subprojects {
                     SupportTest          : '1.0.0',
                     MariotakuCommons     : '0.9.20',
                     RestFu               : '0.9.60',
-                    ObjectCursor         : '0.9.20',
+                    ObjectCursor         : '0.9.21',
                     PlayServices         : '11.2.2',
                     MapsUtils            : '0.5',
                     DropboxCoreSdk       : '3.0.3',
@@ -75,7 +75,7 @@ subprojects {
                     GlideOkHttp3         : '1.4.0',
                     GlideTransformations : '2.0.2',
                     AndroidImageCropper  : '2.4.6',
-                    ExportablePreferences: '0.9.6',
+                    ExportablePreferences: '0.9.7',
                     ACRA                 : '4.9.2',
                     AbstractTask         : '0.9.5',
                     Dagger               : '2.11',
diff --git a/twidere/build.gradle b/twidere/build.gradle
index 6bee09ead..f244fbe5e 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -120,13 +120,18 @@ android {
     }
 
     packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
         exclude 'META-INF/DEPENDENCIES'
         exclude 'META-INF/README'
         exclude 'META-INF/INDEX.LIST'
-        exclude 'META-INF/maven'
-        exclude 'generated-sources/'
-        exclude 'LICENSE​-​junit​.​txt'
+        exclude 'META-INF/maven/**'
+        exclude 'META-INF/*.kotlin_module'
+        exclude 'kotlin/*.kotlin_builtins'
+        exclude 'org/osmdroid/**.png'
+        exclude 'generated-sources/**'
         exclude 'sdk-version.​txt'
+        exclude 'build-data.properties'
     }
 
 }
diff --git a/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.Analyzer b/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.Analyzer
index ffbcea15b..7745686bf 100644
--- a/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.Analyzer
+++ b/twidere/src/fdroid/resources/META-INF/services/org.mariotaku.twidere.util.Analyzer
@@ -1,20 +1 @@
-#
-#             Twidere - Twitter client for Android
-#
-#  Copyright (C) 2012-2017 Mariotaku Lee <mariotaku.lee@gmail.com>
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
 org.mariotaku.twidere.util.ACRAAnalyzer
\ No newline at end of file