Skip to content

Fixes #61: Upgrade OSMDroid to latest 5.5 #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2016
Merged

Fixes #61: Upgrade OSMDroid to latest 5.5 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4d8f6d
Fixes #61: Upgrade OSMDroid to latest 5.5
nguillaumin Nov 20, 2016
fd1d941
Update Travis CI to JDK 8 seemingly needed by latest Gradle tools
nguillaumin Nov 20, 2016
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
sudo: false

language: android
jdk: oraclejdk8

android:
components:
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
compile 'org.apache.httpcomponents:httpclient:4.2.1'
compile 'org.apache.httpcomponents:httpcore:4.2.1'
compile 'org.apache.httpcomponents:httpmime:4.2.1'
compile 'org.osmdroid:osmdroid-android:4.2'
compile 'org.osmdroid:osmdroid-android:5.5:release@aar'
compile 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
compile 'oauth.signpost:signpost-core:1.2.1.2'
compile 'org.slf4j:slf4j-android:1.6.1-RC1'
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/me/guillaumin/android/osmtracker/activity/DisplayTrackMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
import me.guillaumin.android.osmtracker.overlay.WayPointsOverlay;

import org.osmdroid.api.IMapController;
import org.osmdroid.contributor.util.constants.OpenStreetMapContributorConstants;
import org.osmdroid.tileprovider.tilesource.ITileSource;
import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
import org.osmdroid.util.GeoPoint;
import org.osmdroid.views.MapView;
import org.osmdroid.views.overlay.PathOverlay;
import org.osmdroid.views.overlay.SimpleLocationOverlay;
import org.osmdroid.views.overlay.mylocation.SimpleLocationOverlay;

import android.app.Activity;
import android.content.ContentUris;
Expand Down Expand Up @@ -47,7 +46,7 @@
* @author Viesturs Zarins
*
*/
public class DisplayTrackMap extends Activity implements OpenStreetMapContributorConstants{
public class DisplayTrackMap extends Activity {

private static final String TAG = DisplayTrackMap.class.getSimpleName();

Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/me/guillaumin/android/osmtracker/overlay/WayPointsOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import me.guillaumin.android.osmtracker.db.TrackContentProvider;
import me.guillaumin.android.osmtracker.db.TrackContentProvider.Schema;

import org.osmdroid.DefaultResourceProxyImpl;
import org.osmdroid.api.IMapView;
import org.osmdroid.util.GeoPoint;
import org.osmdroid.views.overlay.ItemizedOverlay;
Expand Down Expand Up @@ -36,7 +35,7 @@ public WayPointsOverlay(
final long trackId
)
{
super(pDefaultMarker, new DefaultResourceProxyImpl(pContext));
super(pDefaultMarker);

this.trackId = trackId;
this.pContentResolver = pContext.getContentResolver();
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:2.2.2'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Sat Nov 19 17:50:46 PST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip