From aa959f44579fcc1be88dd28dfd1b39829be7d987 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sat, 11 Oct 2014 18:03:57 +0200 Subject: [PATCH 1/3] Get more dependencies from jCenter --- build.gradle | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e1fede4d..5945c5b5b 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,15 @@ dependencies { compile project(':plugins:HoloColorPicker') compile project(':plugins:openpgp-api-library') compile 'com.android.support:support-v13:19.1.0' - compile fileTree(dir: 'libs', include: '*.jar') + compile fileTree(dir: 'libs', include: 'jutf*.jar') + + // compile 'com.beetstra.jutf7:jutf7:1.0.1-SNAPSHOT' + + compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' + compile 'org.apache.james:apache-mime4j-core:0.7.2' + compile 'org.apache.james:apache-mime4j-dom:0.7.2' + compile 'com.jcraft:jzlib:1.0.7' + compile 'commons-io:commons-io:2.0.1' } project.ext.preDexLibs = !project.hasProperty('disablePreDex') @@ -83,7 +91,9 @@ android { packagingOptions { exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE' + exclude 'META-INF/NOTICE.txt' } } From c252335d2eb50630672bbb741d7b17a60074dd51 Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 12 Nov 2014 19:49:19 +0100 Subject: [PATCH 2/3] Use jutf7 1.0.0 since 1.0.1-SNAPSHOT doesn't include any relevant improvements --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 5945c5b5b..5659e3c79 100644 --- a/build.gradle +++ b/build.gradle @@ -23,9 +23,8 @@ dependencies { compile project(':plugins:HoloColorPicker') compile project(':plugins:openpgp-api-library') compile 'com.android.support:support-v13:19.1.0' - compile fileTree(dir: 'libs', include: 'jutf*.jar') - // compile 'com.beetstra.jutf7:jutf7:1.0.1-SNAPSHOT' + compile 'com.beetstra.jutf7:jutf7:1.0.0' compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' compile 'org.apache.james:apache-mime4j-core:0.7.2' From 6542ba3a72c904989a5d6185a5c7a17ff58d159b Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 12 Nov 2014 19:53:05 +0100 Subject: [PATCH 3/3] Reorder dependencies --- build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 5659e3c79..1aeda0139 100644 --- a/build.gradle +++ b/build.gradle @@ -22,15 +22,13 @@ dependencies { compile project(':plugins:ckChangeLog:library') compile project(':plugins:HoloColorPicker') compile project(':plugins:openpgp-api-library') - compile 'com.android.support:support-v13:19.1.0' - - compile 'com.beetstra.jutf7:jutf7:1.0.0' - - compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' compile 'org.apache.james:apache-mime4j-core:0.7.2' compile 'org.apache.james:apache-mime4j-dom:0.7.2' - compile 'com.jcraft:jzlib:1.0.7' compile 'commons-io:commons-io:2.0.1' + compile 'com.jcraft:jzlib:1.0.7' + compile 'com.beetstra.jutf7:jutf7:1.0.0' + compile 'com.android.support:support-v13:19.1.0' + compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' } project.ext.preDexLibs = !project.hasProperty('disablePreDex')