Browse Source

Merge pull request #1641 from owncloud/studio21Update

Gradle android plugin v2.1.0, consistent support lib version
David A. Velasco 9 years ago
parent
commit
4dbab1e652
3 changed files with 9 additions and 6 deletions
  1. 7 4
      build.gradle
  2. 1 1
      oc_jb_workaround/build.gradle
  3. 1 1
      owncloud-android-library

+ 7 - 4
build.gradle

@@ -3,12 +3,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 
 apply plugin: 'com.android.application'
 
+ext {
+    supportLibraryVersion = '23.1.1'
+}
 
 repositories {
     mavenCentral()
@@ -21,10 +24,10 @@ repositories {
 dependencies {
     compile name: 'touch-image-view'
     compile project(':owncloud-android-library')
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    compile "com.android.support:support-v4:${supportLibraryVersion}"
+    compile "com.android.support:design:${supportLibraryVersion}"
     compile 'com.jakewharton:disklrucache:2.0.2'
-    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile 'com.getbase:floatingactionbutton:1.10.1'
 }
 

+ 1 - 1
oc_jb_workaround/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
     }
 }
 apply plugin: 'com.android.application'

+ 1 - 1
owncloud-android-library

@@ -1 +1 @@
-Subproject commit 0d95b0ce24d3ac1b379dd93ec38b0f9217839822
+Subproject commit 5e5aac5fe137dcadf6bae4833eba89dabe89ce3d