yingtongwang/sensor-fusion-demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Pacha
2016-12-01 10:16:09 +01:00
parent 468b322635
commit caa492f965
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

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

10
app/build.gradle
View File

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