From b85274eb9b66257a3b69291e394b7073f1cc2961 Mon Sep 17 00:00:00 2001 From: gabrielemariotti Date: Sun, 6 Apr 2014 15:43:49 +0200 Subject: [PATCH] Added jakewharton.sdkmanager. --- .travis.yml | 24 ------------------------ build.gradle | 1 + demo/extras/build.gradle | 2 +- demo/stock/build.gradle | 2 +- library-extra/build.gradle | 2 +- library/build.gradle | 2 +- 6 files changed, 5 insertions(+), 28 deletions(-) diff --git a/.travis.yml b/.travis.yml index 642fef18..a49ad67f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,6 @@ branches: jdk: oraclejdk7 -env: - global: - - ANDROID_SDK_VERSION="r22.6.2" notifications: email: false @@ -39,27 +36,6 @@ before_install: # just to test gradle version, against our provided one - gradle -v - # newest android SDK - - wget http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-linux.tgz - - tar -zxf android-sdk_${ANDROID_SDK_VERSION}-linux.tgz - - export ANDROID_HOME=`pwd`/android-sdk-linux - - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools - - # manually set sdk.dir variable, according to local paths - - echo "sdk.dir=$ANDROID_HOME" > local.properties - - # Install required components. - # For a full list, run `android list sdk -a --extended` - - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null - - echo yes | android update sdk --all --filter build-tools-19.0.3 --no-ui --force > /dev/null - - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null - - 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 - - # Otherwise - #- echo yes | android update sdk -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-19 --force --no-ui - - # Let's try to build... install: gradle clean build diff --git a/build.gradle b/build.gradle index c282b085..d66c468f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.9.+' } } diff --git a/demo/extras/build.gradle b/demo/extras/build.gradle index 35603ad5..a373b452 100644 --- a/demo/extras/build.gradle +++ b/demo/extras/build.gradle @@ -1,4 +1,4 @@ - +apply plugin: 'android-sdk-manager' apply plugin: 'android' repositories { diff --git a/demo/stock/build.gradle b/demo/stock/build.gradle index 6fd140ec..2e66205f 100644 --- a/demo/stock/build.gradle +++ b/demo/stock/build.gradle @@ -1,4 +1,4 @@ - +apply plugin: 'android-sdk-manager' apply plugin: 'android' repositories { diff --git a/library-extra/build.gradle b/library-extra/build.gradle index 6da0e61f..bb7b4c4c 100644 --- a/library-extra/build.gradle +++ b/library-extra/build.gradle @@ -1,4 +1,4 @@ - +apply plugin: 'android-sdk-manager' apply plugin: 'android-library' repositories { diff --git a/library/build.gradle b/library/build.gradle index f6f7ef8e..e3b87840 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,4 +1,4 @@ - +apply plugin: 'android-sdk-manager' apply plugin: 'android-library' repositories {