[android] merge from master (MAS 3.0)

mapbox · Feb 12, 2018 · 867ed80 · 867ed80
1 parent 3ced76f
commit 867ed80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
@@ -43,7 +43,7 @@
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.light.Light;
 import com.mapbox.mapboxsdk.style.sources.Source;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
+import com.mapbox.android.core.location.LocationEngine;
 
 import java.lang.reflect.ParameterizedType;
 import java.util.HashMap;

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -52,12 +52,10 @@ android {
 }
 
 dependencies {
-    implementation(project(':MapboxGLAndroidSDK'))
-    implementation(dependenciesList.mapboxJavaServices) {
-        transitive = true
-    }
+    api(project(':MapboxGLAndroidSDK'))
+    implementation dependenciesList.mapboxJavaServices
 
-    api dependenciesList.mapboxJavaTurf
+    implementation dependenciesList.mapboxJavaTurf
 
     implementation dependenciesList.supportAppcompatV7
     implementation dependenciesList.supportRecyclerView