mapbox · zugaldia · Feb 23, 2017 · Feb 22, 2017 · Feb 22, 2017 · Feb 22, 2017
diff --git a/mapbox/app/build.gradle b/mapbox/app/build.gradle
@@ -39,34 +39,34 @@ dependencies {
     compile project(':libjava-services-rx')
 
     // Android Support libraries
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
-    compile "com.android.support:recyclerview-v7:25.1.0"
+    compile rootProject.ext.dep.supportAppcompat
+    compile rootProject.ext.dep.supportDesign
+    compile rootProject.ext.dep.supportRecyclerview
 
     // Mapbox SDK
-    compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.0-SNAPSHOT@aar') {
-        transitive=true
+    compile(rootProject.ext.dep.mapbox) {
+        transitive = true
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-java-geojson'
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
     }
 
     // Leak Canary
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
+    debugCompile rootProject.ext.dep.leakcanaryDebug
+    releaseCompile rootProject.ext.dep.leakcanaryRelease
+    testCompile rootProject.ext.dep.leakcanaryTest
 
     // Google Play Services
-    compile 'com.google.android.gms:play-services-location:10.0.1'
+    compile rootProject.ext.dep.gmsLocation
 
     // Picasso (Static Image)
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile rootProject.ext.dep.picasso
 
     // RxAndroid
-    compile 'io.reactivex:rxandroid:1.1.0'
+    compile rootProject.ext.dep.rxandroid
 
     // Testing
-    testCompile 'junit:junit:4.12'
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    testCompile rootProject.ext.dep.junit
+    androidTestCompile(rootProject.ext.dep.supportEspresso, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }

diff --git a/...pp/src/main/java/com/mapbox/services/android/testapp/directions/DirectionsV5Activity.java b/...pp/src/main/java/com/mapbox/services/android/testapp/directions/DirectionsV5Activity.java
@@ -31,12 +31,12 @@
 import java.util.List;
 import java.util.Locale;
 
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 public class DirectionsV5Activity extends AppCompatActivity {
 
@@ -124,9 +124,9 @@ private void getRoute(Position origin, Position destination) throws ServicesExce
     clientRx.getObservable()
       .subscribeOn(Schedulers.newThread())
       .observeOn(AndroidSchedulers.mainThread())
-      .subscribe(new Action1<DirectionsResponse>() {
+      .subscribe(new Consumer<DirectionsResponse>() {
         @Override
-        public void call(DirectionsResponse response) {
+        public void accept(DirectionsResponse response) throws Exception {
           DirectionsRoute currentRoute = response.getRoutes().get(0);
           Log.d(LOG_TAG, "Response code: " + response.getCode());
           Log.d(LOG_TAG, "Distance: " + currentRoute.getDistance());

diff --git a/mapbox/dependencies.gradle b/mapbox/dependencies.gradle
@@ -9,13 +9,51 @@ ext {
     buildToolsVersion = "25.0.2"
 
     dep = [
-        gson: 'com.google.code.gson:gson:2.8.0',
-        retrofit2Main: 'com.squareup.retrofit2:retrofit:2.1.0',
-        retrofit2Gson: 'com.squareup.retrofit2:converter-gson:2.1.0',
-        retrofit2Rx: 'com.squareup.retrofit2:adapter-rxjava:2.1.0',
-        okhttp3Logging: 'com.squareup.okhttp3:logging-interceptor:3.5.0',
-        okhttp3Mockwebserver: 'com.squareup.okhttp3:mockwebserver:3.5.0',
-        junit: 'junit:junit:4.12',
-        hamcrestJunit: 'org.hamcrest:hamcrest-junit:2.0.0.0'
+            // Support
+            supportAppcompat     : 'com.android.support:appcompat-v7:25.1.0',
+            supportCompat        : 'com.android.support:support-compat:25.1.0',
+            supportDesign        : 'com.android.support:design:25.1.0',
+            supportRecyclerview  : 'com.android.support:recyclerview-v7:25.1.0',
+
+            // mapbox
+            mapbox               : 'com.mapbox.mapboxsdk:mapbox-android-sdk:5.0.0-SNAPSHOT@aar',
+
+            // gson
+            gson                 : 'com.google.code.gson:gson:2.8.0',
+
+            // timber
+            timber               : 'com.jakewharton.timber:timber:4.5.1',
+
+            // retrofit
+            retrofit2Main        : 'com.squareup.retrofit2:retrofit:2.2.0',
+            retrofit2Gson        : 'com.squareup.retrofit2:converter-gson:2.2.0',
+            retrofit2Rx          : 'com.squareup.retrofit2:adapter-rxjava2:2.2.0',
+
+            // okhttp
+            okhttp3              : 'com.squareup.okhttp3:okhttp:3.6.0',
+            okhttp3Logging       : 'com.squareup.okhttp3:logging-interceptor:3.6.0',
+            okhttp3Mockwebserver : 'com.squareup.okhttp3:mockwebserver:3.6.0',
+
+            // lost
+            lost                 : 'com.mapzen.android:lost:2.1.2',
+
+            // play services
+            gmsLocation          : 'com.google.android.gms:play-services-location:10.2.0',
+
+            // picasso
+            picasso              : 'com.squareup.picasso:picasso:2.5.2',
+
+            // rx android
+            rxandroid            : 'io.reactivex.rxjava2:rxandroid:2.0.1',
+
+            // leak canary
+            leakcanaryDebug      : 'com.squareup.leakcanary:leakcanary-android:1.5',
+            leakcanaryRelease    : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5',
+            leakcanaryTest       : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5',
+
+            // testing
+            junit                : 'junit:junit:4.12',
+            hamcrestJunit        : 'org.hamcrest:hamcrest-junit:2.0.0.0',
+            supportEspresso      : 'com.android.support.test.espresso:espresso-core:2.2.2'
     ]
 }
diff --git a/mapbox/libandroid-services/build.gradle b/mapbox/libandroid-services/build.gradle
@@ -32,18 +32,18 @@ dependencies {
     compile project(':libandroid-telemetry')
 
     // Android Support libraries
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:support-compat:25.1.0'
+    compile rootProject.ext.dep.supportAppcompat
+    compile rootProject.ext.dep.supportCompat
 
     // Timber for logging
-    compile 'com.jakewharton.timber:timber:4.5.0'
+    compile rootProject.ext.dep.timber
 
     // LOST
-    compile 'com.mapzen.android:lost:2.1.2'
+    compile rootProject.ext.dep.lost
 
     // Testing
-    testCompile 'junit:junit:4.12'
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    testCompile rootProject.ext.dep.junit
+    androidTestCompile(rootProject.ext.dep.supportEspresso, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }

diff --git a/mapbox/libandroid-telemetry/build.gradle b/mapbox/libandroid-telemetry/build.gradle
@@ -31,14 +31,14 @@ android {
 
 dependencies {
     // Android Support libraries
-    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile rootProject.ext.dep.supportAppcompat
 
     // OkHttp for network requests
-    compile 'com.squareup.okhttp3:okhttp:3.5.0'
+    compile rootProject.ext.dep.okhttp3
 
     // Testing
-    testCompile 'junit:junit:4.12'
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    testCompile rootProject.ext.dep.junit
+    androidTestCompile(rootProject.ext.dep.supportEspresso, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }

diff --git a/mapbox/libandroid-ui/build.gradle b/mapbox/libandroid-ui/build.gradle
@@ -30,12 +30,12 @@ dependencies {
     compile project(':libandroid-services')
 
     // Android Support libraries
-    compile 'com.android.support:appcompat-v7:25.1.0'
-    compile 'com.android.support:design:25.1.0'
+    compile rootProject.ext.dep.supportAppcompat
+    compile rootProject.ext.dep.supportDesign
 
     // Testing
-    testCompile 'junit:junit:4.12'
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    testCompile rootProject.ext.dep.junit
+    androidTestCompile(rootProject.ext.dep.supportEspresso, {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 }

diff --git a/mapbox/libjava-core/build.gradle b/mapbox/libjava-core/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 buildConfig {
     packageName = 'com.mapbox.services'
     constants = [
-            VERSION: rootProject.ext.MasVersionName,
+            VERSION     : rootProject.ext.MasVersionName,
             GIT_REVISION: getGitRevision(),
     ]
 }

diff --git a/...rvices-rx/src/main/java/com/mapbox/services/api/rx/directions/v5/DirectionsServiceRx.java b/...rvices-rx/src/main/java/com/mapbox/services/api/rx/directions/v5/DirectionsServiceRx.java
@@ -2,11 +2,11 @@
 
 import com.mapbox.services.api.directions.v5.models.DirectionsResponse;
 
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
-import rx.Observable;
 
 /**
  * Interface that defines the directions service (v5).

diff --git a/...ervices-rx/src/main/java/com/mapbox/services/api/rx/directions/v5/MapboxDirectionsRx.java b/...ervices-rx/src/main/java/com/mapbox/services/api/rx/directions/v5/MapboxDirectionsRx.java
@@ -4,10 +4,10 @@
 import com.mapbox.services.api.directions.v5.MapboxDirections;
 import com.mapbox.services.api.directions.v5.models.DirectionsResponse;
 
+import io.reactivex.Observable;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
-import rx.Observable;
 
 /**
  * The Directions API allows the calculation of routes between coordinates. The fastest route
@@ -37,7 +37,7 @@ private DirectionsServiceRx getServiceRx() {
     Retrofit retrofit = new Retrofit.Builder()
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
-      .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+      .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
       .addConverterFactory(GsonConverterFactory.create())
       .build();
 

diff --git a/...a-services-rx/src/main/java/com/mapbox/services/api/rx/distance/v1/DistanceServiceRx.java b/...a-services-rx/src/main/java/com/mapbox/services/api/rx/distance/v1/DistanceServiceRx.java
@@ -3,13 +3,13 @@
 import com.mapbox.services.api.distance.v1.models.DistanceResponse;
 import com.mapbox.services.commons.geojson.MultiPoint;
 
+import io.reactivex.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
 import retrofit2.http.Header;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
-import rx.Observable;
 
 /**
  * Interface that defines the distance service.

diff --git a/...va-services-rx/src/main/java/com/mapbox/services/api/rx/distance/v1/MapboxDistanceRx.java b/...va-services-rx/src/main/java/com/mapbox/services/api/rx/distance/v1/MapboxDistanceRx.java
@@ -4,10 +4,10 @@
 import com.mapbox.services.api.distance.v1.MapboxDistance;
 import com.mapbox.services.api.distance.v1.models.DistanceResponse;
 
+import io.reactivex.Observable;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
-import rx.Observable;
 
 /**
  * Note this API is still in preview.
@@ -46,7 +46,7 @@ private DistanceServiceRx getServiceRx() {
     Retrofit retrofit = new Retrofit.Builder()
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
-      .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+      .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
       .addConverterFactory(GsonConverterFactory.create(getGson()))
       .build();
 

diff --git a/...services-rx/src/main/java/com/mapbox/services/api/rx/geocoding/v5/GeocodingServiceRx.java b/...services-rx/src/main/java/com/mapbox/services/api/rx/geocoding/v5/GeocodingServiceRx.java
@@ -4,11 +4,11 @@
 
 import java.util.List;
 
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
-import rx.Observable;
 
 /**
  * Interface that defines the geocoding service.

diff --git a/...-services-rx/src/main/java/com/mapbox/services/api/rx/geocoding/v5/MapboxGeocodingRx.java b/...-services-rx/src/main/java/com/mapbox/services/api/rx/geocoding/v5/MapboxGeocodingRx.java
@@ -6,10 +6,10 @@
 
 import java.util.List;
 
+import io.reactivex.Observable;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
-import rx.Observable;
 
 /**
  * The Mapbox geocoding client (v5).
@@ -38,7 +38,7 @@ private GeocodingServiceRx getServiceRx() {
     Retrofit retrofit = new Retrofit.Builder()
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
-      .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+      .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
       .addConverterFactory(GsonConverterFactory.create(getGson()))
       .build();
 

diff --git a/...ices-rx/src/main/java/com/mapbox/services/api/rx/mapmatching/v5/MapMatchingServiceRx.java b/...ices-rx/src/main/java/com/mapbox/services/api/rx/mapmatching/v5/MapMatchingServiceRx.java
@@ -2,11 +2,11 @@
 
 import com.mapbox.services.api.mapmatching.v5.models.MapMatchingResponse;
 
+import io.reactivex.Observable;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
-import rx.Observable;
 
 /**
  * Interface that defines the map matching service.

diff --git a/...vices-rx/src/main/java/com/mapbox/services/api/rx/mapmatching/v5/MapboxMapMatchingRx.java b/...vices-rx/src/main/java/com/mapbox/services/api/rx/mapmatching/v5/MapboxMapMatchingRx.java
@@ -4,10 +4,10 @@
 import com.mapbox.services.api.mapmatching.v5.MapboxMapMatching;
 import com.mapbox.services.api.mapmatching.v5.models.MapMatchingResponse;
 
+import io.reactivex.Observable;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
-import rx.Observable;
 
 /**
  * The Mapbox map matching interface (v4)
@@ -40,7 +40,7 @@ private MapMatchingServiceRx getServiceRx() {
     Retrofit retrofit = new Retrofit.Builder()
       .client(getOkHttpClient())
       .baseUrl(builder.getBaseUrl())
-      .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+      .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
       .addConverterFactory(GsonConverterFactory.create())
       .build();
 

diff --git a/...ces-rx/src/test/java/com/mapbox/services/api/rx/directions/v5/MapboxDirectionsRxTest.java b/...ces-rx/src/test/java/com/mapbox/services/api/rx/directions/v5/MapboxDirectionsRxTest.java
@@ -18,11 +18,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.observers.TestObserver;
 import okhttp3.HttpUrl;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
-import rx.observers.TestSubscriber;
 
 import static org.junit.Assert.assertEquals;
 
@@ -84,17 +84,16 @@ public void testSanityRX() throws ServicesException {
       .setBaseUrl(mockUrl.toString())
       .build();
 
-    TestSubscriber<DirectionsResponse> testSubscriber = new TestSubscriber<>();
-    client.getObservable().subscribe(testSubscriber);
+    TestObserver<DirectionsResponse> testObserver = new TestObserver();
+    client.getObservable().subscribe(testObserver);
+    testObserver.assertComplete();
+    testObserver.assertNoErrors();
+    testObserver.assertValueCount(1);
 
-    testSubscriber.assertCompleted();
-    testSubscriber.assertNoErrors();
-    testSubscriber.assertValueCount(1);
+    List<List<Object>> events = testObserver.getEvents();
+    assertEquals(1, events.get(0).size());
 
-    List<DirectionsResponse> events = testSubscriber.getOnNextEvents();
-    assertEquals(1, events.size());
-
-    DirectionsResponse response = events.get(0);
+    DirectionsResponse response = (DirectionsResponse) events.get(0).get(0);
     assertEquals(response.getCode(), DirectionsCriteria.RESPONSE_OK);
   }