Skip to content

Commit 0dddce4

Browse files
committed
Merge pull request #55 from coffeesherk/master
update build tools version & fix travis error
2 parents f108949 + a2c19c6 commit 0dddce4

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.travis.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ android:
33
components:
44
# Uncomment the lines below if you want to
55
# use the latest revision of Android SDK Tools
6-
- platform-tools
7-
- tools
6+
- platform-tools
7+
- tools
88

99
# The BuildTools version used by your project
10-
- build-tools-20
10+
- build-tools-22.0.1
1111

1212
# The SDK version used to compile your project
1313
- android-22
@@ -21,4 +21,12 @@ android:
2121
# if you need to run emulator(s) during your tests
2222
- sys-img-armeabi-v7a-android-19
2323
- sys-img-x86-android-17
24+
25+
26+
before_script:
27+
- echo no | android create avd --force -n test -t android-17 --abi armeabi-v7a
28+
- emulator -avd test -no-skin -no-audio -no-window &
29+
- android-wait-for-emulator
30+
- adb shell input keyevent 82 &
31+
2432
script: ./gradlew build connectedCheck

demo/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
33

44
android {
55
compileSdkVersion 22
6-
buildToolsVersion "20"
6+
buildToolsVersion "22.0.1"
77

88
defaultConfig {
99
applicationId "com.daimajia.androidanimations"

gradle/wrapper/gradle-wrapper.jar

2.19 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Jun 28 18:37:32 CST 2014
1+
#Mon May 04 10:06:37 CST 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip

0 commit comments

Comments
 (0)