Updated to newest SDK. (reverted from commit 468b322635) (reverted from commit e389df5b4d)

This commit is contained in:
Alexander Pacha
2017-01-17 23:44:27 +01:00
parent e389df5b4d
commit a73dd33226

View File

@@ -6,13 +6,13 @@ def code = formattedDate.toInteger() * 10000
def buildNumber = System.getenv("BITRISE_BUILD_NUMBER") as Integer ?: 0 def buildNumber = System.getenv("BITRISE_BUILD_NUMBER") as Integer ?: 0
android { android {
compileSdkVersion 24 compileSdkVersion 25
buildToolsVersion "24.0.2" 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:24.2.1' compile 'com.android.support:support-v4:25.0.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.mockito:mockito-core:2.2.27'
androidTestCompile 'com.android.support:support-annotations:24.2.1' 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'