Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab

[pub/Android/ownCloud.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 817b528..1ef8f61 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ repositories {
 
 dependencies {
     compile name: 'touch-image-view'
 
 dependencies {
     compile name: 'touch-image-view'

-    compile 'com.android.support:support-v4:22.2.1'

     compile project(':owncloud-android-library')
     compile project(':owncloud-android-library')

+    compile 'com.android.support:support-v4:22.2.1'

     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.android.support:appcompat-v7:22.2.1'
     compile 'com.getbase:floatingactionbutton:1.10.1'
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.android.support:appcompat-v7:22.2.1'
     compile 'com.getbase:floatingactionbutton:1.10.1'


@@ -59,7 +59,7 @@ android {
             abortOnError false
         }
     }
             abortOnError false
         }
     }

-    
+

     productFlavors {
     }
 
     productFlavors {
     }
 


@@ -69,3 +69,7 @@ android {
 }
 
 
 }
 
 

+
+
+
+