[android] - update gradle syntax to 4.1

2 files changed, 28 insertions, 37 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index b111deb0c8..d1ac19a1a7 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -1,26 +1,19 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile rootProject.ext.dep.supportAnnotations
-    compile rootProject.ext.dep.supportFragmentV4
-    compile rootProject.ext.dep.timber
-    compile rootProject.ext.dep.okhttp3
-    provided rootProject.ext.dep.lost
-    testCompile rootProject.ext.dep.junit
-    testCompile rootProject.ext.dep.mockito
-
-    // Mapbox Android Services (GeoJSON support)
-    compile(rootProject.ext.dep.mapboxJavaGeoJSON) {
-        transitive = true
-    }
+    implementation rootProject.ext.dep.supportAnnotations
+    implementation rootProject.ext.dep.supportFragmentV4
+    implementation rootProject.ext.dep.okhttp3
+    implementation rootProject.ext.dep.timber
+    implementation rootProject.ext.dep.mapboxJavaGeoJSON
 
-    // Mapbox Android Services (Telemetry support)
-    compile(rootProject.ext.dep.mapboxAndroidTelemetry) {
-        transitive = true
-        exclude group: 'com.android.support'
-    }
+    api rootProject.ext.dep.mapboxAndroidTelemetry
+    api rootProject.ext.dep.mapboxAndroidCore
+
+    compileOnly rootProject.ext.dep.lost
 
-    compile(rootProject.ext.dep.mapboxAndroidCore)
+    testImplementation rootProject.ext.dep.junit
+    testImplementation rootProject.ext.dep.mockito
 }
 
 android {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index c4cb72026d..b1c652805e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -45,40 +45,38 @@ android {
     }
 
     dexOptions {
-        maxProcessCount 8
-        javaMaxHeapSize "2g"
+        maxProcessCount 16
+        javaMaxHeapSize "4g"
         preDexLibraries true
     }
-    buildToolsVersion '26.0.2'
 }
 
 dependencies {
-    compile(project(':MapboxGLAndroidSDK')) {
-        transitive = true
-    }
+    implementation(project(':MapboxGLAndroidSDK'))
 
     // Support libraries
-    compile rootProject.ext.dep.supportAppcompatV7
-    compile rootProject.ext.dep.supportRecyclerView
-    compile rootProject.ext.dep.supportDesign
+    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
+    debugImplementation rootProject.ext.dep.leakCanaryDebug
+    releaseImplementation rootProject.ext.dep.leakCanaryRelease
 
     // Mapbox Android Services (Java component)
-    compile(rootProject.ext.dep.mapboxJavaServices) {
+    implementation(rootProject.ext.dep.mapboxJavaServices) {
         transitive = true
     }
-    compile rootProject.ext.dep.lost
+    implementation rootProject.ext.dep.lost
+    implementation rootProject.ext.dep.timber
 
     // 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.testSpoonRunner
+    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'