diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-26 16:09:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 16:09:51 +0200 |
| commit | e7bfa7849e4ed7a80d27b63ac2f504660ecfb14b (patch) | |
| tree | a42669fc8e544b91ad0855c6c2500a6ec4cc43c7 /platform/android/MapboxGLAndroidSDKTestApp/build.gradle | |
| parent | a4d259c33f9bb890bba97fd89552720e3e0ec09b (diff) | |
| download | qtlocation-mapboxgl-e7bfa7849e4ed7a80d27b63ac2f504660ecfb14b.tar.gz | |
[android] - Update to Android Studio 2.2.2 with tools/dependencies (#6390)
* [android] - update android gradle tools, update test app version number, update target sdk to nougat, update support lib versions to latest
* new tools generated an aligned test apk, breaks CI integration
* update to Nougat release 7.1, update related tooling, update version code test app to 5.0.0.
* update wear module
* update gradle.properties
Diffstat (limited to 'platform/android/MapboxGLAndroidSDKTestApp/build.gradle')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index f5f4ec3f54..58b3b26b10 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -23,19 +23,19 @@ gradle.projectsEvaluated { } ext { - supportLibVersion = '23.4.0' + supportLibVersion = '25.0.0' } android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.0" defaultConfig { applicationId "com.mapbox.mapboxsdk.testapp" minSdkVersion 15 - targetSdkVersion 23 - versionCode 9 - versionName "4.1.0" + targetSdkVersion 25 + versionCode 11 + versionName "5.0.0" // Specify AndroidJUnitRunner as the default test instrumentation runner testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -101,9 +101,9 @@ dependencies { testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' androidTestCompile "com.android.support:support-annotations:${supportLibVersion}" - androidTestCompile 'com.android.support.test:runner:0.4.1' - androidTestCompile 'com.android.support.test:rules:0.4.1' - androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1' + androidTestCompile 'com.android.support.test:runner:0.5' + androidTestCompile 'com.android.support.test:rules:0.5' + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' androidTestCompile 'com.squareup.spoon:spoon-client:1.6.2' } |