summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorTobrun <tobrun@mapbox.com>2017-05-12 15:16:13 +0200
committerGitHub <noreply@github.com>2017-05-12 15:16:13 +0200
commite681f69993ea9b28e745e8933744960eb5a608f8 (patch)
treea0e9dc175a48151e62d4b49130ceb42a509a22ea /platform
parent850b008a2fd872c6158502b821da17864711bb12 (diff)
downloadqtlocation-mapboxgl-e681f69993ea9b28e745e8933744960eb5a608f8.tar.gz
[android] - update LOST to 2.3.0 (#8872)
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/build.gradle4
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java10
-rw-r--r--platform/android/MapboxGLAndroidSDKTestApp/build.gradle3
-rw-r--r--platform/android/build.gradle1
-rw-r--r--platform/android/dependencies.gradle14
5 files changed, 11 insertions, 21 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index 1156a6ef43..c4668f598c 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -6,7 +6,9 @@ dependencies {
compile rootProject.ext.dep.supportDesign
compile rootProject.ext.dep.timber
compile rootProject.ext.dep.okhttp3
- compile rootProject.ext.dep.lost
+ compile(rootProject.ext.dep.lost) {
+ exclude module: 'support-compat'
+ }
// Mapbox Android Services (GeoJSON support)
compile(rootProject.ext.dep.mapboxJavaGeoJSON) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
index b795cf1d5b..c4bdb4a17d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
@@ -135,14 +135,4 @@ public class LocationSource extends LocationEngine implements
listener.onLocationChanged(location);
}
}
-
- @Override
- public void onProviderDisabled(String provider) {
- Log.d(LOG_TAG, "Provider disabled: " + provider);
- }
-
- @Override
- public void onProviderEnabled(String provider) {
- Log.d(LOG_TAG, "Provider enabled: " + provider);
- }
}
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 3dc20c9f5b..56b537e2a2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -61,10 +61,7 @@ dependencies {
}
// Support libraries
- compile rootProject.ext.dep.supportAnnotations
- compile rootProject.ext.dep.supportV4
compile rootProject.ext.dep.supportAppcompatV7
- compile rootProject.ext.dep.supportDesign
compile rootProject.ext.dep.supportRecyclerView
// Leak Canary
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 120c0219e4..bc90896812 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -12,6 +12,7 @@ buildscript {
allprojects {
repositories {
jcenter()
+ maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
}
}
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 738f571c09..817697140e 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -7,21 +7,21 @@ ext {
versionCode = 11
versionName = "5.0.0"
- supportLibVersion = "25.3.1"
- leakCanaryVersion = '1.5'
+ mapboxServicesVersion = "2.2.0-SNAPSHOT"
+ supportLibVersion = "25.1.0"
wearableVersion = '2.0.0'
-
espressoVersion = '2.2.2'
testRunnerVersion = '0.5'
+ leakCanaryVersion = '1.5'
dep = [
// mapbox
- mapboxJavaServices : 'com.mapbox.mapboxsdk:mapbox-java-services:2.1.0@jar',
- mapboxJavaGeoJSON : 'com.mapbox.mapboxsdk:mapbox-java-geojson:2.1.0@jar',
- mapboxAndroidTelemetry : 'com.mapbox.mapboxsdk:mapbox-android-telemetry:2.1.0@aar',
+ mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-java-services:${mapboxServicesVersion}@jar",
+ mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-java-geojson:${mapboxServicesVersion}@jar",
+ mapboxAndroidTelemetry : "com.mapbox.mapboxsdk:mapbox-android-telemetry:${mapboxServicesVersion}@aar",
// mapzen lost
- lost : 'com.mapzen.android:lost:2.2.0',
+ lost : 'com.mapzen.android:lost:2.3.0-SNAPSHOT',
// unit test
junit : 'junit:junit:4.12',