浏览代码

Merge pull request #1596 from owncloud/Studio2Update

Support for Android Studio 2.0 (build tools 23.0.3 + gradle 2.10 + gradle plugin 2.0)
David A. Velasco 9 年之前
父节点
当前提交
0f8dd74e18
共有 5 个文件被更改,包括 8 次插入8 次删除
  1. 1 1
      .travis.yml
  2. 2 2
      build.gradle
  3. 2 2
      gradle/wrapper/gradle-wrapper.properties
  4. 2 2
      oc_jb_workaround/build.gradle
  5. 1 1
      owncloud-android-library

+ 1 - 1
.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: android
 android:
   components:
-    - build-tools-23.0.2
+    - build-tools-23.0.3
     - android-23
     - android-22
     - android-19

+ 2 - 2
build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 
@@ -30,7 +30,7 @@ dependencies {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 18 17:01:43 CET 2015
+#Thu Apr 07 22:12:15 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

+ 2 - 2
oc_jb_workaround/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 apply plugin: 'com.android.application'
@@ -14,7 +14,7 @@ dependencies {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     sourceSets {
         main {

+ 1 - 1
owncloud-android-library

@@ -1 +1 @@
-Subproject commit 19e30a6236ca75a6e223ba6b7b0bd901b6615e12
+Subproject commit 0d95b0ce24d3ac1b379dd93ec38b0f9217839822