Version bumps & do less with Travis
This commit is contained in:
parent
dfe8cd0724
commit
8279b868ad
16
.travis.yml
16
.travis.yml
|
|
@ -2,20 +2,10 @@ language: android
|
|||
|
||||
android:
|
||||
components:
|
||||
- build-tools-21.1.2
|
||||
- android-21
|
||||
- build-tools-23.0.1
|
||||
- android-22
|
||||
- extra-android-support
|
||||
- sys-img-armeabi-v7a-android-21
|
||||
|
||||
install:
|
||||
- ./gradlew :lib:build
|
||||
|
||||
before_script:
|
||||
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
|
||||
- emulator -avd test -no-skin -no-audio -no-window &
|
||||
- android-wait-for-emulator
|
||||
- adb shell input keyevent 82 &
|
||||
|
||||
script:
|
||||
- ./gradlew :lib:connectedAndroidTest
|
||||
- ./gradlew build
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ buildscript {
|
|||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:1.2.2'
|
||||
classpath 'com.android.tools.build:gradle:1.2.3'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ apply plugin: 'com.android.application'
|
|||
archivesBaseName = 'android-crop-example'
|
||||
|
||||
android {
|
||||
compileSdkVersion 21
|
||||
buildToolsVersion '21.1.2'
|
||||
compileSdkVersion 22
|
||||
buildToolsVersion '23.0.1'
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 10
|
||||
targetSdkVersion 21
|
||||
targetSdkVersion 22
|
||||
versionCode Integer.parseInt(project.VERSION_CODE)
|
||||
versionName project.VERSION
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ apply plugin: 'signing'
|
|||
archivesBaseName = 'android-crop'
|
||||
|
||||
android {
|
||||
compileSdkVersion 21
|
||||
buildToolsVersion '21.1.2'
|
||||
compileSdkVersion 22
|
||||
buildToolsVersion '23.0.1'
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 10
|
||||
targetSdkVersion 21
|
||||
targetSdkVersion 22
|
||||
|
||||
testApplicationId 'com.soundcloud.android.crop.test'
|
||||
testInstrumentationRunner 'android.test.InstrumentationTestRunner'
|
||||
|
|
@ -19,10 +19,10 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile 'com.android.support:support-annotations:21.0.0'
|
||||
compile 'com.android.support:support-v4:21.0.3'
|
||||
compile 'com.android.support:support-annotations:23.0.1'
|
||||
compile 'com.android.support:support-v4:23.0.1'
|
||||
androidTestCompile 'com.squareup:fest-android:1.0.7'
|
||||
androidTestCompile 'com.android.support:support-v4:21.0.3'
|
||||
androidTestCompile 'com.android.support:support-v4:23.0.1'
|
||||
androidTestCompile 'org.mockito:mockito-core:1.9.5'
|
||||
androidTestCompile 'com.google.dexmaker:dexmaker:1.0'
|
||||
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'
|
||||
|
|
|
|||
Loading…
Reference in New Issue