[tx-robot] updated from transifex

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

diff --git a/build.gradle b/build.gradle
index 46308ac..d96997a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
         mavenCentral()
     }
     dependencies {

-        classpath 'com.android.tools.build:gradle:0.14.0'
+        classpath 'com.android.tools.build:gradle:1.2.3'

     }
 }
 
     }
 }
 


@@ -18,19 +18,17 @@ repositories {
     }
 }
 
     }
 }
 

-artifacts.add("default", file('libs/actionbarsherlock.aar'))
-

 dependencies {
     compile name: 'touch-image-view'
 dependencies {
     compile name: 'touch-image-view'

-    compile 'com.android.support:support-v4:19.1.0'
-    compile project('libs/actionbarsherlock_lib')

     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.jakewharton:disklrucache:2.0.2'

+    compile 'com.android.support:appcompat-v7:22.2.1'

 }
 
 android {
 }
 
 android {

-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"

     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'


@@ -61,12 +59,6 @@ android {
         }
     }
 
         }
     }
 

-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-    

     productFlavors {
     }
 
     productFlavors {
     }
 


@@ -76,3 +68,7 @@ android {
 }
 
 
 }
 
 

+
+
+
+