Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d95b0ce authored by David A. Velasco's avatar David A. Velasco
Browse files

Merge pull request #117 from owncloud/Studio2Update 

Support Android Studio 2.0 (build tools 23.0.3 + gradle 2.10 + gradle plugin 2.0)
parents f53ebc09 037b1baa

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ android: 
  components:

  - platform-tools

  - tools

  - build-tools-23.0.2

  - build-tools-23.0.3

  - android-23

  - sys-img-armeabi-v7a-android-23

branches:

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -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'

    }

}
@@ -19,7 +19,7 @@ dependencies { 


android {

    compileSdkVersion 23

    buildToolsVersion "23.0.2"

    buildToolsVersion "23.0.3"



    sourceSets {

        main {

gradle/wrapper/gradle-wrapper.jar

+3.65 KiB (52.4 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Mon Jan 19 11:03:11 CET 2015

#Mon Dec 28 10:00:20 PST 2015

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

sample_client/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ dependencies { 


android {

    compileSdkVersion 23

    buildToolsVersion "23.0.2"

    buildToolsVersion "23.0.3"



    sourceSets {

        main {