Skip to content

Commit

Permalink
Added jakewharton.sdkmanager.
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielemariotti committed Apr 6, 2014
1 parent 3ea0573 commit b85274e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 28 deletions.
24 changes: 0 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ branches:

jdk: oraclejdk7

env:
global:
- ANDROID_SDK_VERSION="r22.6.2"

notifications:
email: false
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:0.9.+'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.9.+'
}
}

Expand Down
2 changes: 1 addition & 1 deletion demo/extras/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

apply plugin: 'android-sdk-manager'
apply plugin: 'android'

repositories {
Expand Down
2 changes: 1 addition & 1 deletion demo/stock/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

apply plugin: 'android-sdk-manager'
apply plugin: 'android'

repositories {
Expand Down
2 changes: 1 addition & 1 deletion library-extra/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

apply plugin: 'android-sdk-manager'
apply plugin: 'android-library'

repositories {
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

apply plugin: 'android-sdk-manager'
apply plugin: 'android-library'

repositories {
Expand Down

0 comments on commit b85274e

Please sign in to comment.