diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2015-12-14 02:45:40 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2015-12-18 08:00:07 +0100 |
| commit | 5c4ac72d5a7638e9edf9997f8c13e94907070901 (patch) | |
| tree | d4c1451ed2253aa8813cf08bea004b76e71ed6ff | |
| parent | 3e00ab158246ba220fa6c73a9f44c4116b0f98e2 (diff) | |
| download | qtlocation-mapboxgl-5c4ac72d5a7638e9edf9997f8c13e94907070901.tar.gz | |
[android] #3277 - update android support lib + new configuration to manage these
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 10 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 14 |
2 files changed, 16 insertions, 8 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index f45d83eb07..ffc1da1172 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -17,10 +17,14 @@ repositories { mavenCentral() } +ext { + supportLibVersion = '23.1.1' +} + dependencies { - compile 'com.android.support:support-annotations:23.1.0' - compile 'com.android.support:support-v4:23.1.0' - compile 'com.android.support:design:23.1.0' + compile "com.android.support:support-annotations:${supportLibVersion}" + compile "com.android.support:support-v4:${supportLibVersion}" + compile "com.android.support:design:${supportLibVersion}" compile 'com.squareup.okhttp:okhttp:2.5.0' compile 'com.mapzen.android:lost:1.0.1' } diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index e5db90adc6..fc6274b9ee 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -34,6 +34,10 @@ gradle.projectsEvaluated { preBuild.dependsOn('accessToken') } +ext { + supportLibVersion = '23.1.1' +} + android { compileSdkVersion 23 buildToolsVersion "23.0.2" @@ -79,10 +83,10 @@ dependencies { compile(project(':MapboxGLAndroidSDK')) { transitive = true } - compile 'com.android.support:support-annotations:23.1.0' - compile 'com.android.support:support-v4:23.1.0' - compile 'com.android.support:appcompat-v7:23.1.0' - compile 'com.android.support:design:23.1.0' + compile "com.android.support:support-annotations:${supportLibVersion}" + compile "com.android.support:support-v4:${supportLibVersion}" + compile "com.android.support:appcompat-v7:${supportLibVersion}" + compile "com.android.support:design:${supportLibVersion}" compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') { transitive = true; } @@ -90,7 +94,7 @@ dependencies { // Testing dependencies testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' - androidTestCompile 'com.android.support:support-annotations:23.1.0' + 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' |