From 0c0d7ceaebf822ababc7147c494e88f4c16e18e3 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Wed, 15 Feb 2017 19:56:31 +0100
Subject: [android] - use project wide configurations for all modules + fixup
 wear compile error (#8066)

---
 .../android/MapboxGLAndroidSDKTestApp/build.gradle | 53 ++++++++++------------
 1 file changed, 23 insertions(+), 30 deletions(-)

(limited to 'platform/android/MapboxGLAndroidSDKTestApp')

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 20fff123fd..1b4d54106d 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -1,22 +1,15 @@
 apply plugin: 'com.android.application'
 
-ext {
-    supportLibVersion = '25.1.0'
-    espressoVersion = '2.2.2'
-    testRunnerVersion = '0.5'
-    leakCanaryVersion = '1.5'
-}
-
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "com.mapbox.mapboxsdk.testapp"
-        minSdkVersion 15
-        targetSdkVersion 25
-        versionCode 11
-        versionName "5.0.0"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -61,31 +54,31 @@ dependencies {
     }
 
     // Support libraries
-    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.android.support:recyclerview-v7:${supportLibVersion}"
+    compile rootProject.ext.dep.supportAnnotations
+    compile rootProject.ext.dep.supportV4
+    compile rootProject.ext.dep.supportAppcompatV7
+    compile rootProject.ext.dep.supportDesign
+    compile rootProject.ext.dep.supportRecyclerView
 
     // Leak Canary
-    debugCompile "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}"
-    releaseCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
-    testCompile "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
+    debugCompile rootProject.ext.dep.leakCanaryDebug
+    releaseCompile rootProject.ext.dep.leakCanaryRelease
+    testCompile rootProject.ext.dep.leakCanaryTest
 
     // Mapbox Android Services (Java component)
-    compile('com.mapbox.mapboxsdk:mapbox-java-services:2.0.0-beta.1@jar') {
+    compile(rootProject.ext.dep.mapboxJavaServices) {
         transitive = true
     }
 
     // Testing dependencies
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.2.27'
-    androidTestCompile 'com.squareup.spoon:spoon-client:1.6.2'
-    androidTestCompile "com.android.support:support-annotations:${supportLibVersion}"
-    androidTestCompile "com.android.support.test:runner:${testRunnerVersion}"
-    androidTestCompile "com.android.support.test:rules:${testRunnerVersion}"
-    androidTestCompile "com.android.support.test.espresso:espresso-core:${espressoVersion}"
-    androidTestCompile "com.android.support.test.espresso:espresso-intents:${espressoVersion}"
+    testCompile rootProject.ext.dep.junit
+    testCompile rootProject.ext.dep.mockito
+    androidTestCompile rootProject.ext.dep.testSpoonRunner
+    androidTestCompile rootProject.ext.dep.supportAnnotations
+    androidTestCompile rootProject.ext.dep.testRunner
+    androidTestCompile rootProject.ext.dep.testRules
+    androidTestCompile rootProject.ext.dep.testEspressoCore
+    androidTestCompile rootProject.ext.dep.testEspressoIntents
 }
 
 apply from: 'gradle-make.gradle'
-- 
cgit v1.2.1