Updated gradle-dependencies, sdk and travis tools to newest SDK version (25) (reverted from commit caa492f965)

This commit is contained in:
Alexander Pacha
2017-01-17 23:44:27 +01:00
parent a73dd33226
commit dee14cf165
2 changed files with 8 additions and 8 deletions

View File

@@ -7,16 +7,16 @@ android:
- tools
# The BuildTools version used by your project
- build-tools-25.0.1
- build-tools-24.0.2
# The SDK version used to compile your project
- android-25
- android-24
# Additional components
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
- sys-img-armeabi-v7a-android-25
- sys-img-armeabi-v7a-android-24
before_script:
# Create and start emulator

View File

@@ -7,12 +7,12 @@ def buildNumber = System.getenv("BITRISE_BUILD_NUMBER") as Integer ?: 0
android {
compileSdkVersion 25
buildToolsVersion "25.0.1"
buildToolsVersion "25.0.0"
defaultConfig {
applicationId "org.hitlabnz.sensor_fusion_demo"
minSdkVersion 18
targetSdkVersion 25
targetSdkVersion 24
versionCode code + buildNumber
versionName "1.4." + buildNumber
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -31,12 +31,12 @@ android {
}
dependencies {
compile 'com.android.support:support-v4:25.0.1'
compile 'com.android.support:support-v4:25.0.0'
testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.2.27'
testCompile 'org.mockito:mockito-core:2.2.9'
androidTestCompile 'com.android.support:support-annotations:25.0.1'
androidTestCompile 'com.android.support:support-annotations:25.0.0'
androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'