Revert "target_marshmallow branch push"

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

diff --git a/build.gradle b/build.gradle
index 5302996..817b528 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 
@@ -20,18 +20,16 @@ repositories {
 
 dependencies {
     compile name: 'touch-image-view'
+    compile 'com.android.support:support-v4:22.2.1'
     compile project(':owncloud-android-library')
     compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:appcompat-v7:22.2.1'
     compile 'com.getbase:floatingactionbutton:1.10.1'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
-    // as long as ownCloud uses Apache HTTP
-    // http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
-    useLibrary 'org.apache.http.legacy'
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'