Update to MAS 2.0.0-beta.2 and handle dependencies consistently (#8169)

* [android] update to mas 2.0-beta2 and handle dependencies consistenly

* extract remaining dependencies and bump stable versions

2 files changed, 32 insertions, 25 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 6dc7df7281..6602d919a3 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -4,17 +4,17 @@ dependencies {
     compile "com.android.support:support-annotations:${supportLibVersion}"
     compile "com.android.support:support-v4:${supportLibVersion}"
     compile "com.android.support:design:${supportLibVersion}"
-    compile 'com.squareup.okhttp3:okhttp:3.5.0'
-    compile 'com.mapzen.android:lost:2.0.0'
-    compile 'com.jakewharton.timber:timber:4.3.1'
+    compile rootProject.ext.dep.timber
+    compile rootProject.ext.dep.okhttp3
+    compile rootProject.ext.dep.lost
 
     // Mapbox Android Services (GeoJSON support)
-    compile('com.mapbox.mapboxsdk:mapbox-java-geojson:2.0.0-beta.1@jar') {
+    compile(rootProject.ext.dep.mapboxJavaGeoJSON) {
         transitive = true
     }
 
     // Mapbox Android Services (Telemetry support)
-    compile('com.mapbox.mapboxsdk:mapbox-android-telemetry:2.0.0-beta.1@aar') {
+    compile(rootProject.ext.dep.mapboxAndroidTelemetry) {
         transitive = true
     }
 }
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 9d0fe05f1c..2cdb455190 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -16,33 +16,40 @@ ext {
 
     dep = [
             // mapbox
-            mapboxJavaServices : 'com.mapbox.mapboxsdk:mapbox-java-services:2.0.0-beta.1@jar',
+            mapboxJavaServices     : 'com.mapbox.mapboxsdk:mapbox-java-services:2.0.0-beta.2@jar',
+            mapboxJavaGeoJSON      : 'com.mapbox.mapboxsdk:mapbox-java-geojson:2.0.0-beta.2@jar',
+            mapboxAndroidTelemetry : 'com.mapbox.mapboxsdk:mapbox-android-telemetry:2.0.0-beta.2@aar',
+
+            // mapzen lost
+            lost                   : 'com.mapzen.android:lost:2.1.2',
 
             // unit test
-            junit              : 'junit:junit:4.12',
-            mockito            : 'org.mockito:mockito-core:2.2.27',
+            junit                  : 'junit:junit:4.12',
+            mockito                : 'org.mockito:mockito-core:2.2.27',
 
             // instrumentation test
-            testSpoonRunner    : 'com.squareup.spoon:spoon-client:1.6.2',
-            testRunner         : "com.android.support.test:runner:${testRunnerVersion}",
-            testRules          : "com.android.support.test:rules:${testRunnerVersion}",
-            testEspressoCore   : "com.android.support.test.espresso:espresso-core:${espressoVersion}",
-            testEspressoIntents: "com.android.support.test.espresso:espresso-intents:${espressoVersion}",
+            testSpoonRunner        : 'com.squareup.spoon:spoon-client:1.6.2',
+            testRunner             : "com.android.support.test:runner:${testRunnerVersion}",
+            testRules              : "com.android.support.test:rules:${testRunnerVersion}",
+            testEspressoCore       : "com.android.support.test.espresso:espresso-core:${espressoVersion}",
+            testEspressoIntents    : "com.android.support.test.espresso:espresso-intents:${espressoVersion}",
 
             // support
-            supportAnnotations : "com.android.support:support-annotations:${supportLibVersion}",
-            supportAppcompatV7 : "com.android.support:appcompat-v7:${supportLibVersion}",
-            supportV4          : "com.android.support:support-v4:${supportLibVersion}",
-            supportDesign      : "com.android.support:design:${supportLibVersion}",
-            supportRecyclerView: "com.android.support:recyclerview-v7:${supportLibVersion}",
+            supportAnnotations     : "com.android.support:support-annotations:${supportLibVersion}",
+            supportAppcompatV7     : "com.android.support:appcompat-v7:${supportLibVersion}",
+            supportV4              : "com.android.support:support-v4:${supportLibVersion}",
+            supportDesign          : "com.android.support:design:${supportLibVersion}",
+            supportRecyclerView    : "com.android.support:recyclerview-v7:${supportLibVersion}",
 
             // wear
-            wearCompile        : "com.google.android.support:wearable:${wearableVersion}",
-            wearProvided       : "com.google.android.wearable:wearable:${wearableVersion}",
-
-            // leakCanary
-            leakCanaryDebug    : "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}",
-            leakCanaryRelease  : "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}",
-            leakCanaryTest     : "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
+            wearCompile            : "com.google.android.support:wearable:${wearableVersion}",
+            wearProvided           : "com.google.android.wearable:wearable:${wearableVersion}",
+
+            // square crew
+            timber                 : 'com.jakewharton.timber:timber:4.5.1',
+            okhttp3                : 'com.squareup.okhttp3:okhttp:3.6.0',
+            leakCanaryDebug        : "com.squareup.leakcanary:leakcanary-android:${leakCanaryVersion}",
+            leakCanaryRelease      : "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}",
+            leakCanaryTest         : "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryVersion}"
     ]
 }
\ No newline at end of file