diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
| commit | ba1ef7a38e1d923d1e0e31f0e16528649df41af8 (patch) | |
| tree | b4501c25bb06b084f324f525a6ab2dfe5037aa78 /app/build.gradle | |
| parent | a782c3f83e6f40ad24f6ffbb3fa5b0d5b4f409f5 (diff) | |
| parent | 893e0ce89daaa39f1157298c6a8dd10b7e98eceb (diff) | |
Merge branch 'upstream' into webview
Conflicts:
app/build.gradle
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle index e161e9a9..38455ad3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,13 @@ apply plugin: 'eclipse' android { compileSdkVersion 23 - buildToolsVersion "23.0.2" + buildToolsVersion '23.0.2' defaultConfig { applicationId "com.zeapo.pwdstore" minSdkVersion 15 targetSdkVersion 23 - versionCode 55 - versionName "1.2.0.35" + versionCode 58 + versionName "1.2.0.38" } compileOptions { @@ -25,6 +25,8 @@ android { packagingOptions { exclude '.readme' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE.txt' } // @@ -61,13 +63,13 @@ dependencies { compile 'com.android.support:cardview-v7:23.1.1' compile 'com.android.support:design:23.1.1' compile 'org.sufficientlysecure:openpgp-api:9.0' + compile 'com.nononsenseapps:filepicker:2.4.2' compile ('org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r') { exclude group: 'org.apache.httpcomponents', module: 'httpclient' } compile 'com.jcraft:jsch:0.1.53' compile 'org.apache.commons:commons-io:1.3.2' compile 'com.jayway.android.robotium:robotium-solo:5.3.1' - compile 'net.rdrei.android.dirchooser:library:2.1@aar' compile group: 'com.google.guava', name: 'guava', version: '18.0' } tasks.findAll { // make all tasks whose name starts with 'assemble'... |