From caa492f9659e7550e6706dbae1acab72295a3d55 Mon Sep 17 00:00:00 2001 From: Alexander Pacha Date: Thu, 1 Dec 2016 10:16:09 +0100 Subject: [PATCH] Updated gradle-dependencies, sdk and travis tools to newest SDK version (25) --- .travis.yml | 6 +++--- app/build.gradle | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2aab5ff..c95bcc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,16 @@ android: - tools # 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 - - android-24 + - android-25 # Additional components - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - - sys-img-armeabi-v7a-android-24 + - sys-img-armeabi-v7a-android-25 before_script: # Create and start emulator diff --git a/app/build.gradle b/app/build.gradle index afc4416..e024507 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,12 +7,12 @@ def buildNumber = System.getenv("BITRISE_BUILD_NUMBER") as Integer ?: 0 android { compileSdkVersion 25 - buildToolsVersion "25.0.0" + buildToolsVersion "25.0.1" defaultConfig { applicationId "org.hitlabnz.sensor_fusion_demo" minSdkVersion 18 - targetSdkVersion 24 + targetSdkVersion 25 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.0' + compile 'com.android.support:support-v4:25.0.1' 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 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'