1 files changed, 22 insertions, 22 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 656789fcdb..765b346669 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -14,8 +14,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     packagingOptions {
@@ -25,11 +25,11 @@ android {
     }
 
     lintOptions {
+        baseline file("lint-baseline-local.xml")
         checkAllWarnings true
         warningsAsErrors true
-        disable 'MissingTranslation'
-        disable 'IconDensities'
-        disable 'InvalidPackage'
+        disable 'MissingTranslation', 'GoogleAppIndexingWarning', 'UnpackedNativeCode', 'IconDipSize', 'TypographyQuotes'
+        abortOnError false
     }
 
     buildTypes {
@@ -52,37 +52,37 @@ android {
 }
 
 dependencies {
-    compile(project(':MapboxGLAndroidSDK')) {
-        transitive = true
-    }
+    implementation(project(':MapboxGLAndroidSDK'))
 
     // Support libraries
-    compile rootProject.ext.dep.supportAppcompatV7
-    compile rootProject.ext.dep.supportRecyclerView
+    implementation rootProject.ext.dep.supportAppcompatV7
+    implementation rootProject.ext.dep.supportRecyclerView
+    implementation rootProject.ext.dep.supportDesign
 
     // Leak Canary
-    debugCompile rootProject.ext.dep.leakCanaryDebug
-    releaseCompile rootProject.ext.dep.leakCanaryRelease
-    testCompile rootProject.ext.dep.leakCanaryTest
+    debugImplementation rootProject.ext.dep.leakCanaryDebug
+    releaseImplementation rootProject.ext.dep.leakCanaryRelease
+
+    // Timber
+    implementation rootProject.ext.dep.timber
 
     // Mapbox Android Services (Java component)
-    compile(rootProject.ext.dep.mapboxJavaServices) {
+    implementation(rootProject.ext.dep.mapboxJavaServices) {
         transitive = true
     }
+    implementation rootProject.ext.dep.lost
 
     // Testing dependencies
-    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
+    androidTestImplementation rootProject.ext.dep.supportAnnotations
+    androidTestImplementation rootProject.ext.dep.testRunner
+    androidTestImplementation rootProject.ext.dep.testRules
+    androidTestImplementation rootProject.ext.dep.testEspressoCore
+    androidTestImplementation rootProject.ext.dep.testEspressoIntents
 }
 
 apply from: 'gradle-make.gradle'
 apply from: 'gradle-config.gradle'
-apply from: 'gradle-device-farm.gradle'
-apply from: 'gradle-spoon.gradle'
 apply from: 'gradle-checkstyle.gradle'
+apply from: '../gradle-lint.gradle'