Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

update LOST to 2.3.0-SNAPSHOT #8872

Merged
merged 1 commit into from
May 12, 2017
Merged

update LOST to 2.3.0-SNAPSHOT #8872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion platform/android/MapboxGLAndroidSDK/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 0 additions & 10 deletions ...ndroid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,4 @@ public void onLocationChanged(Location location) {
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);
}
}
3 changes: 0 additions & 3 deletions platform/android/MapboxGLAndroidSDKTestApp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions platform/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
}
}

Expand Down
14 changes: 7 additions & 7 deletions platform/android/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this version matches the one found in MAS atm.
the supportLib from LOST was excluded.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tobrun do we need to change the support lib version on MAS?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at some point yes 😃 I would aim at coordinating this with a final release? (would also like to ping LOST for this, they have a really outdated one).

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',
Expand Down