adapt code so that it uses mapbox-android-core dependency

circle.yml

@@ -110,13 +110,13 @@ jobs:
       - deploy:
           name: Publish Java Services To Maven Central
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            if [ "${CIRCLE_BRANCH}" == "pg-android-core" ]; then
             make publish-java ;
             fi
       - deploy:
           name: Publish Android Services To Maven Central
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+            if [ "${CIRCLE_BRANCH}" == "pg-android-core" ]; then
             make publish-android ;
             fi
       - store_artifacts:

mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingServiceActivity.java

@@ -13,10 +13,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.mapbox.services.android.core.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngineListener;
+import com.mapbox.services.android.core.location.LocationEngineProvider;
 import com.mapbox.services.android.geocoder.AndroidGeocoder;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.android.testapp.geocoding.service.Constants;
 import com.mapbox.services.android.testapp.geocoding.service.FetchAddressIntentService;

mapbox/app/src/main/java/com/mapbox/services/android/testapp/geocoding/GeocodingWidgetActivity.java

@@ -13,9 +13,9 @@
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
+import com.mapbox.services.android.core.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngineListener;
+import com.mapbox.services.android.core.location.LocationEngineProvider;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.android.testapp.Utils;
 import com.mapbox.services.android.ui.geocoder.GeocoderAutoCompleteView;

mapbox/app/src/main/java/com/mapbox/services/android/testapp/location/LocationEngineActivity.java

@@ -10,11 +10,11 @@
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import com.mapbox.services.android.core.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngineListener;
+import com.mapbox.services.android.core.location.LocationEnginePriority;
+import com.mapbox.services.android.core.location.LocationEngineProvider;
 import com.mapbox.services.android.location.MockLocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
-import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.testapp.R;
 import com.mapbox.services.commons.models.Position;
 

mapbox/dependencies.gradle

@@ -18,6 +18,7 @@ ext {
 
             // mapbox
             mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.4@aar',
+            mapboxAndroidCore    : 'com.mapbox.mapboxsdk:mapbox-android-core:0.1.1@aar',
 
             // gson
             gson                 : 'com.google.code.gson:gson:2.8.0',

mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/LostLocationEngine.java

@@ -4,9 +4,9 @@
 import android.location.Location;
 import android.support.annotation.Nullable;
 
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEnginePriority;
+import com.mapbox.services.android.core.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngineListener;
+import com.mapbox.services.android.core.location.LocationEnginePriority;
 import com.mapzen.android.lost.api.LocationListener;
 import com.mapzen.android.lost.api.LocationRequest;
 import com.mapzen.android.lost.api.LocationServices;

mapbox/libandroid-services/src/main/java/com/mapbox/services/android/location/MockLocationEngine.java

@@ -6,8 +6,8 @@
 import android.support.annotation.Nullable;
 
 import com.mapbox.services.Constants;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
+import com.mapbox.services.android.core.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngineListener;
 import com.mapbox.services.api.directions.v5.models.DirectionsRoute;
 import com.mapbox.services.api.utils.turf.TurfConstants;
 import com.mapbox.services.api.utils.turf.TurfMeasurement;

mapbox/libandroid-services/src/test/java/com/mapbox/services/android/MockLocationEngineTest.java

@@ -2,8 +2,8 @@
 
 import android.location.Location;
 
+import com.mapbox.services.android.core.location.LocationEngineListener;
 import com.mapbox.services.android.location.MockLocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
 
 import org.junit.Assert;
 import org.junit.Test;

mapbox/libandroid-telemetry/build.gradle

@@ -26,6 +26,7 @@ android {
 }
 
 dependencies {
+    compile rootProject.ext.dep.mapboxAndroidCore
     // Android Support libraries
     compile rootProject.ext.dep.supportAppcompat
 

mapbox/libandroid-telemetry/src/main/java/com/mapbox/services/android/telemetry/MapboxTelemetry.java

@@ -21,13 +21,13 @@
 import android.util.Log;
 import android.view.WindowManager;
 
+import com.mapbox.services.android.core.location.LocationEngine;
+import com.mapbox.services.android.core.location.LocationEngineListener;
+import com.mapbox.services.android.core.location.LocationEngineProvider;
 import com.mapbox.services.android.telemetry.backoff.ExponentialBackoff;
 import com.mapbox.services.android.telemetry.connectivity.ConnectivityReceiver;
 import com.mapbox.services.android.telemetry.constants.TelemetryConstants;
 import com.mapbox.services.android.telemetry.http.TelemetryClient;
-import com.mapbox.services.android.telemetry.location.LocationEngine;
-import com.mapbox.services.android.telemetry.location.LocationEngineListener;
-import com.mapbox.services.android.telemetry.location.LocationEngineProvider;
 import com.mapbox.services.android.telemetry.navigation.MapboxNavigationEvent;
 import com.mapbox.services.android.telemetry.permissions.PermissionsManager;
 import com.mapbox.services.android.telemetry.service.TelemetryService;