diff --git a/build.gradle b/build.gradle index 89b4d896e2..5eb6a47b61 100644 --- a/build.gradle +++ b/build.gradle @@ -177,7 +177,7 @@ dependencies { compile name: 'touch-image-view' compile 'com.android.support:multidex:1.0.1' - compile 'com.github.nextcloud:android-library:-SNAPSHOT' + compile 'com.github.nextcloud:android-library:1.0.15' compile "com.android.support:support-v4:${supportLibraryVersion}" compile "com.android.support:design:${supportLibraryVersion}" compile 'com.jakewharton:disklrucache:2.0.2' diff --git a/build.gradle.modified b/build.gradle.modified index d99ebed620..2779b3b377 100644 --- a/build.gradle.modified +++ b/build.gradle.modified @@ -33,7 +33,7 @@ ext { travisBuild = System.getenv("TRAVIS") == "true" - // allows for -Dpre-dex=false to be set :) + // allows for -Dpre-dex=false to be set preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) } @@ -101,7 +101,7 @@ android { // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure dexOptions { - // Skip pre-dexing whe`n running on Travis CI or when disabled via -Dpre-dex=false. + // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false. preDexLibraries = preDexEnabled && !travisBuild } @@ -116,6 +116,7 @@ android { packagingOptions { exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/LICENSE' } task checkstyle(type: Checkstyle) { @@ -176,7 +177,7 @@ dependencies { compile name: 'touch-image-view' compile 'com.android.support:multidex:1.0.1' - compile 'com.github.nextcloud:android-library:notifications-push-SNAPSHOT' + compile 'com.github.nextcloud:android-library:1.0.15' compile "com.android.support:support-v4:${supportLibraryVersion}" compile "com.android.support:design:${supportLibraryVersion}" compile 'com.jakewharton:disklrucache:2.0.2' @@ -189,7 +190,7 @@ dependencies { compile 'com.jakewharton:butterknife:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' compile 'org.greenrobot:eventbus:3.0.0' - + compile 'com.googlecode.ez-vcard:ez-vcard:0.10.2' compile 'com.google.android.gms:play-services:10.2.1' compile 'org.parceler:parceler-api:1.1.6' @@ -218,6 +219,7 @@ dependencies { //androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2' // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details //androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}" + } configurations.all {