Merge branch 'master' into rclee-async-setupupstream/rclee-async-setup

3 files changed, 45 insertions, 16 deletions

diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle
index a5c6ad0da3..ff61b1d074 100644
--- a/platform/android/gradle/dependencies.gradle
+++ b/platform/android/gradle/dependencies.gradle
@@ -2,24 +2,23 @@ ext {
 
     androidVersions = [
             minSdkVersion    : 14,
-            targetSdkVersion : 25,
-            compileSdkVersion: 25,
-            buildToolsVersion: '26.0.3'
+            targetSdkVersion : 27,
+            compileSdkVersion: 27,
+            buildToolsVersion: '27.0.3'
     ]
 
     versions = [
-            mapboxServices : '3.0.1',
-            mapboxTelemetry: '3.0.2',
+            mapboxServices : '3.1.0',
+            mapboxTelemetry: '3.1.1',
             mapboxGestures : '0.2.0',
-            supportLib     : '25.4.0',
-            espresso       : '3.0.1',
-            testRunner     : '1.0.1',
-            leakCanary     : '1.5.1',
-            lost           : '3.0.4',
+            supportLib     : '27.1.1',
+            espresso       : '3.0.2',
+            testRunner     : '1.0.2',
+            leakCanary     : '1.5.4',
             junit          : '4.12',
-            mockito        : '2.10.0',
-            robolectric    : '3.5.1',
-            timber         : '4.5.1',
+            mockito        : '2.18.3',
+            robolectric    : '3.8',
+            timber         : '4.7.0',
             okhttp         : '3.10.0'
     ]
 
@@ -40,6 +39,7 @@ ext {
             testRules             : "com.android.support.test:rules:${versions.testRunner}",
             testEspressoCore      : "com.android.support.test.espresso:espresso-core:${versions.espresso}",
             testEspressoIntents   : "com.android.support.test.espresso:espresso-intents:${versions.espresso}",
+            testEspressoContrib   : "com.android.support.test.espresso:espresso-contrib:${versions.espresso}",
 
             supportAnnotations    : "com.android.support:support-annotations:${versions.supportLib}",
             supportAppcompatV7    : "com.android.support:appcompat-v7:${versions.supportLib}",
@@ -47,11 +47,10 @@ ext {
             supportDesign         : "com.android.support:design:${versions.supportLib}",
             supportRecyclerView   : "com.android.support:recyclerview-v7:${versions.supportLib}",
 
-            lost                  : "com.mapzen.android:lost:${versions.lost}",
             gmsLocation           : 'com.google.android.gms:play-services-location:11.0.4',
             timber                : "com.jakewharton.timber:timber:${versions.timber}",
             okhttp3               : "com.squareup.okhttp3:okhttp:${versions.okhttp}",
             leakCanaryDebug       : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}",
             leakCanaryRelease     : "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakCanary}"
     ]
-}
\ No newline at end of file
+}
diff --git a/platform/android/gradle/gradle-dependencies-graph.gradle b/platform/android/gradle/gradle-dependencies-graph.gradle
new file mode 100644
index 0000000000..5cbc7b974f
--- /dev/null
+++ b/platform/android/gradle/gradle-dependencies-graph.gradle
@@ -0,0 +1,29 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath "com.vanniktech:gradle-dependency-graph-generator-plugin:0.3.0"
+    }
+}
+
+import com.vanniktech.dependency.graph.generator.DependencyGraphGeneratorPlugin
+import com.vanniktech.dependency.graph.generator.DependencyGraphGeneratorExtension.Generator
+import com.vanniktech.dependency.graph.generator.dot.GraphFormattingOptions
+import com.vanniktech.dependency.graph.generator.dot.Color
+import com.vanniktech.dependency.graph.generator.dot.Shape
+import com.vanniktech.dependency.graph.generator.dot.Style
+
+plugins.apply(DependencyGraphGeneratorPlugin)
+
+def mapboxGenerator = new Generator(
+        "mapboxLibraries", // Suffix for our Gradle task.
+        "", // Root suffix that we don't want in this case.
+        { dependency -> dependency.getModuleGroup().startsWith("com.mapbox.mapboxsdk") }, // Only want Mapbox libs.
+        { dependency -> true }, // Include transitive dependencies.
+)
+
+dependencyGraphGenerator {
+    generators = [mapboxGenerator]
+}
diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties
index bf1b63c346..84af82d181 100644
--- a/platform/android/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon May 14 12:12:39 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip