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

Commit 0a941691 authored by Andy Scherzinger's avatar Andy Scherzinger
Browse files

Android Studio 2.0 Update, gradle 2.10 update, build tools 23.0.3 and support lib update in travis

parent f53ebc09

.travis.yml

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

  components:

  - platform-tools

  - platform-tools

  - tools

  - tools

  - build-tools-23.0.2

  - build-tools-23.0.3

  - android-23

  - android-23

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

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

branches:

branches:
@@ -13,6 +13,8 @@ branches: 
before_install:

before_install:

- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI

- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI

  -c 20M

  -c 20M

- echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null

- echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null

- emulator -avd test -no-skin -no-audio -no-window &

- emulator -avd test -no-skin -no-audio -no-window &

- rm pom.xml

- rm pom.xml

- android update project -p .

- android update project -p .

build.gradle

+2 −2
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ buildscript { 
        mavenCentral()

        mavenCentral()

    }

    }

    dependencies {

    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 {

android {

    compileSdkVersion 23

    compileSdkVersion 23

    buildToolsVersion "23.0.2"

    buildToolsVersion "23.0.3"





    sourceSets {

    sourceSets {

        main {

        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 Original line 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

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

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 Original line Diff line number Diff line
@@ -10,7 +10,7 @@ dependencies { 




android {

android {

    compileSdkVersion 23

    compileSdkVersion 23

    buildToolsVersion "23.0.2"

    buildToolsVersion "23.0.3"





    sourceSets {

    sourceSets {

        main {

        main {