Skip to content

Commit

Permalink
Updated build on both Gradle and Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
smarek committed Mar 25, 2014
1 parent 004e256 commit 5a283e0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ before_install:
# for gradle output style
- export TERM=dumb
# newer version of gradle
- wget http://services.gradle.org/distributions/gradle-1.9-bin.zip
- unzip -qq gradle-1.9-bin.zip
- export GRADLE_HOME=$PWD/gradle-1.9
- wget http://services.gradle.org/distributions/gradle-1.10-bin.zip
- unzip -qq gradle-1.10-bin.zip
- export GRADLE_HOME=$PWD/gradle-1.10
- export PATH=$GRADLE_HOME/bin:$PATH
# just to test gradle version, against our provided one
- gradle -v
# newest android SDK 22.3
- wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
- tar -zxf android-sdk_r22.3-linux.tgz
# newest android SDK 22.6.1
- wget http://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
- tar -zxf android-sdk_r22.6.1-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
- echo yes | android update sdk -a -t tools,platform-tools,build-tools-19.0.0,extra-android-m2repository,android-19 --force --no-ui
- echo yes | android update sdk -a -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-19,build-tools-19.0.3 --force --no-ui
# Compatibility for release cycle
- mvn clean test install
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:0.7.+'
classpath 'com.android.tools.build:gradle:+'
}
}

Expand All @@ -18,6 +18,7 @@ allprojects {

tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.compilerArgs << "-Xlint:unchecked"
}
}

2 changes: 1 addition & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'android-library'

android {
compileSdkVersion 19
buildToolsVersion '19.0.0'
buildToolsVersion '19.0.3'

defaultConfig {
minSdkVersion 4
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {

android {
compileSdkVersion 19
buildToolsVersion '19.0.0'
buildToolsVersion '19.0.3'

defaultConfig {
minSdkVersion 8
Expand Down

0 comments on commit 5a283e0

Please sign in to comment.