aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/build.gradle')
-rw-r--r--OpenKeychain/build.gradle5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle
index 2ca1d752a..7c68ae062 100644
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -46,7 +46,8 @@ dependencies {
compile 'com.jpardogo.materialtabstrip:library:1.0.9'
compile 'com.getbase:floatingactionbutton:1.9.0'
compile 'org.commonjava.googlecode.markdown4j:markdown4j:2.2-cj-1.0'
- compile 'com.splitwise:tokenautocomplete:1.3.3@aar'
+ compile 'org.ocpsoft.prettytime:prettytime:3.2.7.Final'
+ compile "com.splitwise:tokenautocomplete:1.3.3@aar"
compile 'se.emilsjolander:stickylistheaders:2.6.0'
compile 'org.sufficientlysecure:html-textview:1.2'
compile 'com.mikepenz:materialdrawer:3.0.9@aar'
@@ -56,6 +57,7 @@ dependencies {
compile 'com.mikepenz.iconics:community-material-typeface:1.0.0@aar'
compile 'com.nispok:snackbar:2.11.0'
compile 'com.squareup.okhttp:okhttp:2.4.0'
+ compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
// libs as submodules
compile project(':extern:openpgp-api-lib:openpgp-api')
@@ -206,6 +208,7 @@ android {
// Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems
dexOptions {
preDexLibraries = false
+ javaMaxHeapSize "2g"
}
packagingOptions {