From 8c0a6aad85328f96c21ebe665ed2d64d152eb943 Mon Sep 17 00:00:00 2001 From: Langston Date: Fri, 12 May 2017 09:49:44 -0700 Subject: [PATCH 1/3] Bumped demo and wearable demo up to beta.2 --- MapboxAndroidDemo/build.gradle | 2 +- MapboxAndroidWearDemo/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle index 4f68f18ca..3614ed3ed 100644 --- a/MapboxAndroidDemo/build.gradle +++ b/MapboxAndroidDemo/build.gradle @@ -62,7 +62,7 @@ dependencies { gpservicesCompile 'com.google.firebase:firebase-crash:10.2.0' // Mapbox dependencies - compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.1@aar') { + compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.2@aar') { transitive = true } diff --git a/MapboxAndroidWearDemo/build.gradle b/MapboxAndroidWearDemo/build.gradle index 06d91d8ae..204693f7a 100644 --- a/MapboxAndroidWearDemo/build.gradle +++ b/MapboxAndroidWearDemo/build.gradle @@ -28,7 +28,7 @@ dependencies { compile 'com.google.android.gms:play-services-wearable:10.2.1' compile 'com.google.android.gms:play-services-location:10.2.1' // Mapbox dependencies - compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.1@aar') { + compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.2@aar') { transitive = true } From ca0551bb0f2e34c586fe1f10709991053954c023 Mon Sep 17 00:00:00 2001 From: Langston Date: Fri, 12 May 2017 17:02:19 -0700 Subject: [PATCH 2/3] Updated play-services-wearable and play-services-location to 10.2.4 --- MapboxAndroidWearDemo/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MapboxAndroidWearDemo/build.gradle b/MapboxAndroidWearDemo/build.gradle index 204693f7a..1b85a3b3f 100644 --- a/MapboxAndroidWearDemo/build.gradle +++ b/MapboxAndroidWearDemo/build.gradle @@ -25,8 +25,8 @@ dependencies { provided 'com.google.android.wearable:wearable:2.0.1' compile 'com.google.android.support:wearable:2.0.1' - compile 'com.google.android.gms:play-services-wearable:10.2.1' - compile 'com.google.android.gms:play-services-location:10.2.1' + compile 'com.google.android.gms:play-services-wearable:10.2.4' + compile 'com.google.android.gms:play-services-location:10.2.4' // Mapbox dependencies compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.2@aar') { transitive = true From da77d25f94efe758bba70073789d40b374cda764 Mon Sep 17 00:00:00 2001 From: Langston Date: Fri, 12 May 2017 17:19:48 -0700 Subject: [PATCH 3/3] Added exclude lines to wearable gradle file --- MapboxAndroidWearDemo/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MapboxAndroidWearDemo/build.gradle b/MapboxAndroidWearDemo/build.gradle index 1b85a3b3f..2193ae1c4 100644 --- a/MapboxAndroidWearDemo/build.gradle +++ b/MapboxAndroidWearDemo/build.gradle @@ -28,8 +28,11 @@ dependencies { compile 'com.google.android.gms:play-services-wearable:10.2.4' compile 'com.google.android.gms:play-services-location:10.2.4' // Mapbox dependencies - compile('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.2@aar') { + compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:5.1.0-beta.2@aar') { transitive = true + exclude module: 'lost' + exclude module: 'mapbox-java-geojson' + exclude module: 'mapbox-android-telemetry' } }